rpms/eclipse/devel eclipse.spec,1.461,1.462
Ben Konrath (bkonrath)
fedora-extras-commits at redhat.com
Tue Aug 14 18:51:49 UTC 2007
- Previous message (by thread): rpms/Democracy/F-7 sources, 1.3, 1.4 Democracy.spec, 1.16, 1.17 dead.package, 1.1, NONE
- Next message (by thread): rpms/compiz/devel .cvsignore, 1.24, 1.25 compiz.spec, 1.87, 1.88 sources, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: bkonrath
Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6947
Modified Files:
eclipse.spec
Log Message:
* Tue Aug 14 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-8
- Link to junit4 jar.
- Remove included eclipse binaries.
- Add Provides: eclipse to sdk subpackage.
Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.461
retrieving revision 1.462
diff -u -r1.461 -r1.462
--- eclipse.spec 13 Aug 2007 18:46:11 -0000 1.461
+++ eclipse.spec 14 Aug 2007 18:51:17 -0000 1.462
@@ -19,7 +19,7 @@
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 7%{?dist}
+Release: 8%{?dist}
License: Eclipse Public License
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -110,6 +110,7 @@
BuildRequires: lucene-contrib >= 1.9.1
BuildRequires: regexp
BuildRequires: junit >= 3.8.1-3jpp
+BuildRequires: junit4
%if %{gcj_support}
Requires(post): java-gcj-compat >= 1.0.64
Requires(postun): java-gcj-compat >= 1.0.64
@@ -265,6 +266,7 @@
Requires(post): %{name}-ecj = %{epoch}:%{version}-%{release}
Requires(postun): %{name}-ecj = %{epoch}:%{version}-%{release}
Requires: junit >= 3.8.1-3jpp
+Requires: junit4
Requires: java-javadoc
%if %{gcj_support}
Requires(post): java-gcj-compat >= 1.0.64
@@ -338,6 +340,7 @@
%package sdk
Summary: Eclipse SDK
Group: Text Editors/Integrated Development Environments (IDE)
+Provides: eclipse
Requires: %{name}-platform-sdk = %{epoch}:%{version}-%{release}
Requires: %{name}-jdt-sdk = %{epoch}:%{version}-%{release}
Requires: %{name}-pde-sdk = %{epoch}:%{version}-%{release}
@@ -425,8 +428,9 @@
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=144942
find -type f -name \*.xml -exec sed --in-place -r "s/output=\".*(txt|log).*\"//g" "{}" \;
-# Remove existing .sos
+# Remove existing .sos and binary launcher
find -name \*.so | xargs rm
+find features/org.eclipse.equinox.executable -type f -name eclipse | xargs rm
# Symlinks
@@ -542,6 +546,9 @@
JUNITVERSION=$(ls plugins | grep org.junit_3 | sed 's/org.junit_//')
build-jar-repository -s -p plugins/org.junit_$JUNITVERSION junit
+rm plugins/org.junit4/junit.jar
+ln -s %{_javadir}/junit4.jar plugins/org.junit4/junit.jar
+
pushd plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library
# /usr/lib -> /usr/lib64
sed --in-place "s:/usr/lib/:%{_libdir}/:g" build.sh
@@ -754,8 +761,8 @@
# Explode the resulting SDK tarball
tar -C $RPM_BUILD_ROOT%{_datadir} -zxf result/linux-gtk-%{eclipse_arch}-sdk.tar.gz
-%ifarch ppc64 s390 s390x sparc sparc64 alpha
cp launchertmp/eclipse $RPM_BUILD_ROOT%{_datadir}/eclipse
+%ifarch ppc64 s390 s390x sparc sparc64 alpha
cp features/org.eclipse.platform/gtk/eclipse.ini $RPM_BUILD_ROOT%{_datadir}/eclipse
%endif
@@ -1072,6 +1079,9 @@
build-jar-repository -s -p plugins/org.junit_* junit
+rm plugins/org.junit4/junit.jar
+ln -s %{_javadir}/junit4.jar plugins/org.junit4/junit.jar
+
# link to the jsch jar
rm plugins/com.jcraft.jsch_0.1.31.jar
ln -s %{_javadir}/jsch.jar plugins/com.jcraft.jsch_0.1.31.jar
@@ -1653,6 +1663,11 @@
%{_libdir}/%{name}/plugins/org.eclipse.sdk_*
%changelog
+* Tue Aug 14 2007 Ben Konrath <bkonrath at redhat.com> 3.3.0-8
+- Link to junit4 jar.
+- Remove included eclipse binaries.
+- Add Provides: eclipse to sdk subpackage.
+
* Mon Aug 13 2007 Oliver Falk <oliver at linux-kernel.at> 3.3.0-7
- Also explode SDK tarball on alpha
- Resolves: #251958
- Previous message (by thread): rpms/Democracy/F-7 sources, 1.3, 1.4 Democracy.spec, 1.16, 1.17 dead.package, 1.1, NONE
- Next message (by thread): rpms/compiz/devel .cvsignore, 1.24, 1.25 compiz.spec, 1.87, 1.88 sources, 1.26, 1.27
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list