[eclipse/f16] Revert b723c81edf388ba2f50553a703085ad2e652a6cb. Do not install or package state files.

Roland Grunberg rgrunber at fedoraproject.org
Thu Nov 17 17:20:31 UTC 2011


commit b5e56906381a235ac1bd9e79146f65e95a19aa66
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Thu Nov 17 12:07:23 2011 -0500

    Revert b723c81edf388ba2f50553a703085ad2e652a6cb.
    Do not install or package state files.

 eclipse.spec |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 1a0b59e..f3fb548 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -23,7 +23,7 @@ Epoch:  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -231,6 +231,11 @@ for id in `ls configuration/org.eclipse.osgi/bundles`; do
 done
 popd
 
+# Remove state files
+pushd $RPM_BUILD_ROOT%{_libdir}/%{name}/configuration/org.eclipse.osgi/
+        rm -rf .bundledata* .lazy* .manager .state*
+popd
+
 # Symlinks to the SWT JNI shared libraries in %%{_libdir}/eclipse
 pushd $RPM_BUILD_ROOT%{_libdir}/%{name}
 for lib in $(find configuration -name libswt\*.so); do
@@ -334,12 +339,6 @@ fi
 %defattr(-,root,root)
 %dir %{_libdir}/%{name}/features
 %dir %{_datadir}/%{name}
-%if %{initialize}
-%{_libdir}/%{name}/configuration/org.eclipse.osgi/.bundledata*
-%{_libdir}/%{name}/configuration/org.eclipse.osgi/.lazy*
-%{_libdir}/%{name}/configuration/org.eclipse.osgi/.manager
-%{_libdir}/%{name}/configuration/org.eclipse.osgi/.state*
-%endif
 %dir %{_libdir}/%{name}/configuration
 %config %{_libdir}/%{name}/configuration/config.ini
 %config %{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
@@ -547,6 +546,9 @@ fi
 %{_libdir}/%{name}/dropins/sdk
 
 %changelog
+* Thu Nov 17 2011 Roland Grunberg <rgrunber at redhat.com> 1:3.7.1-3
+- Do not install or package state files.
+
 * Wed Nov 16 2011 Roland Grunberg <rgrunber at redhat.com> 1:3.7.1-2
 - Upload new source fixing RHBZ #753090.
 - Package necessary files relating to initializer.


More information about the scm-commits mailing list