Mailinglist Archive: opensuse-commit (1059 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package update-desktop-files
checked in at Sat Jan 12 02:18:08 CET 2008.

--------
--- update-desktop-files/update-desktop-files.changes   2007-12-17 
14:34:23.000000000 +0100
+++ 
/mounts/work_src_done/NOARCH/update-desktop-files/update-desktop-files.changes  
    2008-01-11 13:27:47.000000000 +0100
@@ -1,0 +2,10 @@
+Fri Jan 11 11:28:17 CET 2008 - sbrabec@xxxxxxx
+
+- Removed broken support for CheckHardware (#255716).
+
+-------------------------------------------------------------------
+Thu Jan 10 13:30:43 CET 2008 - ke@xxxxxxx
+
+- Update translations.
+
+-------------------------------------------------------------------

Old:
----
  packages-3D
  packages-sound

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

Other differences:
------------------
++++++ update-desktop-files.spec ++++++
--- /var/tmp/diff_new_pack.j24787/_old  2008-01-12 02:08:42.000000000 +0100
+++ /var/tmp/diff_new_pack.j24787/_new  2008-01-12 02:08:42.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package update-desktop-files (Version 10.3)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -12,7 +12,7 @@
 
 Name:           update-desktop-files
 Version:        10.3
-Release:        75
+Release:        78
 Summary:        A Build Tool to Update Desktop Files
 License:        GPL v2 or later
 Group:          Development/Tools/Building
@@ -23,10 +23,6 @@
 Source1:        map-desktop-category.sh
 Source3:        translate.pl
 Source4:        untranslate.pl
-# pdb query --filter "needshw:sound" | sed -e "s, ,,g"
-Source5:        packages-sound
-# pdb query --filter "needshw:3d" | sed -e "s, ,,g"
-Source6:        packages-3D
 Source10:       desktop-translations.tar.bz2
 Source99:       PREPARE_PACKAGE
 BuildArch:      noarch
@@ -82,7 +78,7 @@
     done
   fi
 done
-install -m 0644 %SOURCE5 %SOURCE6 %SOURCE3 $RPM_BUILD_ROOT/usr/share/%name/
+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
@@ -121,6 +117,10 @@
 %endif
 
 %changelog
+* Fri Jan 11 2008 - sbrabec@xxxxxxx
+- Removed broken support for CheckHardware (#255716).
+* Thu Jan 10 2008 - ke@xxxxxxx
+- Update translations.
 * Mon Dec 17 2007 - ke@xxxxxxx
 - Update translations.
 * Tue Nov 27 2007 - ke@xxxxxxx

++++++ desktop-translations.tar.bz2 ++++++
update-desktop-files/desktop-translations.tar.bz2 
/mounts/work_src_done/NOARCH/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    2007-07-05 
11:18:56.000000000 +0200
+++ 
/mounts/work_src_done/NOARCH/update-desktop-files/suse_update_desktop_file.sh   
    2008-01-11 11:26:05.000000000 +0100
@@ -342,36 +342,3 @@
   sed -e '/^\[Desktop Entry\]/a \
 X-SuSE-translate=false' $FILE > ${FILE}_ && mv ${FILE}_ $FILE
 fi
-
-#
-# CheckHardware checking
-#
-_EXEC="`sed -n -e '/^\[Desktop Entry\]/,/(\[.*|$)/ s,^Exec=\(.*\),\1,p' $FILE`"
-EXEC="${_EXEC#CheckHardware }"
-EXEC="${EXEC#--sound }"
-EXEC="${EXEC#--3D }"
-EXEC="${EXEC#--sound }"
-_3D=""
-_SOUND=""
-grep -q "^X-SuSE-needs-3D$" "$FILE" && _3D="--3D"
-grep -q "^X-SuSE-needs-Sound$" "$FILE" && _SOUND="--sound"
-grep -q "^$RPM_PACKAGE_NAME$" /usr/share/update-desktop-files/packages-sound \
-  && _SOUND="--sound"
-grep -q "^$RPM_PACKAGE_NAME$" /usr/share/update-desktop-files/packages-3D \
-  && _3D="--3D"
-
-CHK=""
-if [ "$_3D" ]; then
-  CHK="CheckHardware"
-  EXEC="$_3D $EXEC"
-fi
-if [ "$_SOUND" ]; then
-  CHK="CheckHardware"
-  EXEC="$_SOUND $EXEC"
-fi
-
-if [ "$EXEC" != "$_EXEC" ]; then
-  sed -e "s,^Exec=.*,Exec=${CHK} ${EXEC}," "$FILE" > "${FILE}.new" && 
-    mv "${FILE}.new" "${FILE}" 
-fi
-




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



Remember to have fun...

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