rpms/eclipse/devel eclipse.spec,1.402,1.403

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Jan 29 22:34:32 UTC 2007


Author: bkonrath

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6303

Modified Files:
	eclipse.spec 
Log Message:
* Mon Jan 29 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-33
- Check for features directory in sdk postun script. 
- Resolves: #224588.



Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -r1.402 -r1.403
--- eclipse.spec	27 Jan 2007 05:51:29 -0000	1.402
+++ eclipse.spec	29 Jan 2007 22:34:29 -0000	1.403
@@ -19,7 +19,7 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        32%{?dist} 
+Release:        33%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1380,7 +1380,11 @@
 # Only set the product back to platform.ide if the sdk is actually removed for
 # this arch.  This SDKDIR check is to deal with the ordering of new %%post
 # before old %%postun
-SDKDIR=$(ls %{_libdir}/%{name}/features | grep "org\.eclipse\.sdk_")
+if [ -d /usr/lib/eclipse/features]; then
+  SDKDIR=$(ls %{_libdir}/%{name}/features | grep "org\.eclipse\.sdk_")
+else
+  SDKDIR=""
+fi
 if [ -z "$SDKDIR" -a -f %{_libdir}/%{name}/configuration/config.ini ]; then
   sed --in-place "s/[#]*eclipse.product=.*/eclipse.product=org.eclipse.platform.ide/" \
     %{_libdir}/%{name}/configuration/config.ini
@@ -1728,6 +1732,10 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Mon Jan 29 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-33
+- Check for features directory in sdk postun script. 
+- Resolves: #224588.
+
 * Fri Jan 26 2007 Ben Konrath <bkonrath at redhat.com> 3.2.1-32
 - Fix bug in ecj [] patch.
 




More information about the fedora-cvs-commits mailing list