SPECS: kxgenerator.spec - add -desktop.patch; use %{_desktopdir}; ...

[shadzik]

Author: shadzik                      Date: Tue Jun 20 17:35:05 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add -desktop.patch; use %{_desktopdir}; cleared TODO list

---- Files affected:
SPECS:
   kxgenerator.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/kxgenerator.spec
diff -u SPECS/kxgenerator.spec:1.3 SPECS/kxgenerator.spec:1.4
--- SPECS/kxgenerator.spec:1.3	Tue Jun 20 19:09:54 2006
+++ SPECS/kxgenerator.spec	Tue Jun 20 19:35:00 2006
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-#	- use _desktopdir
 Summary:	kX Generator - xorg.conf file generator
 SUmmary(de):	kX Generator - ein xorg.conf Datei Generator
 Summary(pl):	kX Generator - generator pliku xorg.conf
@@ -11,6 +9,7 @@
 Group:		X11/Applications
 Source0:	http://www.kde-apps.org/content/files/39085-%{name}-%{version}.tar.bz2
 # Source0-md5:	2fc78e92722408cccecfdcaf31ed1559
+Patch0:		%{name}-desktop.patch
 URL:		http://www.kde-apps.org/content/show.php?content=39085
 BuildRequires:	autoconf
 BuildRequires:	kdelibs-devel >= 9:3.2
@@ -31,6 +30,7 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure
@@ -38,12 +38,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_desktopdir}
+install src/%{name}.desktop $RPM_BUILD_ROOT/%{_desktopdir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	kde_htmldir=%{_kdedocdir} \
 	kde_libs_htmldir=%{_kdedocdir}
 
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/%{name}.desktop
+
 %find_lang %{name} --with-kde
 
 %clean
@@ -52,9 +56,9 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/kxgenerator
-%{_datadir}/applnk/Utilities/kxgenerator.desktop
-%{_iconsdir}/hicolor/64x64/apps/kxgenerator.png
+%attr(755,root,root) %{_bindir}/%{name}
+%{_desktopdir}/%{name}.desktop
+%{_iconsdir}/hicolor/64x64/apps/%{name}.png
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -62,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/06/20 17:35:00  shadzik
+- add -desktop.patch; use %{_desktopdir}; cleared TODO list
+
 Revision 1.3  2006/06/20 17:09:54  darekr
 - rpmbuild(macros) for _kdedocdir, add TODO
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kxgenerator.spec?r1=1.3&r2=1.4&f=u