rpms/eclipse-egit/devel eclipse-egit.spec,1.13,1.14
Rob Myers
rmyers at fedoraproject.org
Sun Sep 28 17:33:28 UTC 2008
Author: rmyers
Update of /cvs/pkgs/rpms/eclipse-egit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22617
Modified Files:
eclipse-egit.spec
Log Message:
Move files and update build for Eclipse SDK 3.4 (patch from overholt, thanks)
Index: eclipse-egit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-egit/devel/eclipse-egit.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- eclipse-egit.spec 17 Jul 2008 15:11:03 -0000 1.13
+++ eclipse-egit.spec 28 Sep 2008 17:32:58 -0000 1.14
@@ -4,7 +4,7 @@
Summary: Eclipse Git plug-in
Name: eclipse-egit
Version: 0.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: EPL and GPLv2 and LGPLv2
URL: http://repo.or.cz/w/egit.git
Group: Development/Tools
@@ -40,35 +40,16 @@
%setup -q -c
%build
-# Copy the SDK for build
-/bin/sh -x %{_datadir}/eclipse/buildscripts/copy-platform SDK %{_datadir}/eclipse
-SDK=$(cd SDK > /dev/null && pwd)
-
-# Eclipse may try to write to the home directory.
-mkdir home
-homedir=$(cd home > /dev/null && pwd)
-
-# build the main egit feature
-java -cp $SDK/startup.jar \
- -Dosgi.sharedConfiguration.area=%{_libdir}/eclipse/configuration \
- org.eclipse.core.launcher.Main \
- -application org.eclipse.ant.core.antRunner \
- -Dtype=feature \
- -Did=org.spearce.egit \
- -DbaseLocation=$SDK \
- -DjavacSource=1.5 -DjavacTarget=1.5 \
- -DsourceDirectory=$(pwd) \
- -DbuildDirectory=$(pwd)/build \
- -Dbuilder=%{_datadir}/eclipse/plugins/org.eclipse.pde.build/templates/package-build \
- -f %{_datadir}/eclipse/plugins/org.eclipse.pde.build/scripts/build.xml \
- -vmargs -Duser.home=$homedir
+%{_libdir}/eclipse/buildscripts/pdebuild \
+ -a "-DjavacSource=1.5 -DjavacTarget=1.5"
%install
rm -rf $RPM_BUILD_ROOT
-install -d -m755 $RPM_BUILD_ROOT/%{_datadir}/eclipse
+installDir=$RPM_BUILD_ROOT/%{_datadir}/eclipse/dropins/egit
+install -d -m755 $installDir
# egit main feature
-unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \
+unzip -q -d $installDir/ \
build/rpmBuild/org.spearce.egit.zip
%if %{gcj_support}
@@ -85,16 +66,16 @@
%files
%defattr(-,root,root,-)
-%{_datadir}/eclipse/features/org.spearce.egit*
-%{_datadir}/eclipse/plugins/org.spearce.egit*
-%{_datadir}/eclipse/plugins/org.spearce.egit.core*
-%{_datadir}/eclipse/plugins/org.spearce.egit.ui*
-%{_datadir}/eclipse/plugins/org.spearce.jgit*
+%{_datadir}/eclipse/dropins/egit
%if %{gcj_support}
%{_libdir}/gcj/%{name}
%endif
%changelog
+* Wed Jul 30 2008 Andrew Overholt <overholt at redhat.com> 0.3.1-2
+- Move files and update build for Eclipse SDK 3.4
+- Use pdebuild
+
* Thu Jul 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.3.1-1
- fix license tag
More information about the fedora-extras-commits
mailing list