From c89464cf0953a28c6326df6ced74570985549b11 Mon Sep 17 00:00:00 2001 From: Ben Konrath Date: Sep 17 2007 14:51:23 +0000 Subject: - Pull in build from rawhide. --- diff --git a/.cvsignore b/.cvsignore index e69de29..bc81c83 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1,2 @@ +egit.png +egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz diff --git a/eclipse-egit-add-feature.patch b/eclipse-egit-add-feature.patch new file mode 100644 index 0000000..6e2b067 --- /dev/null +++ b/eclipse-egit-add-feature.patch @@ -0,0 +1,190 @@ +diff --git a/org.spearce.egit-feature/.project b/org.spearce.egit-feature/.project +new file mode 100644 +index 0000000..dac8f65 +--- /dev/null ++++ egit/org.spearce.egit-feature/.project +@@ -0,0 +1,17 @@ ++ ++ ++ org.spearce.egit-feature ++ ++ ++ ++ ++ ++ org.eclipse.pde.FeatureBuilder ++ ++ ++ ++ ++ ++ org.eclipse.pde.FeatureNature ++ ++ +diff --git a/org.spearce.egit-feature/build.properties b/org.spearce.egit-feature/build.properties +new file mode 100644 +index 0000000..64f93a9 +--- /dev/null ++++ egit/org.spearce.egit-feature/build.properties +@@ -0,0 +1 @@ ++bin.includes = feature.xml +diff --git a/org.spearce.egit-feature/feature.xml b/org.spearce.egit-feature/feature.xml +new file mode 100644 +index 0000000..01c53cd +--- /dev/null ++++ egit/org.spearce.egit-feature/feature.xml +@@ -0,0 +1,51 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/org.spearce.egit/.classpath b/org.spearce.egit/.classpath +new file mode 100644 +index 0000000..acad1c2 +--- /dev/null ++++ egit/org.spearce.egit/.classpath +@@ -0,0 +1,6 @@ ++ ++ ++ ++ ++ ++ +diff --git a/org.spearce.egit/.project b/org.spearce.egit/.project +new file mode 100644 +index 0000000..bbdc4e3 +--- /dev/null ++++ egit/org.spearce.egit/.project +@@ -0,0 +1,28 @@ ++ ++ ++ org.spearce.egit ++ ++ ++ ++ ++ ++ org.eclipse.jdt.core.javabuilder ++ ++ ++ ++ ++ org.eclipse.pde.ManifestBuilder ++ ++ ++ ++ ++ org.eclipse.pde.SchemaBuilder ++ ++ ++ ++ ++ ++ org.eclipse.pde.PluginNature ++ org.eclipse.jdt.core.javanature ++ ++ +diff --git a/org.spearce.egit/META-INF/MANIFEST.MF b/org.spearce.egit/META-INF/MANIFEST.MF +new file mode 100644 +index 0000000..40da4e0 +--- /dev/null ++++ egit/org.spearce.egit/META-INF/MANIFEST.MF +@@ -0,0 +1,7 @@ ++Manifest-Version: 1.0 ++Bundle-ManifestVersion: 2 ++Bundle-Name: Java Git / Eclipse Git ++Bundle-SymbolicName: org.spearce.egit ++Bundle-Version: 0.2.2 ++Bundle-Vendor: spearce.org ++Bundle-RequiredExecutionEnvironment: J2SE-1.5 +diff --git a/org.spearce.egit/about.ini b/org.spearce.egit/about.ini +new file mode 100644 +index 0000000..dcab31a +--- /dev/null ++++ egit/org.spearce.egit/about.ini +@@ -0,0 +1,28 @@ ++# about.ini ++# contains information about a feature ++# java.io.Properties file (ISO 8859-1 with "\" escapes) ++# "%key" are externalized strings defined in about.properties ++# This file does not need to be translated. ++ ++# Property "aboutText" contains blurb for "About" dialog (translated) ++aboutText=Java Git / Eclipse Git (by Shawn Pearce) is a Java Git library and plugin for the Eclipse IDE. ++ ++# Property "windowImage" contains path to window icon (16x16) ++# needed for primary features only ++ ++# Property "featureImage" contains path to feature image (32x32) ++featureImage=egit.png ++ ++# Property "aboutImage" contains path to product image (500x330 or 115x164) ++# needed for primary features only ++ ++# Property "appName" contains name of the application (not translated) ++# needed for primary features only ++ ++# Property "welcomePerspective" contains the id of the perspective in which the ++# welcome page is to be opened. ++# optional ++ ++# Property "tipsAndTricksHref" contains the Help topic href to a tips and tricks page ++# optional ++# tipsAndTricksHref=/org.eclipse.jdt.doc.user/tips/jdt_tips.html +\ No newline at end of file +diff --git a/org.spearce.egit/build.properties b/org.spearce.egit/build.properties +new file mode 100644 +index 0000000..34d2e4d +--- /dev/null ++++ egit/org.spearce.egit/build.properties +@@ -0,0 +1,3 @@ ++bin.includes = META-INF/,\ ++ egit.png,\ ++ about.ini diff --git a/eclipse-egit.spec b/eclipse-egit.spec new file mode 100644 index 0000000..6275c19 --- /dev/null +++ b/eclipse-egit.spec @@ -0,0 +1,110 @@ + +%define gcj_support 1 + +Summary: Eclipse Git plug-in +Name: eclipse-egit +Version: 0.2.2 +Release: 1.git20070911%{?dist} +License: EPL GPLv2 LGPLv2 +URL: http://repo.or.cz/w/egit.git +Group: Development/Tools + +# retrieved from http://repo.or.cz/w/egit.git?a=snapshot;h=7a3cbb48ecf66e962020518de3486c9f6d7a4cca;sf=tgz +Source0: egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz +Source1: egit.png +Patch0: %{name}-add-feature.patch + +Requires: eclipse-platform >= 1:3.2.1 +%if %{gcj_support} +BuildRequires: gcc-java >= 4.1.2 +BuildRequires: java-1.5.0-gcj-devel >= 1.5.0 +Requires(post): java-1.5.0-gcj >= 1.5.0 +Requires(postun): java-1.5.0-gcj >= 1.5.0 +%else +BuildRequires: java-devel >= 1.6.0 +%endif + +BuildRequires: eclipse-pde +BuildRequires: jpackage-utils >= 0:1.5 + +%if %{gcj_support} +%else +BuildArch: noarch +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +The eclipse-egit package contains Eclipse plugins for +interacting with Git repositories. + +%prep +%setup -q -c +%patch0 -p0 +cp %{SOURCE1} egit/org.spearce.egit + +%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 + +%install +rm -rf $RPM_BUILD_ROOT +install -d -m755 $RPM_BUILD_ROOT/%{_datadir}/eclipse + +# egit main feature +unzip -q -d $RPM_BUILD_ROOT%{_datadir}/eclipse/.. \ + build/rpmBuild/org.spearce.egit.zip + +%if %{gcj_support} +aot-compile-rpm +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%if %{gcj_support} +%post -p /usr/bin/rebuild-gcj-db +%postun -p /usr/bin/rebuild-gcj-db +%endif + +%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* +%if %{gcj_support} +%{_libdir}/gcj/%{name} +%endif + +%changelog +* Mon Sep 17 2007 Ben Konrath 0.2.2-1.git20070911.fc7 +- Pull in build from rawhide. +- Require eclipse-platform >= 3.2.1. + +* Fri Sep 14 2007 Ben Konrath 0.2.2-0.git20070911.fc8 +- Update to git20070911. +- Update feature and accosicated branding plugin. + +* Wed Aug 29 2007 Ben Konrath 0.2.2-0.git20070826.fc8 +- Initial version diff --git a/sources b/sources index e69de29..b3e09ab 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +5d1082d9db40f01c5de094ac8769514b egit.png +d2730356da7d7b616ff262b4df74bfb2 egit-7a3cbb48ecf66e962020518de3486c9f6d7a4cca.tar.gz