Hello community, here is the log from the commit of package update-desktop-files checked in at Thu Jul 5 19:27:30 CEST 2007. -------- --- update-desktop-files/update-desktop-files.changes 2007-07-03 11:11:30.000000000 +0200 +++ /mounts/work_src_done/NOARCH/update-desktop-files/update-desktop-files.changes 2007-07-05 17:18:32.254045000 +0200 @@ -1,0 +2,6 @@ +Thu Jul 5 17:18:18 CEST 2007 - coolo@suse.de + +- don't package kappfinder files anymore and let packages provide their + own files + +------------------------------------------------------------------- Old: ---- kappfinder-icons.tar.bz2 kappfinder.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ update-desktop-files.spec ++++++ --- /var/tmp/diff_new_pack.C19193/_old 2007-07-05 19:26:39.000000000 +0200 +++ /var/tmp/diff_new_pack.C19193/_new 2007-07-05 19:26:39.000000000 +0200 @@ -12,7 +12,7 @@ Name: update-desktop-files Version: 10.3 -Release: 34 +Release: 35 Summary: A Build Tool to Update Desktop Files License: GPL v2 or later Group: Development/Tools/Building @@ -21,14 +21,12 @@ Autoreqprov: on Source: suse_update_desktop_file.sh Source1: map-desktop-category.sh -Source2: kappfinder.tar.bz2 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 -Source7: kappfinder-icons.tar.bz2 Source10: desktop-translations.tar.bz2 Source99: PREPARE_PACKAGE BuildArchitectures: noarch @@ -85,9 +83,6 @@ done install -m 0644 %SOURCE5 %SOURCE6 %SOURCE3 $RPM_BUILD_ROOT/usr/share/%name/ install -m 755 %SOURCE4 $RPM_BUILD_ROOT/usr/share/%name/ -mkdir -p $RPM_BUILD_ROOT/usr/share/%name/templates -tar xfj %SOURCE2 -C $RPM_BUILD_ROOT/usr/share/%name/templates -tar xfj %SOURCE7 -C $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 @@ -125,6 +120,9 @@ %endif %changelog +* Thu Jul 05 2007 - coolo@suse.de +- don't package kappfinder files anymore and let packages provide their + own files * Tue Jul 03 2007 - coolo@suse.de - adding some debug output to indicate copying templates * Thu Jun 21 2007 - stbinner@suse.de ++++++ suse_update_desktop_file.sh ++++++ --- update-desktop-files/suse_update_desktop_file.sh 2007-07-03 11:10:52.000000000 +0200 +++ /mounts/work_src_done/NOARCH/update-desktop-files/suse_update_desktop_file.sh 2007-07-05 11:18:56.580665000 +0200 @@ -107,11 +107,11 @@ fi if [ "$INSTALL" = "yes" ]; then mkdir -p $RPM_BUILD_ROOT/usr/share/applications/ - FILE=`find $RPM_SOURCE_DIR $RPM_BUILD_DIR . /usr/share/update-desktop-files/templates -name $APPLICATION.desktop| sort -r | head -n 1` + FILE=`find $RPM_SOURCE_DIR $RPM_BUILD_DIR . -name $APPLICATION.desktop| sort -r | head -n 1` if [ -s "$FILE" ]; then cp -v "$FILE" $RPM_BUILD_ROOT/usr/share/applications/ icon_file=`sed -n '/^\[Desktop Entry\]/,/(\[.*|$)/ s,Icon=\(.*\),\1,p' "$FILE"` - icon_file=`find $RPM_SOURCE_DIR /usr/share/update-desktop-files/kappfinder-icons -maxdepth 1 -name ${icon_file}.png -o -name ${icon_file}.xpm -o -name $icon_file | sort -r | head -n 1` + icon_file=`find $RPM_SOURCE_DIR $RPM_BUILD_DIR -maxdepth 1 -name ${icon_file}.png -o -name ${icon_file}.xpm -o -name $icon_file | sort -r | head -n 1` if [ -s "$icon_file" ]; then mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ cp -v "$icon_file" $RPM_BUILD_ROOT/usr/share/pixmaps/ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org