diff --git a/PREPARE_PACKAGE b/PREPARE_PACKAGE index a0b35fe..789f7c2 100644 --- a/PREPARE_PACKAGE +++ b/PREPARE_PACKAGE @@ -13,15 +13,13 @@ fi rm -rf po mkdir po -rm -f failed for file in $MY_LCN_CHECKOUT/*/po/update-desktop-files*.po; do lang=`echo $file | sed -e "s,/po/up.*,,; s,.*/,,"` - echo $lang + echo $file test -d po/$lang || mkdir po/$lang # package valid files only msgfmt -o /dev/null --check $file || { rmdir po/$lang - echo $file >>failed continue } # cp $file po/$lang/entries.po @@ -38,51 +36,19 @@ next } {print} ' > po/$lang/entries.po.new + msgfmt po/$lang/entries.po.new -o po/$lang/entries.mo; + msgunfmt --no-wrap po/$lang/entries.mo | \ + grep -v '^"[A-Z][^ ]*: ' | grep '[^\][\]n"' && exit 1 + rm po/$lang/entries.mo + if test -f po/$lang/entries.po; then msgcat -o po/$lang/entries.po --use-first po/$lang/entries.po po/$lang/entries.po.new rm po/$lang/entries.po.new else mv po/$lang/entries.po.new po/$lang/entries.po fi + done rm -f desktop-translations.tar.bz2 tar cfj desktop-translations.tar.bz2 po rm -rf po -echo broken files, skipped: -cat failed -exit 0 - -rm -rf kappfinder -svn export svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kdebase/kappfinder/apps kappfinder -cd kappfinder/ -# make sure we only have one desktop file of each. -if test $(find -type f -printf '%f\n' 2>/dev/null | grep -v Makefile.am | sort | uniq -c | sort -n | awk '{print $1}' | grep -v 1 | wc -l) -ne 0; then - echo "There is some duplicate desktop file!!!!" - echo " FIX ME!" - exit 1 -fi -rm -f ../kappfinder.tar.bz2 -tar cfj ../kappfinder.tar.bz2 * -cd - -rm -rf kappfinder-icons -mkdir -p kappfinder-icons -BASEDIR=/mounts/dist/unpacked/i386.full/opt/kde3 -find kappfinder/ -name \*.desktop | while read f; do - oicon=`sed -n 's,Icon=\(.*\),\1,p' $f` - icon=`find $BASEDIR/share/icons/default.kde/32x32 -name $oicon -o -name $oicon.png -o -name $oicon.xpm | head -n 1` - if [ ! -r "$icon" ] ; then - icon=`find $BASEDIR/share/icons/*/32x32/apps -name $oicon -o -name $oicon.png -o -name $oicon.xpm | head -n 1` - fi - if [ -r "$icon" ] ; then - cp $icon kappfinder-icons/ - else - echo "can't find icon $oicon from file $f" - # grep -v ^Icon= $f > ${f}_ && mv ${f}_ $f - fi -done -rm -f kappfinder-icons.tar.bz2 -tar cfj kappfinder-icons.tar.bz2 kappfinder-icons -rm -rf kappfinder-icons -rm -rf kappfinder - - diff --git a/desktop-translations.tar.bz2 b/desktop-translations.tar.bz2 index 52dee99..6f061cf 100644 --- a/desktop-translations.tar.bz2 +++ b/desktop-translations.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d8c1ac72b9e24ba00178adb1f97cc49953f37812de6e36d8dd5519a61006cbae -size 9489486 +oid sha256:5ab60bc41d54a4be1a82d3c43a5a068dff841f031ab249602469aa95c7ed7d5a +size 9486892 diff --git a/update-desktop-files.changes b/update-desktop-files.changes index 2c4ae08..18abd33 100644 --- a/update-desktop-files.changes +++ b/update-desktop-files.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Thu May 22 08:13:46 CEST 2008 - aj@suse.de +Thu May 22 08:37:03 CEST 2008 - coolo@suse.de -- Fix build. +- reupdate to fix build ------------------------------------------------------------------- Mon May 19 18:46:58 CEST 2008 - ke@suse.de diff --git a/update-desktop-files.spec b/update-desktop-files.spec index ec74a9d..77c5835 100644 --- a/update-desktop-files.spec +++ b/update-desktop-files.spec @@ -13,7 +13,7 @@ Name: update-desktop-files Version: 11.0 -Release: 16 +Release: 17 Summary: A Build Tool to Update Desktop Files License: GPL v2 or later Group: Development/Tools/Building @@ -101,8 +101,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %changelog -* Thu May 22 2008 aj@suse.de -- Fix build. +* Thu May 22 2008 coolo@suse.de +- reupdate to fix build * Mon May 19 2008 ke@suse.de - update translations. * Fri May 16 2008 ke@suse.de