OBS User unknown 2007-07-04 23:51:06 +00:00 committed by Git OBS Bridge
parent 12ae44ffae
commit 0ea9ce025a
3 changed files with 12 additions and 5 deletions

View File

@ -107,14 +107,14 @@ GNAME=no
fi fi
if [ "$INSTALL" = "yes" ]; then if [ "$INSTALL" = "yes" ]; then
mkdir -p $RPM_BUILD_ROOT/usr/share/applications/ 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 . /usr/share/update-desktop-files/templates -name $APPLICATION.desktop| sort -r | head -n 1`
if [ -s "$FILE" ]; then if [ -s "$FILE" ]; then
cp "$FILE" $RPM_BUILD_ROOT/usr/share/applications/ cp -v "$FILE" $RPM_BUILD_ROOT/usr/share/applications/
icon_file=`sed -n '/^\[Desktop Entry\]/,/(\[.*|$)/ s,Icon=\(.*\),\1,p' "$FILE"` 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 /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`
if [ -s "$icon_file" ]; then if [ -s "$icon_file" ]; then
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
cp "$icon_file" $RPM_BUILD_ROOT/usr/share/pixmaps/ cp -v "$icon_file" $RPM_BUILD_ROOT/usr/share/pixmaps/
fi fi
fi fi
fi fi

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 3 11:11:21 CEST 2007 - coolo@suse.de
- adding some debug output to indicate copying templates
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 21 12:03:06 CEST 2007 - stbinner@suse.de Thu Jun 21 12:03:06 CEST 2007 - stbinner@suse.de

View File

@ -12,9 +12,9 @@
Name: update-desktop-files Name: update-desktop-files
Version: 10.3 Version: 10.3
Release: 32 Release: 34
Summary: A Build Tool to Update Desktop Files Summary: A Build Tool to Update Desktop Files
License: GNU General Public License (GPL) License: GPL v2 or later
Group: Development/Tools/Building Group: Development/Tools/Building
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: desktop-translations = %{version} Requires: desktop-translations = %{version}
@ -125,6 +125,8 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Tue Jul 03 2007 - coolo@suse.de
- adding some debug output to indicate copying templates
* Thu Jun 21 2007 - stbinner@suse.de * Thu Jun 21 2007 - stbinner@suse.de
- fix invalid .desktop files - fix invalid .desktop files
* Tue May 29 2007 - coolo@suse.de * Tue May 29 2007 - coolo@suse.de