rpms/nip2/devel nip2.spec,1.5,1.6

[Adam Goode (agoode)]

Author: agoode

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

Modified Files:
	nip2.spec 
Log Message:
fix CVS stuff and extra desktop file


Index: nip2.spec
===================================================================
RCS file: /cvs/extras/rpms/nip2/devel/nip2.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nip2.spec	5 May 2007 23:26:29 -0000	1.5
+++ nip2.spec	6 May 2007 04:35:22 -0000	1.6
@@ -38,6 +38,9 @@
 # fix location of help in program to look in correct path
 %patch -P 1 -p1 -b .guidedir
 
+# CVS dirs
+find . -name CVS -type d -print0 | xargs -0 rm -rf
+
 
 %build
 %configure
@@ -54,6 +57,15 @@
 # malkovich??
 rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/malkovich
 
+# the nip2 post install hook seems to run update-mime-database, but we
+# need to run it in post
+rm -rf $RPM_BUILD_ROOT%{_datadir}/mime
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages
+cp -a nip2.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
+
+# same with desktop file
+rm -rf $RPM_BUILD_ROOT%{_datadir}/applications
+
 # locale stuff
 %find_lang nip2
 
@@ -67,12 +79,6 @@
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
 	%{SOURCE1}
 
-# the nip2 post install hook seems to run update-mime-database, but we
-# need to run it in post
-rm -rf $RPM_BUILD_ROOT%{_datadir}/mime
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages
-cp -a nip2.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
-
 
 %post
 # scriptlet for icons