[eclipse-cdt/f18] Force org.eclipse.cdt.linux.%{arch} to be a dir so that the .so files
Jeff Johnston
jjohnstn at fedoraproject.org
Wed Jan 30 17:11:34 UTC 2013
commit 356a0e79ad0f26b71380754e040232f0e0388202
Author: Jeff Johnston <jjohnstn at redhat.com>
Date: Mon Jan 28 17:13:02 2013 -0500
Force org.eclipse.cdt.linux.%{arch} to be a dir so that the .so files
are not loaded into the user's .eclipse configuration.
eclipse-cdt.spec | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec
index bd00990..b35bf80 100644
--- a/eclipse-cdt.spec
+++ b/eclipse-cdt.spec
@@ -27,7 +27,7 @@ Epoch: 1
Summary: Eclipse C/C++ Development Tools (CDT) plugin
Name: eclipse-cdt
Version: %{majmin}.%{micro}
-Release: 2%{?dist}
+Release: 3%{?dist}
License: EPL and CPL
Group: Development/Tools
URL: http://www.eclipse.org/cdt
@@ -121,6 +121,13 @@ sed -i -e 's/arch="x86"/arch="%{eclipse_arch}"/' feature.xml
popd
sed -i -e"/<module>core\/org.eclipse.cdt.core.linux<\/module>/ a\ \t\t<module>core\/org.eclipse.cdt.core.linux.%{eclipse_arch}<\/module>" pom.xml
%endif
+# Force the linux arch-specific plug-in to be a dir so that the .so files aren't loaded into
+# the user.home .eclipse configuration
+pushd core
+pushd org.eclipse.cdt.core.linux.%{eclipse_arch}
+sed -i -e"/Bundle-Localization: plugin/ aEclipse-BundleShape: dir" META-INF/MANIFEST.MF
+popd
+popd
popd
## Libhover stuff
@@ -258,6 +265,10 @@ rm -rf $installDir/eclipse/binary
%doc %{cdt_snapshot}/releng/org.eclipse.cdt.releng/notice.html
%changelog
+* Mon Jan 28 2013 Jeff Johnston <jjohnstn at redhat.com> - 1:8.1.1-3
+- Force org.eclipse.cdt.linux.%%{arch} to be a dir so that the .so files
+ are not loaded into the user's .eclipse configuration.
+
* Fri Jan 25 2013 Jeff Johnston <jjohnstn at redhat.com> - 1:8.1.1-2
- Add compiler exclusion to prevent NPE occuring for arm build.
More information about the scm-commits
mailing list