2012-05-23 Vlad Glagolev <stealth AT sourcemage.org>
* neon.gpg: moved from neon spell, required by cadaver
diff --git a/gnome2-libs/intltool/DEPENDS b/gnome2-libs/intltool/DEPENDS
index 5f83faa..361a782 100755
--- a/gnome2-libs/intltool/DEPENDS
+++ b/gnome2-libs/intltool/DEPENDS
@@ -1,4 +1,3 @@
-depends perl &&
+depends perl &&
depends xml-parser-expat &&
-depends xml-parser &&
depends popt
diff --git a/gnome2-libs/intltool/HISTORY b/gnome2-libs/intltool/HISTORY
index 8d8b37c..31244e4 100644
--- a/gnome2-libs/intltool/HISTORY
+++ b/gnome2-libs/intltool/HISTORY
@@ -1,9 +1,6 @@
2012-03-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.50.2
-2012-02-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
- * DEPENDS: added dependency on xml-parser
-
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 23AE85D2.gpg: added gpg keyring
diff --git a/graphics/bins/DEPENDS b/graphics/bins/DEPENDS
index a714a5d..2c65f82 100755
--- a/graphics/bins/DEPENDS
+++ b/graphics/bins/DEPENDS
@@ -12,4 +12,4 @@ depends text-iconv &&
depends text-unaccent &&
depends uri &&
depends xml-grove &&
-depends xml-parser
+depends xml-parser-expat
diff --git a/graphics/bins/HISTORY b/graphics/bins/HISTORY
index a71882a..7e90fab 100644
--- a/graphics/bins/HISTORY
+++ b/graphics/bins/HISTORY
@@ -1,3 +1,6 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: xml-parser -> xml-parser-expat
+
2011-09-26 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: converted to upstream signature checking
* 95D463F3.gpg: added gpg keyring
diff --git a/perl-cpan/xml-parser-expat/CONFLICTS
b/perl-cpan/xml-parser-expat/CONFLICTS
new file mode 100755
index 0000000..3c0d77e
--- /dev/null
+++ b/perl-cpan/xml-parser-expat/CONFLICTS
@@ -0,0 +1 @@
+conflicts xml-parser y
diff --git a/perl-cpan/xml-parser-expat/DETAILS
b/perl-cpan/xml-parser-expat/DETAILS
index ce6b180..1788940 100755
--- a/perl-cpan/xml-parser-expat/DETAILS
+++ b/perl-cpan/xml-parser-expat/DETAILS
@@ -1,11 +1,11 @@
SPELL=xml-parser-expat
- VERSION=2.40
-
SOURCE_HASH=sha512:ecb2af535a616f709c9e79e1e72e0bf875611c35b193b516d09896e0deba2dd1332173d16f5fb45e5630bb8019f852209dc3611b8c7a31c5eeed4f30cac288ab
+ VERSION=2.41
+
SOURCE_HASH=sha512:3536a1f048572611636c2461bb98c2b460b5658b960b5b0b2f2a7848cf0b7efb48593f12f7eb99be22c26f417cf443d66c88fcca7fdfa2f03c60f43624d30801
SOURCE=XML-Parser-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/XML-Parser-$VERSION
- SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/C/CH/CHORNY/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/XML-Parser-$VERSION"
+ SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/T/TO/TODDR/$SOURCE
LICENSE=ART
- WEB_SITE=http://search.cpan.org/~msergeant/XML-Parser/
+ WEB_SITE=http://search.cpan.org/~toddr/XML-Parser/
ENTERED=20020314
KEYWORDS="parser perl"
SHORT="Flexible fast parser with plug-in styles"
diff --git a/perl-cpan/xml-parser-expat/HISTORY
b/perl-cpan/xml-parser-expat/HISTORY
index 3ca3171..ea07998 100644
--- a/perl-cpan/xml-parser-expat/HISTORY
+++ b/perl-cpan/xml-parser-expat/HISTORY
@@ -1,3 +1,7 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.41; renewed source url
+ * CONFLICTS: conflicts with duplicate spell
+
2010-09-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.40
new SOURCE_URL
diff --git a/perl-cpan/xml-parser/BUILD b/perl-cpan/xml-parser/BUILD
index 2de29cd..27ba77d 100755
--- a/perl-cpan/xml-parser/BUILD
+++ b/perl-cpan/xml-parser/BUILD
@@ -1 +1 @@
-default_build_perl
+true
diff --git a/perl-cpan/xml-parser/DETAILS b/perl-cpan/xml-parser/DETAILS
index 4c3579a..4d1eff0 100755
--- a/perl-cpan/xml-parser/DETAILS
+++ b/perl-cpan/xml-parser/DETAILS
@@ -1,8 +1,9 @@
SPELL=xml-parser
VERSION=2.36
- SOURCE="XML-Parser-${VERSION}.tar.gz"
- SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/MS/MSERGEANT/${SOURCE}
-
SOURCE_HASH=sha512:aadc1d5dcfddf7ad79f5cf05a9b8368d78418cea70b6550011d3ce099ab4eb8333b03ab478eb0faae361b27718e9c4e46f6eca16f68241f2a5c6096af6564110
+ PATCHLEVEL=1
+# SOURCE="XML-Parser-${VERSION}.tar.gz"
+# SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/M/MS/MSERGEANT/${SOURCE}
+#
SOURCE_HASH=sha512:aadc1d5dcfddf7ad79f5cf05a9b8368d78418cea70b6550011d3ce099ab4eb8333b03ab478eb0faae361b27718e9c4e46f6eca16f68241f2a5c6096af6564110
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/XML-Parser-${VERSION}"
WEB_SITE="http://search.cpan.org/~COOPERCL/XML-Parser/"
LICENSE[0]=ART
diff --git a/perl-cpan/xml-parser/HISTORY b/perl-cpan/xml-parser/HISTORY
index 07ea9a4..fffd663 100644
--- a/perl-cpan/xml-parser/HISTORY
+++ b/perl-cpan/xml-parser/HISTORY
@@ -1,6 +1,9 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, {PRE_,}BUILD, INSTALL, UP_TRIGGERS: deprecated duplicate
+ spell in favour of xml-parser-expat
+
2009-09-22 Finn Haedicke <finn_haedicke AT gmx.net>
* DEPENDS: added expat
2009-09-17 David Kowis <dkowis AT shlrm.org>
* BUILD, DEPENDS, DETAILS: spell created
-
diff --git a/perl-cpan/xml-parser/INSTALL b/perl-cpan/xml-parser/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/xml-parser/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/xml-parser/PRE_BUILD b/perl-cpan/xml-parser/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/perl-cpan/xml-parser/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/perl-cpan/xml-parser/UP_TRIGGERS
b/perl-cpan/xml-parser/UP_TRIGGERS
new file mode 100755
index 0000000..879c503
--- /dev/null
+++ b/perl-cpan/xml-parser/UP_TRIGGERS
@@ -0,0 +1,2 @@
+up_trigger xml-parser dispel_self
+up_trigger xml-parser-expat cast_self
diff --git a/volatiles b/volatiles
index 373abe1..acfd38d 100644
--- a/volatiles
+++ b/volatiles
@@ -6,9 +6,9 @@
^/usr/lib/gdk-pixbuf-2\.0/.*/loaders\.cache$
^/usr/lib/ghc.*/package\.conf.*$
^/usr/lib/gio/modules/giomodule\.cache$
-^/usr/share/applications/mimeinfo.cache$
+^/usr/share/applications/mimeinfo\.cache$
^/usr/share/glib-2\.0/schemas/gschemas\.compiled$
-^/usr/share/icons/.*/icon-theme.cache$
-^/usr/share/icons/.*/index.theme$
+^/usr/share/icons/.*/icon-theme\.cache$
+^/usr/share/icons/.*/index\.theme$
^/usr/share/info/standards\.info$
^/usr/share/locale/locale\.alias$
diff --git a/xfce/libxfce4util/HISTORY b/xfce/libxfce4util/HISTORY
index 265f4b6..a45cca7 100644
--- a/xfce/libxfce4util/HISTORY
+++ b/xfce/libxfce4util/HISTORY
@@ -1,3 +1,6 @@
+2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * UP_TRIGGER: added, for proper upgrade
+
2012-04-29 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 4.10.0
diff --git a/xfce/libxfce4util/UP_TRIGGERS b/xfce/libxfce4util/UP_TRIGGERS
new file mode 100755
index 0000000..2b8c75e
--- /dev/null
+++ b/xfce/libxfce4util/UP_TRIGGERS
@@ -0,0 +1,14 @@
+# recast everything on minor version update
+spell_ok $SPELL && local OLD_SPELL_VERSION="$(installed_version $SPELL)" &&
+
+if [[ "${VERSION%.*}" != "${OLD_SPELL_VERSION%.*}" ]]; then
+ message "This is a possibly incompatible update of $SPELL..." &&
+ message "Figuring out what spells need to be recast, this may take a
while." &&
+
+ for each in $(show_up_depends $SPELL 1); do
+ if gaze install $each | xargs readelf -d 2> /dev/null |
+ grep -q "NEEDED.*libxfce4util\.so"; then
+ up_trigger $each cast_self
+ fi
+ done
+fi
diff --git a/xfce/orage/DEPENDS b/xfce/orage/DEPENDS
index 5608dad..c342e50 100755
--- a/xfce/orage/DEPENDS
+++ b/xfce/orage/DEPENDS
@@ -1,3 +1,4 @@
+depends libxfce4util &&
depends gtk+2 &&
optional_depends xfce4-panel \
diff --git a/xfce/orage/DETAILS b/xfce/orage/DETAILS
index 3bd6f3e..cdd8f7c 100755
--- a/xfce/orage/DETAILS
+++ b/xfce/orage/DETAILS
@@ -1,6 +1,7 @@
SPELL=orage
if [[ $ORAGE_STABLE == y ]]; then
VERSION=4.8.3
+ PATCHLEVEL=1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=http://archive.xfce.org/src/apps/$SPELL/$BRANCH/$SOURCE
diff --git a/xfce/orage/HISTORY b/xfce/orage/HISTORY
index a5d0436..29b5d5e 100644
--- a/xfce/orage/HISTORY
+++ b/xfce/orage/HISTORY
@@ -1,3 +1,6 @@
+2012-05-26 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: added missing dep; PATCHLEVEL=1
+
2012-01-08 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.8.3
if spell_ok $SPELL; then
local OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if [[ ${VERSION%.*} > ${OLD_SPELL_VERSION%.*} ]]; then
- message "This is a possibly incompatible update of xfce4-panel..."
+ if [[ ${VERSION%.*} != ${OLD_SPELL_VERSION%.*} ]]; then
+ message "This is a possibly incompatible update of $SPELL..."
message "Figuring out what spells need to be recast, this may take a
while."
for each in $(show_up_depends $SPELL 1); do
# Check if the binaries link against libpython.so
if gaze install $each | xargs readelf -d 2> /dev/null |
- grep -q "NEEDED.*libxfce4panel.so"; then
+ grep -q "NEEDED.*libxfce4panel\.so"; then
up_trigger $each cast_self
fi
done
[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (441273b30da9ba37d3b67b191c6d36eba903f0d9),
Vlad Glagolev, 05/25/2012