From 15c9c9dbc804fef7bdcceacec4edcf36442c11425b1023d61c7221204e143cb2 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 12 Jan 2008 01:18:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/update-desktop-files?expand=0&rev=28 --- desktop-translations.tar.bz2 | 4 ++-- packages-3D | 40 ------------------------------- packages-sound | 46 ------------------------------------ suse_update_desktop_file.sh | 33 -------------------------- update-desktop-files.changes | 10 ++++++++ update-desktop-files.spec | 14 +++++------ 6 files changed, 19 insertions(+), 128 deletions(-) delete mode 100644 packages-3D delete mode 100644 packages-sound diff --git a/desktop-translations.tar.bz2 b/desktop-translations.tar.bz2 index d672f2b..ea88f15 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:262cd290167e38ec4b0a122ef2362a42d48dbfcd98eca4389f75be393280b474 -size 9022434 +oid sha256:880aa9d5a0cf7b2c45ac51eb3c6999cf06ad91f7a9a06221885f6ba296118044 +size 8936524 diff --git a/packages-3D b/packages-3D deleted file mode 100644 index 93dbedd..0000000 --- a/packages-3D +++ /dev/null @@ -1,40 +0,0 @@ -FlightGear -FlightGear-data -FooBillard -armagetron -boson -briquolo -bzflag -bzflag-devel -celestia -chromium -compiz -crack-attack -csmash -gl-117 -glchess -gle -glest -glest-data -gltt -gtkglarea -khunphan -mmv -neverball -nexuiz -orbital -plib -python-opengl -quake3 -quake3-demo -quake3-devel -quake3-setup -torcs -torcs-data -trackballs -tulip -tux_aqfh -tuxkart -tuxracer -xgl -xmoto diff --git a/packages-sound b/packages-sound deleted file mode 100644 index 5f7f382..0000000 --- a/packages-sound +++ /dev/null @@ -1,46 +0,0 @@ -FlightGear -FlightGear-data -PyTone -aeolus -alsamodular -bmp -bmp-devel -bmp-plugins -bmp-plugins-mad -cecilia -ecasound-devel -enigma -esound -frozen-bubble -gl-117 -glest -gnomemeeting -kalsatools -kdeartwork3-sound -kdemultimedia3-extra -kdemultimedia3-jukebox -kdemultimedia3-midi -kdemultimedia3-mixer -kdemultimedia3-sound -madplay -mpg321 -muse -pachi -pd -pd-externals -pwlib -pwlib-devel -pwlib-plugins-v4l2 -pyecasound -python-mad -qmidiarp -rhythmbox -sipset -warzone2100 -wsndpref -wsndsrv -xmms -xmms-devel -xmms-jack -xmms-lib -xmms-lib-mad diff --git a/suse_update_desktop_file.sh b/suse_update_desktop_file.sh index 01e37dd..5935c31 100644 --- a/suse_update_desktop_file.sh +++ b/suse_update_desktop_file.sh @@ -342,36 +342,3 @@ else 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 - diff --git a/update-desktop-files.changes b/update-desktop-files.changes index f64a52b..7bd2b3c 100644 --- a/update-desktop-files.changes +++ b/update-desktop-files.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jan 11 11:28:17 CET 2008 - sbrabec@suse.cz + +- Removed broken support for CheckHardware (#255716). + +------------------------------------------------------------------- +Thu Jan 10 13:30:43 CET 2008 - ke@suse.de + +- Update translations. + ------------------------------------------------------------------- Mon Dec 17 14:34:12 CET 2007 - ke@suse.de diff --git a/update-desktop-files.spec b/update-desktop-files.spec index 2bbb72e..dcd9a1d 100644 --- a/update-desktop-files.spec +++ b/update-desktop-files.spec @@ -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 @@ Source: suse_update_desktop_file.sh 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 @@ for lang in *; do 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 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Jan 11 2008 - sbrabec@suse.cz +- Removed broken support for CheckHardware (#255716). +* Thu Jan 10 2008 - ke@suse.de +- Update translations. * Mon Dec 17 2007 - ke@suse.de - Update translations. * Tue Nov 27 2007 - ke@suse.de