commit update-desktop-files

13 Feb 2008

Hello community,

here is the log from the commit of package update-desktop-files
checked in at Wed Feb 13 19:35:03 CET 2008.

--------

--- update-desktop-files/update-desktop-files.changes	2008-02-05 17:25:57.000000000 +0100
+++ update-desktop-files/update-desktop-files.changes	2008-02-12 16:20:04.000000000 +0100
@@ -1,0 +2,10 @@
+Tue Feb 12 16:16:46 CET 2008 - coolo@suse.de
+
+- don't rely on perl and command line tools, but on fast C++ 
+
+-------------------------------------------------------------------
+Mon Feb 11 10:40:23 CET 2008 - ke@suse.de
+
+- update translations.
+
+-------------------------------------------------------------------

Old:
----
  translate.pl

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ update-desktop-files.spec ++++++
--- /var/tmp/diff_new_pack.Y31628/_old	2008-02-13 19:34:00.000000000 +0100
+++ /var/tmp/diff_new_pack.Y31628/_new	2008-02-13 19:34:00.000000000 +0100
@@ -10,18 +10,19 @@
 
 # norootforbuild
 
+
 Name:           update-desktop-files
 Version:        10.3
-Release:        88
+Release:        92
 Summary:        A Build Tool to Update Desktop Files
 License:        GPL v2 or later
 Group:          Development/Tools/Building
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       desktop-translations = %{version}
+Requires:       suse-desktop-utils
 AutoReqProv:    on
 Source:         suse_update_desktop_file.sh
 Source1:        map-desktop-category.sh
-Source3:        translate.pl
 Source4:        untranslate.pl
 Source10:       desktop-translations.tar.bz2
 Source99:       PREPARE_PACKAGE
@@ -70,23 +71,18 @@
   if test -f $lang; then
 	rm $lang
   else
-    mkdir -p $RPM_BUILD_ROOT/usr/share/%name/locale/translations_$lang/en_US/LC_MESSAGES
+    mkdir -p $RPM_BUILD_ROOT/usr/share/%name/locale/translations/en_US/LC_MESSAGES
     mkdir -p $RPM_BUILD_ROOT/usr/share/locale/$lang/LC_MESSAGES
     for f in $lang/*.po; do 
        msgfmt -o $RPM_BUILD_ROOT/usr/share/locale/$lang/LC_MESSAGES/desktop_translations.mo $f
        ln -s  /usr/share/locale/$lang/LC_MESSAGES/desktop_translations.mo \
-         $RPM_BUILD_ROOT/usr/share/%name/locale/translations_$lang/en_US/LC_MESSAGES/`echo $f | sed -e 's#.*/##; s#\.po#.mo#'`
+         $RPM_BUILD_ROOT/usr/share/%name/locale/translations/en_US/LC_MESSAGES/$lang\_`echo $f | sed -e 's#.*/##; s#\.po#.mo#'`
     done
   fi
 done
-install -m 0644 %SOURCE3 $RPM_BUILD_ROOT/usr/share/%name/
 install -m 755 %SOURCE4 $RPM_BUILD_ROOT/usr/share/%name/
 mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm
 install -m 0755 %SOURCE0 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/rpm
-%if %suse_version <= 1000
-cd $RPM_BUILD_ROOT/usr/lib/rpm
-patch -p0 <%PATCH0
-%endif
 popd
 %find_lang desktop_translations
 
@@ -100,24 +96,12 @@
 
 %files -f desktop_translations.lang -n desktop-translations
 %defattr(-,root,root)
-%if %suse_version <= 1000
-%dir /usr/share/locale/km
-%dir /usr/share/locale/km/LC_MESSAGES
-%endif
-%if %suse_version <= 1001
-%dir /usr/share/locale/fy
-%dir /usr/share/locale/fy/LC_MESSAGES
-%dir /usr/share/locale/lo
-%dir /usr/share/locale/lo/LC_MESSAGES
-%dir /usr/share/locale/nds
-%dir /usr/share/locale/nds/LC_MESSAGES
-%dir /usr/share/locale/se
-%dir /usr/share/locale/se/LC_MESSAGES
-%dir /usr/share/locale/tt
-%dir /usr/share/locale/tt/LC_MESSAGES
-%endif
 
 %changelog
+* Tue Feb 12 2008 coolo@suse.de
+- don't rely on perl and command line tools, but on fast C++
+* Mon Feb 11 2008 ke@suse.de
+- update translations.
 * Tue Feb 05 2008 coolo@suse.de
 - do not install it by default (23MB saved)
 * Fri Jan 18 2008 ke@suse.de

++++++ desktop-translations.tar.bz2 ++++++
update-desktop-files/desktop-translations.tar.bz2 update-desktop-files/desktop-translations.tar.bz2 differ: byte 11, line 1



++++++ suse_update_desktop_file.sh ++++++
--- update-desktop-files/suse_update_desktop_file.sh	2008-01-11 11:26:05.000000000 +0100
+++ update-desktop-files/suse_update_desktop_file.sh	2008-02-12 17:18:40.000000000 +0100
@@ -326,14 +326,14 @@
   # Merge translations
   #
   cp $FILE ${FILE}.old
-  for L in /usr/share/update-desktop-files/locale/translations_*; do
-    perl /usr/share/update-desktop-files/translate.pl $L $FILE > ${FILE}_ && mv ${FILE}_ $FILE || exit 1
-  done
-  perl /usr/share/update-desktop-files/untranslate.pl $FILE > ${FILE}.new
+  /usr/bin/suse-desktop-merge $FILE > ${FILE}_ || exit 1
+  perl /usr/share/update-desktop-files/untranslate.pl ${FILE}_ > ${FILE}.new
   if ! cmp -s ${FILE}.old ${FILE}.new; then
      echo "UNTRANSLATE DOES NOT WORK"
-     diff -u ${FILE}.old ${FILE}.new
+     diff -u ${FILE}.old ${FILE}.new 
+     exit 1
   fi
+  mv ${FILE}_ $FILE
   rm -f ${FILE}.old ${FILE}.new
 else
   #

++++++ untranslate.pl ++++++
--- update-desktop-files/untranslate.pl	2007-05-02 19:17:48.000000000 +0200
+++ update-desktop-files/untranslate.pl	2008-02-13 10:13:45.000000000 +0100
@@ -44,7 +44,7 @@
 my $addedtrans = $added{''};
 
 while ( <FILE> ) {
-    next if ($_ =~ /X-SuSE-translate=true/ && $group eq '[Desktop Entry]');
+    next if ($_ =~ /X-SuSE-translate=true/ );
     next if ($_ =~ /X-SuSE-added=/ );
 
     # new group


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)