SPECS (DEVEL): openoffice.org.spec - really *rename* desktop files

[glen]

Author: glen                         Date: Tue Oct  9 14:11:16 2007 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- really *rename* desktop files

---- Files affected:
SPECS:
   openoffice.org.spec (1.775.2.5 -> 1.775.2.6) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.775.2.5 SPECS/openoffice.org.spec:1.775.2.6
--- SPECS/openoffice.org.spec:1.775.2.5	Tue Oct  9 16:01:57 2007
+++ SPECS/openoffice.org.spec	Tue Oct  9 16:11:11 2007
@@ -2425,6 +2425,14 @@
 	# Add in the regcomp tool since some people need it for 3rd party add-ons
 	cp -a build/%{tag}/solver/%{upd}/unxlng*.pro/bin/regcomp{,.bin} $RPM_BUILD_ROOT%{_libdir}/%{name}/program/
 
+	# Rename .desktop files to avoid conflicts with other applications .desktops
+	# TODO: make patch instead.
+	for a in $RPM_BUILD_ROOT%{_desktopdir}/*.desktop; do
+		d=$(dirname "$a")
+		f=$(basename "$a")
+		mv $a $d/oo$f
+	done
+
 	touch installed.stamp
 fi
 
@@ -2507,13 +2515,6 @@
 	s,%{_libdir}/%{name}/share,%{_datadir}/%{name}/share,;
 ' *.lang
 
-# Rename .desktop files to avoid conflicts with other applications .desktops
-desktoplist=$(ls desktop/*.desktop | cut -d"/" -f2)
-
-for desktop in $desktoplist; do
-	install desktop/$desktop $RPM_BUILD_ROOT%{_desktopdir}/oo$desktop
-done
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -4003,6 +4004,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.775.2.6  2007/10/09 14:11:11  glen
+- really *rename* desktop files
+
 Revision 1.775.2.5  2007/10/09 14:01:57  arekm
 - builds on th-x86_64 BUT tons of unpackaged files: http://pastebin.com/f372b42a1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/openoffice.org.spec?r1=1.775.2.5&r2=1.775.2.6&f=u