rpms/gentoo/devel gentoo.desktop,NONE,1.1 gentoo.spec,1.8,1.9

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/gentoo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15907

Modified Files:
	gentoo.spec 
Added Files:
	gentoo.desktop 
Log Message:
Minor cleanups.



--- NEW FILE gentoo.desktop ---
[Desktop Entry]
Name=Gentoo File Manager
Comment=Graphical file managment program in GTK+ for Linux
Icon=gentoo 
Exec=gentoo
Terminal=false
Type=Application
Categories=Utility;
Encoding=UTF-8


Index: gentoo.spec
===================================================================
RCS file: /cvs/extras/rpms/gentoo/devel/gentoo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gentoo.spec	11 Oct 2006 09:56:22 -0000	1.8
+++ gentoo.spec	22 Jun 2007 13:15:19 -0000	1.9
@@ -1,11 +1,12 @@
 Summary: Graphical file management program in GTK+ for Linux
 Name: gentoo
 Version: 0.11.56
-Release: 2%{?dist}
+Release: 3
 License: GPL
 Group: Applications/File
 URL: http://www.obsession.se/gentoo/
-Source: http://dl.sf.net/gentoo/gentoo-%{version}.tar.gz
+Source0: http://dl.sf.net/gentoo/gentoo-%{version}.tar.gz
+Source1: gentoo.desktop
 Patch0: gentoo-0.11.56-lang.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk+-devel, gamin-devel, desktop-file-utils
@@ -22,7 +23,7 @@
 
 
 %prep
-%setup
+%setup -q
 %patch0 -p1 -b .lang
 # Keep only UTF-8 translations. This requires the patch above and is easier
 # like this since it would bloat the patch for nothing.
@@ -39,28 +40,17 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 %find_lang %{name}
-%{__install} -D docs/gentoo.1x %{buildroot}%{_mandir}/man1/gentoo.1
-%{__install} -D -m 644 icons/gentoo.png \
+%{__install} -D -p -m 0644 docs/gentoo.1x %{buildroot}%{_mandir}/man1/gentoo.1
+%{__install} -D -p -m 0644 icons/gentoo.png \
     %{buildroot}%{_datadir}/pixmaps/gentoo.png
 
-%{__cat} > %{name}.desktop << EOF
-[Desktop Entry]
-Name=Gentoo File Manager
-Comment=Graphical file managment program in GTK+ for Linux
-Icon=gentoo.png
-Exec=gentoo
-Terminal=false
-Type=Application
-Categories=Application;Utility;
-Encoding=UTF-8
-EOF
-
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor fedora \
+desktop-file-install \
+    --vendor "" \
     --dir %{buildroot}%{_datadir}/applications \
-    %{name}.desktop
+    %{SOURCE1}
 
 
 %clean
@@ -68,18 +58,25 @@
 
 
 %files -f %{name}.lang
-%defattr(-, root, root, 0755)
+%defattr(-,root,root,-)
 %doc AUTHORS BUGS ChangeLog CONFIG-CHANGES COPYING CREDITS docs/
 %doc NEWS ONEWS README README.gtkrc TODO
 %config %{_sysconfdir}/gentoo*
 %{_bindir}/gentoo
-%{_datadir}/applications/*%{name}.desktop
+%{_datadir}/applications/gentoo.desktop
 %{_datadir}/gentoo/
 %{_datadir}/pixmaps/gentoo.png
 %{_mandir}/man1/gentoo.1*
 
 
 %changelog
+* Fri Jun 22 2007 Matthias Saou <http://freshrpms.net/> 0.11.56-3
+- Use DESTDIR install method.
+- Remove "fedora" prefix and useless category from desktop file.
+- Preserve timestamps on
+- Externalize desktop file.
+- Remove dist, as it might be a long while before a new rebuild takes place.
+
 * Wed Oct 11 2006 Matthias Saou <http://freshrpms.net/> 0.11.56-2
 - Fix translations (#210205).