[eclipse] Eclipse SCLized
Krzysztof Daniel
kdaniel at fedoraproject.org
Thu Feb 7 13:05:59 UTC 2013
commit b468f97623da97c8770394dca67a1354a712350a
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Thu Feb 7 10:21:40 2013 +0100
Eclipse SCLized
eclipse-fix-swt-build-in-rawhide.patch | 11 +
eclipse-pdebuild-add-target.patch | 2 +-
eclipse.spec | 660 ++++++++++++++++----------------
sources | 2 +-
4 files changed, 352 insertions(+), 323 deletions(-)
---
diff --git a/eclipse-fix-swt-build-in-rawhide.patch b/eclipse-fix-swt-build-in-rawhide.patch
new file mode 100644
index 0000000..1dac9f8
--- /dev/null
+++ b/eclipse-fix-swt-build-in-rawhide.patch
@@ -0,0 +1,11 @@
+--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h.bak 2013-01-28 12:16:08.000000000 +0100
++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/os.h 2013-02-07 12:03:27.234528249 +0100
+@@ -18,7 +18,7 @@
+
+ #define NDEBUG
+
+-#define G_DISABLE_DEPRECATED
++/*#define G_DISABLE_DEPRECATED*/
+ #define GTK_DISABLE_SINGLE_INCLUDES
+ /*
+ #define GTK_DISABLE_DEPRECATED
diff --git a/eclipse-pdebuild-add-target.patch b/eclipse-pdebuild-add-target.patch
index c022ea6..64d981e 100644
--- a/eclipse-pdebuild-add-target.patch
+++ b/eclipse-pdebuild-add-target.patch
@@ -297,4 +297,4 @@
+javacDebugInfo=true
+archiveName=${id}.zip
+runPackager=false
-+baseLocation=/usr/share/eclipse
++baseLocation=@DATADIR@/eclipse
diff --git a/eclipse.spec b/eclipse.spec
index a376c18..63d2bb2 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,3 +1,6 @@
+%{?scl:%scl_package eclipse}
+%{!?scl:%global pkg_name %{name}}
+
Epoch: 1
%global eclipse_major 4
@@ -5,10 +8,10 @@ Epoch: 1
%global eclipse_majmin %{eclipse_major}.%{eclipse_minor}
%global eclipse_micro 0
%global initialize 1
-%global eb_commit 5d6f586d503faf96dc0397915882dbd9ca180b7e
+%global eb_commit 05cdd09dcef5eef6723cc1c5cff3ff0adc3fcece
%global build_id I20130128-1400
%global eclipse_version %{eclipse_majmin}.%{eclipse_micro}
-%global installation_loc %{_libdir}/%{name}
+%global installation_loc %{_libdir}/%{pkg_name}
%ifarch %{ix86}
@@ -49,9 +52,9 @@ fi;
Summary: An open, extensible IDE
-Name: eclipse
+Name: %{?scl_prefix}eclipse
Version: %{eclipse_version}
-Release: 0.2.git201301281400%{?dist}
+Release: 0.3.git201301281400%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -59,74 +62,76 @@ URL: http://www.eclipse.org/
Source0: eclipse-source.tar.bz2
#http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/snapshot/org.eclipse.linuxtools.eclipse-build-701400b0ca475ea73bd828c66b00fb63c5ec2c8c.tar.bz2
Source1: eclipse-build-%{eb_commit}.tar.xz
-Source2: macros.%{name}
+Source2: macros.%{pkg_name}
# -com.sun.el
# +javax.el
# -org.apache.jasper.glassfish
# +org.glassfish.web.javax.servlet.jsp
-Patch0: %{name}-help-doc-adjust-dependencies.patch
+Patch0: %{pkg_name}-help-doc-adjust-dependencies.patch
# -org.w3c.dom.smil
# -javax.annotation
# +org.apache.geronimo.specs.geronimo-annotation_1.1_spec
-Patch1: %{name}-remove-w3c-smil-and-use-geronimo.patch
+Patch1: %{pkg_name}-remove-w3c-smil-and-use-geronimo.patch
-Patch2: %{name}-fix-jdt-dependency-version.patch
+Patch2: %{pkg_name}-fix-jdt-dependency-version.patch
# Eclipse should not duplicate dependency sources (which are delivered
# by those dependencies packages).
-Patch3: %{name}-no-source-for-dependencies.patch
+Patch3: %{pkg_name}-no-source-for-dependencies.patch
# This has too many dependencies. We will not build it.
-Patch4: %{name}-remove-weaving.patch
+Patch4: %{pkg_name}-remove-weaving.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=385970
-Patch5: %{name}-osgi-unpack-sources.patch
+Patch5: %{pkg_name}-osgi-unpack-sources.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=379102
-Patch6: %{name}-do-not-run-as-root.patch
+Patch6: %{pkg_name}-do-not-run-as-root.patch
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=377515
-Patch7: %{name}-p2-pick-up-renamed-jars.patch
+Patch7: %{pkg_name}-p2-pick-up-renamed-jars.patch
# Patch for this was contributed. Unlikely to be released.
-Patch8: %{name}-ignore-version-when-calculating-home.patch
+Patch8: %{pkg_name}-ignore-version-when-calculating-home.patch
# CBI uses timestamps generated from the git commits. We don't have the repo,
# just source, and we don't want additional dependencies.
-Patch9: %{name}-remove-jgit-provider.patch
+Patch9: %{pkg_name}-remove-jgit-provider.patch
# This is for Fedora purposes to have working eclipse-pdebuild script.
-Patch10: %{name}-pdebuild-add-target.patch
+Patch10: %{pkg_name}-pdebuild-add-target.patch
# Strict Fedora purpose, too. We can't build entire product, just base
# and JDT and SDK as update sites, then we can assemble our own packages.
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=386670
# additional poms are a part of e-b
-Patch11: %{name}-change-build-packagings.patch
+Patch11: %{pkg_name}-change-build-packagings.patch
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385410
-Patch12: %{name}-build-network-native-libs.patch
+Patch12: %{pkg_name}-build-network-native-libs.patch
#https://bugs.eclipse.org/bugs/show_bug.cgi?id=385010
-Patch13: %{name}-build-filesystem-native-libs.patch
+Patch13: %{pkg_name}-build-filesystem-native-libs.patch
-Patch14: %{name}-test-support.patch
+Patch14: %{pkg_name}-test-support.patch
-Patch15: %{name}-adjust-p2-dependencies.patch
+Patch15: %{pkg_name}-adjust-p2-dependencies.patch
-Patch16: %{name}-fix-linkageerrors-in-ui.patch
+Patch16: %{pkg_name}-fix-linkageerrors-in-ui.patch
-Patch17: %{name}-secondary-arches.patch
+Patch17: %{pkg_name}-secondary-arches.patch
-Patch18: %{name}-debug-symbols.patch
+Patch18: %{pkg_name}-debug-symbols.patch
# http://git.eclipse.org/c/pde/eclipse.pde.build.git/commit/?id=63df5c9e382b723d6792b49009bdcd1be990a996
# also https://bugs.eclipse.org/bugs/show_bug.cgi?id=399618
-Patch19: %{name}-fix-compilation-problems.patch
+Patch19: %{pkg_name}-fix-compilation-problems.patch
+
+Patch20: %{pkg_name}-fix-comaptibility-class.patch
-Patch20: %{name}-fix-comaptibility-class.patch
+Patch21: %{pkg_name}-fix-swt-build-in-rawhide.patch
BuildRequires: ant >= 1.8.3
BuildRequires: rsync
@@ -255,12 +260,13 @@ Requires: tomcat-servlet-3.0-api
Requires: glassfish-jsp-api >= 2.2.1-4
Requires: glassfish-jsp >= 2.2.5
Requires: icu4j-eclipse >= 1:4.4.2.2-11
-Requires: eclipse-swt = %{epoch}:%{eclipse_version}-%{release}
-Requires: eclipse-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
-Provides: eclipse-cvs-client = %{epoch}:%{eclipse_version}-%{release}
-Obsoletes: eclipse-cvs-client < 1:3.3.2-20
-Obsoletes: eclipse-rcp < 1:%{eclipse_version}-%{release}
-Provides: eclipse-rcp = 1:%{eclipse_version}-%{release}
+Requires: %{name}-swt = %{epoch}:%{eclipse_version}-%{release}
+Requires: %{name}-equinox-osgi = %{epoch}:%{eclipse_version}-%{release}
+%{?scl:Requires: %scl_runtime}
+Provides: %{name}-cvs-client = %{epoch}:%{eclipse_version}-%{release}
+Obsoletes: %{name}-cvs-client < 1:3.3.2-20
+Obsoletes: %{name}-rcp < 1:%{eclipse_version}-%{release}
+Provides: %{name}-rcp = 1:%{eclipse_version}-%{release}
%description platform
The Eclipse Platform is the base of all IDE plugins. This does not include the
@@ -286,8 +292,8 @@ developing software written in the Java programming language.
Version: %{eclipse_version}
Summary: Eclipse Plugin Development Environment
Group: Development/Tools
-Provides: eclipse = %{epoch}:%{eclipse_version}-%{release}
-Provides: eclipse-sdk = %{epoch}:%{eclipse_version}-%{release}
+Provides: %{name} = %{epoch}:%{eclipse_version}-%{release}
+Provides: %{name}-sdk = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-platform = %{epoch}:%{eclipse_version}-%{release}
Requires: %{name}-jdt = %{epoch}:%{eclipse_version}-%{release}
Requires: objectweb-asm >= 3.3.1-1
@@ -337,6 +343,7 @@ tar --strip-components=1 -xf %{SOURCE1}
%patch18
%patch19
%patch20
+%patch21
#Disable as many things as possible to make the build faster. We care only for Eclipse.
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
@@ -456,6 +463,10 @@ popd
mkdir -p rt.equinox.framework/bundles/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
+#pdebuild script should point to dropins
+sed -i -e "s|@DATADIR@|%{_datadir}|g" eclipse.pde.build/org.eclipse.pde.build/templates/package-build/build.properties
+
+
#ensure that bundles with *.so libs are dirs, so no *.so is extracted into user.home
for f in `find eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.* -name MANIFEST.MF` ; do
echo -e "Eclipse-BundleShape: dir\n\n" >> $f;
@@ -563,7 +574,7 @@ cat >> eclipse.ini <<EOF
-XX:CompileCommand=exclude,org/eclipse/cdt/internal/core/pdom/dom/cpp/PDOMCPPLinkage,addBinding
-XX:CompileCommand=exclude,org/python/pydev/editor/codecompletion/revisited/PythonPathHelper,isValidSourceFile
-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState
--Dorg.eclipse.equinox.p2.reconciler.dropins.directory=/usr/share/eclipse/dropins
+-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{_scl_root}/usr/share/eclipse/dropins
EOF
popd #eclipse
@@ -571,23 +582,23 @@ popd #eclipse
%install
#install icons
-install -D eclipse.platform/platform/org.eclipse.platform/eclipse32.png \
- $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/eclipse.png
-install -D eclipse.platform/platform/org.eclipse.platform/eclipse48.png \
- $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/eclipse.png
-install -D eclipse.platform/platform/org.eclipse.platform/eclipse256.png \
- $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps/eclipse.png
-mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
-ln -s /usr/share/icons/hicolor/256x256/apps/eclipse.png \
- $RPM_BUILD_ROOT/usr/share/pixmaps/eclipse.png
+%{?!scl: install -D eclipse.platform/platform/org.eclipse.platform/eclipse32.png \
+ $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/eclipse.png }
+%{?!scl: install -D eclipse.platform/platform/org.eclipse.platform/eclipse48.png \
+ $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/eclipse.png }
+%{?!scl: install -D eclipse.platform/platform/org.eclipse.platform/eclipse256.png \
+ $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps/eclipse.png }
+%{?!scl: mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ }
+%{?!scl:ln -s /usr/share/icons/hicolor/256x256/apps/eclipse.png \
+ $RPM_BUILD_ROOT/usr/share/pixmaps/eclipse.png}
#desktop file
-install -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/eclipse.desktop
+%{?!scl: install -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/eclipse.desktop}
# Some directories we need
install -d -m 755 $RPM_BUILD_ROOT%{_libdir}/java
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT/usr/share/eclipse/dropins
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{pkg_name}
+install -d -m 755 $RPM_BUILD_ROOT%{_scl_root}/usr/share/%{pkg_name}/dropins
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
#################################
@@ -611,19 +622,19 @@ rsync -vrpl eclipse.platform.releng.tychoeclipsebuilder/platform/target/products
#eclipse compiler
chmod ugo+rx jdtcompilatorscript/efj.sh
-mkdir -p $RPM_BUILD_ROOT/usr/bin
-install jdtcompilatorscript/efj.sh $RPM_BUILD_ROOT/usr/bin/efj
+mkdir -p $RPM_BUILD_ROOT%{_scl_root}/usr/bin
+install jdtcompilatorscript/efj.sh $RPM_BUILD_ROOT%{_scl_root}/usr/bin/efj
TARGET_LAUNCHER=%{installation_loc}\/plugins/`ls eclipse.platform.releng.tychoeclipsebuilder/platform/target/products/org.fedoraproject.eclipse.platform/linux/gtk/%{eclipse_arch}/eclipse/plugins | grep launcher_[0-9]*`
-sed -i -e "s, at LAUNCHER@,${TARGET_LAUNCHER}," $RPM_BUILD_ROOT/usr/bin/efj
+sed -i -e "s, at LAUNCHER@,${TARGET_LAUNCHER}," $RPM_BUILD_ROOT%{_scl_root}/usr/bin/efj
#eclipse binary
-mkdir -p $RPM_BUILD_ROOT/usr/bin/
-pushd $RPM_BUILD_ROOT/usr/bin/
- ln -s %{_libdir}/%{name}/eclipse
+mkdir -p $RPM_BUILD_ROOT%{_scl_root}/usr/bin/
+pushd $RPM_BUILD_ROOT%{_scl_root}/usr/bin/
+ ln -s %{_libdir}/%{pkg_name}/eclipse
popd
#SWT is now a folder, but we need to provide jars for others that depend on it.
-pushd $RPM_BUILD_ROOT/%{_libdir}/%{name}
+pushd $RPM_BUILD_ROOT/%{_libdir}/%{pkg_name}
pushd plugins
SWT_JAR=`ls | grep swt.gtk`
#it's a dir now
@@ -631,15 +642,15 @@ cd ${SWT_JAR}
#zip the contents
zip -r "../${SWT_JAR}.jar" *
popd
- ln -s %{_libdir}/%{name}/plugins/"${SWT_JAR}.jar" swt.jar
- ln -s %{_libdir}/%{name}/plugins/"${SWT_JAR}.jar" swt-gtk.jar
- ln -s ../%{name}/swt.jar ../java/swt.jar
+ ln -s %{_libdir}/%{pkg_name}/plugins/"${SWT_JAR}.jar" swt.jar
+ ln -s %{_libdir}/%{pkg_name}/plugins/"${SWT_JAR}.jar" swt-gtk.jar
+ ln -s ../%{pkg_name}/swt.jar ../java/swt.jar
popd
#eclipse ini
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/
pushd $RPM_BUILD_ROOT/%{_sysconfdir}/
- ln -s %{_libdir}/%{name}/eclipse.ini
+ ln -s %{_libdir}/%{pkg_name}/eclipse.ini
popd
#################################
### End of extraction #
@@ -647,58 +658,60 @@ popd
# OSGI JAR symlinks in javadir and maven depmaps
pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
-ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi_*.jar osgi.jar
+ln -s %{?scl: ../../../../}../../../../%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi_*.jar osgi.jar
popd
install -m 0644 externalpoms/org.eclipse.osgi-3.6.0.v20100517.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-osgi.pom
-%add_maven_depmap JPP.eclipse-osgi.pom %{name}/osgi.jar -a "org.eclipse:osgi,org.eclipse.tycho:org.eclipse.osgi" -f equinox-osgi
+%add_maven_depmap JPP.eclipse-osgi.pom %{pkg_name}/osgi.jar -a "org.eclipse:osgi,org.eclipse.tycho:org.eclipse.osgi" -f equinox-osgi
pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
-ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_*.jar osgi.services.jar
+ln -s %{?scl: ../../../../}../../../../%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.services_*.jar osgi.services.jar
popd
install -m 0644 externalpoms/org.eclipse.osgi.services-3.2.100.v20100503.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-osgi.services.pom
-%add_maven_depmap JPP.eclipse-osgi.services.pom %{name}/osgi.services.jar -a "org.eclipse.osgi:services" -f equinox-osgi
+%add_maven_depmap JPP.eclipse-osgi.services.pom %{pkg_name}/osgi.services.jar -a "org.eclipse.osgi:services" -f equinox-osgi
pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
-ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_*.jar osgi.util.jar
+ln -s %{?scl: ../../../../}../../../../%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*.jar osgi.util.jar
popd
pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
-ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.servlet_*.jar equinox.http.servlet.jar
+ln -s %{?scl: ../../../../}../../../../%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.http.servlet_*.jar equinox.http.servlet.jar
popd
install -m 0644 externalpoms/servlet-1.0.0-v20070606.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-equinox.http.servlet.pom
-%add_maven_depmap JPP.eclipse-equinox.http.servlet.pom %{name}/equinox.http.servlet.jar -a "org.eclipse.equinox.http:servlet" -f platform
+%add_maven_depmap JPP.eclipse-equinox.http.servlet.pom %{pkg_name}/equinox.http.servlet.jar -a "org.eclipse.equinox.http:servlet" -f platform
pushd $RPM_BUILD_ROOT%{_javadir}/eclipse
-ln -s ../../../../%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_*.jar jdt.core.jar
+ln -s %{?scl: ../../../../}../../../../%{_libdir}/%{pkg_name}/plugins/org.eclipse.jdt.core_*.jar jdt.core.jar
popd
install -m 0644 externalpoms/org.eclipse.jdt.core-3.8.0.v_C03.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.eclipse-jdt.core.pom
-%add_maven_depmap JPP.eclipse-jdt.core.pom %{name}/jdt.core.jar -a "org.eclipse:jdt.core,org.eclipse.tycho:org.eclipse.jdt.core" -f jdt
+%add_maven_depmap JPP.eclipse-jdt.core.pom %{pkg_name}/jdt.core.jar -a "org.eclipse:jdt.core,org.eclipse.tycho:org.eclipse.jdt.core" -f jdt
# A sanity check.
-desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
+%{?!scl: desktop-file-validate %{buildroot}/%{_datadir}/applications/%{pkg_name}.desktop}
# Create a script that can be used to make a symlink tree of the
# eclipse platform.
cp -p pdebuildscripts/eclipse-copy-platform.sh copy-platform
+sed -i -e "s|@DATADIR@|%{_datadir}|g" copy-platform
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts
-mv copy-platform $RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts
-copyPlatform=$RPM_BUILD_ROOT%{_libdir}/%{name}/buildscripts/copy-platform
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts
+mv copy-platform $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts
+copyPlatform=$RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/buildscripts/copy-platform
# Install the PDE Build wrapper script.
install -p -D -m0755 pdebuildscripts/eclipse-pdebuild.sh \
- $RPM_BUILD_ROOT%{_bindir}/%{name}-pdebuild
-PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins \
+ $RPM_BUILD_ROOT%{_bindir}/%{pkg_name}-pdebuild
+PDEBUILDVERSION=$(ls $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/dropins/sdk/plugins \
| grep org.eclipse.pde.build_ | \
sed 's/org.eclipse.pde.build_//')
sed -i "s/@PDEBUILDVERSION@/$PDEBUILDVERSION/g" \
- $RPM_BUILD_ROOT%{_bindir}/%{name}-pdebuild
-
+ $RPM_BUILD_ROOT%{_bindir}/%{pkg_name}-pdebuild
+sed -i "s|@LIBDIR@|%{_libdir}|g" \
+ $RPM_BUILD_ROOT%{_bindir}/eclipse-pdebuild
#fix pde permissions
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins/org.eclipse.pde.build_*/templates/package-build/*.sh
+chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/dropins/sdk/plugins/org.eclipse.pde.build_*/templates/package-build/*.sh
#replace pde reference
-sed -i "s@/usr/share/eclipse@%{libdir}/%{name}@" $RPM_BUILD_ROOT%{_libdir}/%{name}/dropins/sdk/plugins/org.eclipse.pde.build_*/templates/package-build/build.properties
+sed -i "s@/usr/share/eclipse@%{libdir}/%{pkg_name}@" $RPM_BUILD_ROOT%{_libdir}/%{pkg_name}/dropins/sdk/plugins/org.eclipse.pde.build_*/templates/package-build/build.properties
# Install eclipse macros file
mkdir $RPM_BUILD_ROOT%{_sysconfdir}/rpm/
@@ -726,279 +739,284 @@ popd
sed -i -e "s#@libdir@#%{_libdir}#" $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.sh
-touch $RPM_BUILD_ROOT%{_bindir}/%{name}-runEclipsePackageTests
-chmod a+x $RPM_BUILD_ROOT/%{_bindir}/%{name}-runEclipsePackageTests
-echo '#!/bin/sh' >> $RPM_BUILD_ROOT/%{_bindir}/%{name}-runEclipsePackageTests
-echo 'echo "results in /tmp/eclipse-tests-directory/results/"' >> $RPM_BUILD_ROOT/%{_bindir}/%{name}-runEclipsePackageTests
-echo 'export testslocation="%{_javadir}/eclipse-testing/"' >> $RPM_BUILD_ROOT/%{_bindir}/%{name}-runEclipsePackageTests
-echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{eclipse_arch} ; popd;" >> $RPM_BUILD_ROOT/%{_bindir}/%{name}-runEclipsePackageTests
+touch $RPM_BUILD_ROOT%{_bindir}/%{pkg_name}-runEclipsePackageTests
+chmod a+x $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests
+echo '#!/bin/sh' >> $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests
+echo 'echo "results in /tmp/eclipse-tests-directory/results/"' >> $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests
+echo 'export testslocation="%{_javadir}/eclipse-testing/"' >> $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests
+echo "pushd %{_javadir}/eclipse-testing;./runtests.sh -os linux -ws gtk -arch %{eclipse_arch} ; popd;" >> $RPM_BUILD_ROOT/%{_bindir}/%{pkg_name}-runEclipsePackageTests
%post platform
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+%{?!scl:touch --no-create %{_datadir}/icons/hicolor}
+%{?!scl:if [ -x /usr/bin/gtk-update-icon-cache ]; then}
+ %{?!scl:gtk-update-icon-cache -q %{_datadir}/icons/hicolor}
+%{?!scl:fi}
%postun platform
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
-fi
+%{?!scl:touch --no-create %{_datadir}/icons/hicolor}
+%{?!scl:if [ -x /usr/bin/gtk-update-icon-cache ]; then}
+ %{?!scl:gtk-update-icon-cache -q %{_datadir}/icons/hicolor}
+%{?!scl:fi}
%pre jdt
# workaround for rpm bug, can be removed in F-20 Fixes the problem with efj being directory instead of launcher
-rm -rf %{_bindir}/efj/
+%{?!scl:rm -rf %{_bindir}/efj/}
%files swt
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%{_libdir}/%{name}/notice.html
-%{_libdir}/%{name}/eclipse.ini
-%{_libdir}/%{name}/epl-v10.html
-%{_libdir}/%{name}/plugins/org.eclipse.swt_*
-%{_libdir}/%{name}/plugins/org.eclipse.swt.gtk.linux.*
-%{_libdir}/%{name}/swt-gtk*.jar
-%{_libdir}/%{name}/swt.jar
+%dir %{_libdir}/%{pkg_name}
+%dir %{_libdir}/%{pkg_name}/plugins
+%{_libdir}/%{pkg_name}/notice.html
+%{_libdir}/%{pkg_name}/eclipse.ini
+%{_libdir}/%{pkg_name}/epl-v10.html
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.swt_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.swt.gtk.linux.*
+%{_libdir}/%{pkg_name}/swt-gtk*.jar
+%{_libdir}/%{pkg_name}/swt.jar
%{_libdir}/java/swt.jar
%files platform -f .mfiles-platform
-%attr(0755,root,root) %{_bindir}/%{name}
-%{_libdir}/%{name}/.eclipseproduct
-%config %{_libdir}/%{name}/eclipse.ini
+%attr(0755,root,root) %{_bindir}/%{pkg_name}
+%{_libdir}/%{pkg_name}/.eclipseproduct
+%config %{_libdir}/%{pkg_name}/eclipse.ini
%config %{_sysconfdir}/eclipse.ini
-%{_sysconfdir}/rpm/macros.%{name}
-%{_datadir}/applications/*
-%{_datadir}/pixmaps/*
-%{_datadir}/icons/*/*/apps/*
-%{_libdir}/%{name}/eclipse
-%dir %{_libdir}/%{name}/dropins
-%dir %{_datadir}/%{name}/dropins
-%{_libdir}/%{name}/configuration/config.ini
-%{_libdir}/%{name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
-%{_libdir}/%{name}/features/org.eclipse.platform_*
-%{_libdir}/%{name}/features/org.eclipse.e4.rcp_*
-%{_libdir}/%{name}/features/org.eclipse.rcp_*
-%{_libdir}/%{name}/features/org.eclipse.emf.common_*
-%{_libdir}/%{name}/features/org.eclipse.emf.ecore_*
-%{_libdir}/%{name}/features/org.eclipse.rcp.configuration_*
-%{_libdir}/%{name}/plugins/com.ibm.icu_*
-%{_libdir}/%{name}/plugins/com.jcraft.jsch_*
-%{_libdir}/%{name}/plugins/javax.servlet_*
-%{_libdir}/%{name}/plugins/javax.servlet.jsp_*
-%{_libdir}/%{name}/plugins/javax.xml_*
-%{_libdir}/%{name}/plugins/javax.el_*
-%{_libdir}/%{name}/plugins/javax.inject_*.jar
-%{_libdir}/%{name}/plugins/org.apache.ant_*
-%{_libdir}/%{name}/plugins/org.apache.batik.css_*
-%{_libdir}/%{name}/plugins/org.apache.batik.util.gui_*
-%{_libdir}/%{name}/plugins/org.apache.batik.util_*
-%{_libdir}/%{name}/plugins/org.apache.commons.codec_*
-%{_libdir}/%{name}/plugins/org.apache.commons.httpclient_*
-%{_libdir}/%{name}/plugins/org.apache.commons.logging_*
-%{_libdir}/%{name}/plugins/org.apache.felix.gogo.command_*
-%{_libdir}/%{name}/plugins/org.apache.felix.gogo.runtime_*
-%{_libdir}/%{name}/plugins/org.apache.felix.gogo.shell_*
-%{_libdir}/%{name}/plugins/org.apache.geronimo.specs.geronimo-annotation_1.1_spec_*
-%{_libdir}/%{name}/plugins/org.glassfish.web.javax.servlet.jsp_*
-%{_libdir}/%{name}/plugins/org.apache.lucene.core_*
-%{_libdir}/%{name}/plugins/org.apache.lucene.analysis_*
-%{_libdir}/%{name}/plugins/org.eclipse.ant.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.compare_*
-%{_libdir}/%{name}/plugins/org.eclipse.compare.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.externaltools_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.filebuffers_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.filesystem.linux.*
-%{_libdir}/%{name}/plugins/org.eclipse.core.net_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.net.linux.*
-%{_libdir}/%{name}/plugins/org.eclipse.core.resources_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.variables_*
-%{_libdir}/%{name}/plugins/org.eclipse.debug.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.jdt.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.debug.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.common_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.change_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore.xmi_*
-%{_libdir}/%{name}/plugins/org.eclipse.emf.ecore_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.ds_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.event_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.jetty_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.registry_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.http.servlet_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.jsp.jasper.registry_*
-%{_libdir}/%{name}/plugins/org.eclipse.help.base_*
-%{_libdir}/%{name}/plugins/org.eclipse.help.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.help.webapp_*
-%{_libdir}/%{name}/plugins/org.eclipse.jface.text_*
-%{_libdir}/%{name}/plugins/org.eclipse.jsch.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.jsch.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.ltk.core.refactoring_*
-%{_libdir}/%{name}/plugins/org.eclipse.ltk.ui.refactoring_*
-%{_libdir}/%{name}/plugins/org.eclipse.platform_*
-%{_libdir}/%{name}/plugins/org.eclipse.platform.doc.user_*
-%{_libdir}/%{name}/plugins/org.eclipse.search_*
-%{_libdir}/%{name}/plugins/org.eclipse.team.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.team.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.text_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.browser_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.cheatsheets_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.console_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.editors_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.externaltools_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.forms_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.ide_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.ide.application_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.intro_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.intro.universal_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.navigator.resources_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.net_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.views_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.views.properties.tabbed_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench.texteditor_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.commands_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.contexts_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di.extensions_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.di_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.core.services_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.bindings_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt.theme_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.css.swt_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.di_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.model.workbench_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.services_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.widgets_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.addons.swt_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.renderers.swt_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench.swt_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench3_*
-%{_libdir}/%{name}/plugins/org.eclipse.e4.ui.workbench_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.util_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.server_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.http_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.continuation_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.io_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.security_*
-%{_libdir}/%{name}/plugins/org.eclipse.jetty.servlet_*
-%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.cvs_*
-%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ssh2_*
-%{_libdir}/%{name}/plugins/org.eclipse.team.cvs.ui_*
-%{_libdir}/%{name}/features/org.eclipse.cvs_*
-%{_libdir}/%{name}/features/org.eclipse.help_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*
-%{_libdir}/%{name}/features/org.eclipse.equinox.p2.core.feature_*
-%{_libdir}/%{name}/features/org.eclipse.equinox.p2.extras.feature_*
-%{_libdir}/%{name}/features/org.eclipse.equinox.p2.rcp.feature_*
-%{_libdir}/%{name}/features/org.eclipse.equinox.p2.user.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.core_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.engine_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.jarprocessor_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.metadata.repository_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.artifact.repository_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.touchpoint.natives_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.console_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ql_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.operations_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.transport.ecf_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.importexport_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatechecker_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.garbagecollector_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.directorywatcher_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.publisher_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.publisher.eclipse_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.repository_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.repository.tools_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.reconciler.dropins_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.updatesite_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.security_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.security.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.extensionlocation_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.p2.director.app_*
-%{_libdir}/%{name}/plugins/org.eclipse.ecf.provider.filetransfer_*
-%{_libdir}/%{name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_*
-%{_libdir}/%{name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*
-%{_libdir}/%{name}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_*
-%{_libdir}/%{name}/plugins/org.eclipse.ecf.ssl_*
-%{_libdir}/%{name}/plugins/org.eclipse.ecf_*
-%{_libdir}/%{name}/plugins/org.eclipse.ecf.filetransfer_*
-%{_libdir}/%{name}/plugins/org.eclipse.ecf.identity_*
-%{_libdir}/%{name}/plugins/org.sat4j.core_*
-%{_libdir}/%{name}/plugins/org.sat4j.pb_*
-%{_libdir}/%{name}/plugins/org.w3c.css.sac_*
-%{_libdir}/%{name}/plugins/org.w3c.dom.svg_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.commands_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.contenttype_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.beans_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.observable_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.databinding.property_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.databinding_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.expressions_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.jobs_*
-%{_libdir}/%{name}/plugins/org.eclipse.core.runtime_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.app_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.bidi_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.common_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.concurrent_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.console_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher.gtk.linux.*_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.launcher_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.preferences_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.registry_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.simpleconfigurator_*
-%{_libdir}/%{name}/plugins/org.eclipse.equinox.util_*
-%{_libdir}/%{name}/plugins/org.eclipse.help_*
-%{_libdir}/%{name}/plugins/org.eclipse.jface.databinding_*
-%{_libdir}/%{name}/plugins/org.eclipse.jface_*
-%{_libdir}/%{name}/plugins/org.eclipse.rcp_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui.workbench_*
-%{_libdir}/%{name}/plugins/org.eclipse.ui_*
-%{_libdir}/%{name}/plugins/org.eclipse.update.configurator_*
-%{_libdir}/%{name}/readme/readme_eclipse.html
+%{_sysconfdir}/rpm/macros.%{pkg_name}
+%{?!scl:%{_datadir}/applications/*}
+%{?!scl:%{_datadir}/pixmaps/}
+%{?!scl:%{_datadir}/icons/*/*/apps/*}
+%{_libdir}/%{pkg_name}/eclipse
+%dir %{_libdir}/%{pkg_name}/dropins
+%dir %{_datadir}/%{pkg_name}/dropins
+%{_libdir}/%{pkg_name}/configuration/config.ini
+%{_libdir}/%{pkg_name}/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info
+%{_libdir}/%{pkg_name}/features/org.eclipse.platform_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.e4.rcp_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.rcp_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.emf.common_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.emf.ecore_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.rcp.configuration_*
+%{_libdir}/%{pkg_name}/plugins/com.ibm.icu_*
+%{_libdir}/%{pkg_name}/plugins/com.jcraft.jsch_*
+%{_libdir}/%{pkg_name}/plugins/javax.servlet_*
+%{_libdir}/%{pkg_name}/plugins/javax.servlet.jsp_*
+%{_libdir}/%{pkg_name}/plugins/javax.xml_*
+%{_libdir}/%{pkg_name}/plugins/javax.el_*
+%{_libdir}/%{pkg_name}/plugins/javax.inject_*.jar
+%{_libdir}/%{pkg_name}/plugins/org.apache.ant_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.batik.css_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.batik.util.gui_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.batik.util_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.commons.codec_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.commons.httpclient_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.commons.logging_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.command_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.runtime_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.felix.gogo.shell_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.geronimo.specs.geronimo-annotation_1.1_spec_*
+%{_libdir}/%{pkg_name}/plugins/org.glassfish.web.javax.servlet.jsp_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.lucene.core_*
+%{_libdir}/%{pkg_name}/plugins/org.apache.lucene.analysis_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ant.core_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.compare_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.compare.core_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.externaltools_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.filebuffers_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.filesystem_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.filesystem.linux.*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.net_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.net.linux.*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.resources_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.runtime.compatibility_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.runtime.compatibility.registry_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.variables_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.debug.core_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.jdt.core_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.debug.ui_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.emf.common_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.emf.ecore.change_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.emf.ecore.xmi_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.emf.ecore_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.ds_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.event_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.http.jetty_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.http.registry_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.http.servlet_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.jsp.jasper_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.jsp.jasper.registry_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.help.base_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.help.ui_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.help.webapp_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.jface.text_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.jsch.core_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.jsch.ui_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ltk.core.refactoring_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ltk.ui.refactoring_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.platform_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.platform.doc.user_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.search_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.team.core_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.team.ui_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.text_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.browser_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.cheatsheets_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.console_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.editors_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.externaltools_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.forms_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.ide_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.ide.application_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.intro_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.intro.universal_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.navigator_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.navigator.resources_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.net_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.views_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.views.properties.tabbed_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.workbench.texteditor_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.core.commands_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.core.contexts_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.core.di.extensions_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.core.di_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.core.services_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.bindings_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.css.core_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.css.swt.theme_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.css.swt_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.di_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.model.workbench_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.services_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.widgets_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.workbench.addons.swt_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.workbench.renderers.swt_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.workbench.swt_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.workbench3_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.e4.ui.workbench_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.jetty.util_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.jetty.server_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.jetty.http_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.jetty.continuation_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.jetty.io_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.jetty.security_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.jetty.servlet_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.team.cvs.core_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.cvs_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.team.cvs.ssh2_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.team.cvs.ui_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.cvs_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.help_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.frameworkadmin_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.frameworkadmin.equinox_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.simpleconfigurator.manipulator_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.equinox.p2.core.feature_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.equinox.p2.extras.feature_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.equinox.p2.rcp.feature_*
+%{_libdir}/%{pkg_name}/features/org.eclipse.equinox.p2.user.ui_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.director_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.core_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.engine_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.jarprocessor_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.metadata_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.metadata.repository_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.artifact.repository_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.touchpoint.eclipse_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.touchpoint.natives_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.console_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.ql_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.operations_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.transport.ecf_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.ui_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.ui.importexport_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.ui.sdk_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.ui.sdk.scheduler_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.updatechecker_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.garbagecollector_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.directorywatcher_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.publisher_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.publisher.eclipse_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.repository_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.repository.tools_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.reconciler.dropins_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.updatesite_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.security_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.security.ui_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.extensionlocation_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.p2.director.app_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.httpclient.ssl_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.provider.filetransfer.ssl_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.ssl_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.filetransfer_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ecf.identity_*
+%{_libdir}/%{pkg_name}/plugins/org.sat4j.core_*
+%{_libdir}/%{pkg_name}/plugins/org.sat4j.pb_*
+%{_libdir}/%{pkg_name}/plugins/org.w3c.css.sac_*
+%{_libdir}/%{pkg_name}/plugins/org.w3c.dom.svg_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.commands_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.contenttype_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.databinding.beans_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.databinding.observable_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.databinding.property_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.databinding_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.expressions_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.jobs_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.core.runtime_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.app_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.bidi_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.common_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.concurrent_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.console_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.launcher.gtk.linux.*_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.launcher_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.preferences_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.registry_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.simpleconfigurator_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.equinox.util_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.help_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.jface.databinding_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.jface_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.rcp_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui.workbench_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.ui_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.update.configurator_*
+%{_libdir}/%{pkg_name}/readme/readme_eclipse.html
# Put this in -platform since we're putting the p2 stuff here
-%{_libdir}/%{name}/artifacts.xml
+%{_libdir}/%{pkg_name}/artifacts.xml
# FIXME: should we ship content.xml for the platform?
-#%%{_libdir}/%%{name}/metadata
-%{_libdir}/%{name}/p2
-%{_libdir}/%{name}/about.html
-%{_libdir}/%{name}/about_files/
+#%%{_libdir}/%%{pkg_name}/metadata
+%{_libdir}/%{pkg_name}/p2
+%{_libdir}/%{pkg_name}/about.html
+%{_libdir}/%{pkg_name}/about_files/
%files jdt -f .mfiles-jdt
%attr(0755,root,root) %{_bindir}/efj
-%{_libdir}/%{name}/dropins/jdt
+%{_libdir}/%{pkg_name}/dropins/jdt
%files pde
-%{_bindir}/%{name}-pdebuild
-%{_libdir}/%{name}/buildscripts
-%{_libdir}/%{name}/dropins/sdk
+%{_bindir}/%{pkg_name}-pdebuild
+%{_libdir}/%{pkg_name}/buildscripts
+%{_libdir}/%{pkg_name}/dropins/sdk
%files tests
-%{_bindir}/%{name}-runEclipsePackageTests
-%{_javadir}/%{name}-testing
+%{_bindir}/%{pkg_name}-runEclipsePackageTests
+%{_javadir}/%{pkg_name}-testing
%files equinox-osgi -f .mfiles-equinox-osgi
-%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/osgi.util.jar
-%{_libdir}/%{name}/plugins/org.eclipse.osgi_*
-%{_libdir}/%{name}/plugins/org.eclipse.osgi.services_*
-%{_libdir}/%{name}/plugins/org.eclipse.osgi.util_*
+%dir %{_javadir}/%{pkg_name}
+%{_javadir}/%{pkg_name}/osgi.util.jar
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.services_*
+%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
%changelog
+* Wed Feb 6 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.3.git201301281400
+- SCLize the spec.
+- Enable SWT GTK3 support.
+- Fix SWT build with rawhide.
+
* Tue Feb 5 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.2.git201301281400
- Fixed the generated eclipse.ini
- Fixed the content of generated swt.jar.
diff --git a/sources b/sources
index 45a1f5c..4684d86 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
be15c4f75e20fb30b4aaa6d3354b7683 eclipse-source.tar.bz2
-a2af33268ed29486706e3701163b59d7 eclipse-build-5d6f586d503faf96dc0397915882dbd9ca180b7e.tar.xz
+57203caa34995bb3dae73dcd2efd2540 eclipse-build-05cdd09dcef5eef6723cc1c5cff3ff0adc3fcece.tar.xz
\ No newline at end of file
More information about the scm-commits
mailing list