rpms/ice/F-11 ice.spec,1.32,1.33

[mef]

Author: mef

Update of /cvs/pkgs/rpms/ice/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28132/F-11

Modified Files:
	ice.spec 
Log Message:
Minor changes to allow ice to be built on RHEL


Index: ice.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ice/F-11/ice.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ice.spec	1 Feb 2010 14:52:26 -0000	1.32
+++ ice.spec	16 Feb 2010 11:42:07 -0000	1.33
@@ -4,7 +4,7 @@
 
 Name: ice
 Version: 3.3.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: The Ice base runtime and services
 
 Group: System Environment/Libraries
@@ -226,9 +226,16 @@ cp -p ${RPM_BUILD_DIR}/Ice-%{version}/ja
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 cp -p %{SOURCE8} ${RPM_BUILD_ROOT}%{_bindir}
 sed -i -e "s#DIR#%{_datadir}/Ice-%{version}#" $RPM_BUILD_ROOT%{_bindir}/icegridgui
+%if 0%{?rhel}
 desktop-file-install \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+	--vendor = zeroc \
         %{SOURCE9}
+%else
+desktop-file-install \
+        --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
+        %{SOURCE9}
+%endif
 
 # Move other rpm-specific files into the right place (README, service stuff)
 mkdir -p $RPM_BUILD_ROOT%{_defaultdocdir}/Ice-%{version}
@@ -468,7 +475,7 @@ fi
 %{_datadir}/Ice-%{version}/IceGridGUI.jar
 %attr(755,root,root) %{_bindir}/icegridgui
 %doc %{_mandir}/man1/icegridgui.1.gz
-%{_datadir}/applications/IceGridAdmin.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/icegrid.png
 %{_defaultdocdir}/Ice-%{version}/IceGridAdmin
 
@@ -538,6 +545,10 @@ fi
 %config(noreplace) %{_sysconfdir}/php.d/ice.ini
 
 %changelog
+* Tue Feb 16 2010 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1-4
+- Change the desktop-file-install invocation to allow the RPM to be 
+  rebuilt on RHEL (bug 565411)
+
 * Mon Feb  1 2010 Mary Ellen Foster <mefoster at gmail.com> - 3.3.1-3
 - Fix the user name in the server scripts (bug 557411)