packages: octave/octave.spec - fixed building without desktop-file-utils

[sls]

Author: sls                          Date: Mon Jun 18 15:36:11 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed building without desktop-file-utils

---- Files affected:
packages/octave:
   octave.spec (1.137 -> 1.138) 

---- Diffs:

================================================================
Index: packages/octave/octave.spec
diff -u packages/octave/octave.spec:1.137 packages/octave/octave.spec:1.138
--- packages/octave/octave.spec:1.137	Wed Mar 28 09:26:15 2012
+++ packages/octave/octave.spec	Mon Jun 18 17:36:06 2012
@@ -304,6 +304,7 @@
 	octincludedir=%{_includedir}/octave \
 	octlibdir=%{_libdir}
 
+install -d $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 # Create directory for add-on packages
@@ -311,7 +312,7 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/packages
 touch $RPM_BUILD_ROOT%{_datadir}/%{name}/octave_packages
 
-%{__rm} $RPM_BUILD_ROOT%{_desktopdir}/www.octave.org-octave.desktop
+%{__rm} -f $RPM_BUILD_ROOT%{_desktopdir}/www.octave.org-octave.desktop
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -371,6 +372,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.138  2012/06/18 15:36:06  sls
+- fixed building without desktop-file-utils
+
 Revision 1.137  2012/03/28 07:26:15  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/octave/octave.spec?r1=1.137&r2=1.138