rpms/eclipse-gef/devel eclipse-gef-disable-examples-source.patch, NONE, 1.1 sources, 1.9, 1.10 get-gef.sh, 1.4, 1.5 eclipse-gef.spec, 1.20, 1.21
mbooth
mbooth at fedoraproject.org
Wed Jul 1 21:39:46 UTC 2009
Author: mbooth
Update of /cvs/pkgs/rpms/eclipse-gef/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22506/eclipse-gef/devel
Modified Files:
sources get-gef.sh eclipse-gef.spec
Added Files:
eclipse-gef-disable-examples-source.patch
Log Message:
* Wed Jul 01 2009 Mat Booth <fedora at matbooth.co.uk> 3.5.0-1
- Update to 3.5.0 final release (Galileo).
- Build the features seperately to allow for a saner %%files section.
- Use %%global instead of %%define.
eclipse-gef-disable-examples-source.patch:
--- NEW FILE eclipse-gef-disable-examples-source.patch ---
--- org.eclipse.gef.examples-feature/feature.xml 5 Jun 2009 19:49:18 -0000 1.25
+++ org.eclipse.gef.examples-feature/feature.xml 1 Jul 2009 19:54:14 -0000
@@ -56,32 +56,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.eclipse.gef.examples.logic.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.gef.examples.flow.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.gef.examples.text.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.gef.examples.shapes.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 27 May 2009 06:20:47 -0000 1.9
+++ sources 1 Jul 2009 21:39:46 -0000 1.10
@@ -1 +1 @@
-3ff3218301554ab449f1024eb524d284 gef-3.5.0.tar.gz
+b6979e5bc1d33092d494a66471750d43 gef-3.5.0.tar.gz
Index: get-gef.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/get-gef.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- get-gef.sh 27 May 2009 06:20:47 -0000 1.4
+++ get-gef.sh 1 Jul 2009 21:39:46 -0000 1.5
@@ -1,7 +1,7 @@
#!/bin/bash
NAME="gef"
VERSION=3.5.0
-TAG="S200905261334"
+TAG="R200906221200"
echo "Exporting from CVS..."
mkdir $NAME-$VERSION
@@ -22,14 +22,14 @@ if (NF < 4) {
split($1, version, "=");
split(version[1], directory, "@");
cvsdir=split($2, dirName, ":");
- printf("cvs -d %s%s %s %s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
+ printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[2], directory[2]) | "/bin/bash";
}
else {
split($1, version, "=");
total=split($4, directory, "/");
cvsdir=split($2, dirName, ":");
- printf("cvs -d %s%s %s %s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[total], $4) | "/bin/bash";
+ printf("cvs -d %s%s %s %s %s %s %s\n", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q export -r", version[2], "-d", directory[total], $4) | "/bin/bash";
}
}' $TEMPMAPFILE
Index: eclipse-gef.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/devel/eclipse-gef.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- eclipse-gef.spec 27 May 2009 06:20:47 -0000 1.20
+++ eclipse-gef.spec 1 Jul 2009 21:39:46 -0000 1.21
@@ -1,9 +1,9 @@
-%define eclipse_base %{_libdir}/eclipse
-%define eclipse_dropin %{_datadir}/eclipse/dropins
+%global eclipse_base %{_libdir}/eclipse
+%global eclipse_dropin %{_datadir}/eclipse/dropins
Name: eclipse-gef
Version: 3.5.0
-Release: 0.2.RC2%{?dist}
+Release: 1%{?dist}
Summary: Graphical Editing Framework (GEF) Eclipse plugin
Group: System Environment/Libraries
License: EPL
@@ -15,11 +15,17 @@ URL: http://www.eclipse.org/gef/
Source0: gef-%{version}.tar.gz
Source1: get-gef.sh
+# disable examples source plugins (you can still get them through the new
+# example project wizard)
+# TODO: figure out why this stopped building between rc6 and final
+Patch0: %{name}-disable-examples-source.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel
+BuildRequires: java-javadoc
BuildRequires: jpackage-utils
BuildRequires: eclipse-pde >= 1:3.5.0
Requires: java
@@ -48,15 +54,18 @@ Requires: %{name} = %{version}-%{releas
Requires: %{name}-sdk = %{version}-%{release}
%description examples
-Example projects that demonstrate how to use the Eclipse Graphical Editing
-Framework (GEF).
+Installable versions of the example projects from the SDK that demonstrates how
+to use the Eclipse Graphical Editing Framework (GEF) plugin.
%prep
%setup -q -n gef-%{version}
-rm -r org.eclipse.gef-feature/sourceTemplateFeature
-rm -r org.eclipse.draw2d-feature/sourceTemplateFeature
-rm -r org.eclipse.zest-feature/sourceTemplateFeature
+%patch0 -p0
+
+# link to local java api javadocs
+sed -i -e "s|link http://java.sun.com/j2se/1.4.2/docs/api|linkoffline %{_javadocdir}/java %{_javadocdir}/java|" \
+ org.eclipse.gef.doc.isv/gefOptions \
+ org.eclipse.draw2d.doc.isv/draw2dOptions
# make sure upstream hasn't sneaked in any jars we don't know about
JARS=""
@@ -71,62 +80,62 @@ if [ ! -z "$JARS" ]; then
fi
%build
-# build all features
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.gef.all
+# We build the gef and examples features seperately, rather than just
+# building the "all" feature, because it makes the files section easier to
+# maintain (i.e. we don't have to know when upstream adds a new plugin)
+
+# Note: Use date from the cvs tag as the context qualifier.
+
+# build gef features
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.gef \
+ -a "-DforceContextQualifier=v200906221200"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.zest \
+ -a "-DforceContextQualifier=v200906221200"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.gef.sdk \
+ -a "-DforceContextQualifier=v200906221200 -DJAVADOC14_HOME=%{java_home}/bin"
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.zest.sdk \
+ -a "-DforceContextQualifier=v200906221200 -DJAVADOC14_HOME=%{java_home}/bin"
+
+# build examples features
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.gef.examples
%install
rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_dropin}
-unzip -q -d %{buildroot}%{eclipse_dropin}/gef build/rpmBuild/org.eclipse.gef.all.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef build/rpmBuild/org.eclipse.gef.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef build/rpmBuild/org.eclipse.zest.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef-sdk build/rpmBuild/org.eclipse.gef.sdk.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef-sdk build/rpmBuild/org.eclipse.zest.sdk.zip
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/gef-examples build/rpmBuild/org.eclipse.gef.examples.zip
+
+# the non-sdk builds are a subset of the sdk builds, so delete duplicate features & plugins from the sdks
+(cd %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/features && ls %{buildroot}%{eclipse_dropin}/gef/eclipse/features | xargs rm -rf)
+(cd %{buildroot}%{eclipse_dropin}/gef-sdk/eclipse/plugins && ls %{buildroot}%{eclipse_dropin}/gef/eclipse/plugins | xargs rm -rf)
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%dir %{eclipse_dropin}/gef
-%dir %{eclipse_dropin}/gef/eclipse
-%dir %{eclipse_dropin}/gef/eclipse/features
-%dir %{eclipse_dropin}/gef/eclipse/plugins
+%{eclipse_dropin}/gef
%doc org.eclipse.gef-feature/rootfiles/*
-%{eclipse_dropin}/gef/eclipse/epl-v10.html
-%{eclipse_dropin}/gef/eclipse/notice.html
-%{eclipse_dropin}/gef/eclipse/features/org.eclipse.gef_*
-%{eclipse_dropin}/gef/eclipse/features/org.eclipse.draw2d_*
-%{eclipse_dropin}/gef/eclipse/features/org.eclipse.zest_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.draw2d_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.zest.core_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.zest.layouts_*
%files sdk
%defattr(-,root,root,-)
-%doc org.eclipse.gef-feature/rootfiles/*
-%{eclipse_dropin}/gef/eclipse/features/org.eclipse.gef.sdk_*
-%{eclipse_dropin}/gef/eclipse/features/org.eclipse.gef.source_*
-%{eclipse_dropin}/gef/eclipse/features/org.eclipse.draw2d.sdk_*
-%{eclipse_dropin}/gef/eclipse/features/org.eclipse.draw2d.source_*
-%{eclipse_dropin}/gef/eclipse/features/org.eclipse.zest.sdk_*
-%{eclipse_dropin}/gef/eclipse/features/org.eclipse.zest.source_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.doc.isv_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.source_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.examples.ui.pde_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.draw2d.doc.isv_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.draw2d.source_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.zest.source_*
+%{eclipse_dropin}/gef-sdk
+%doc org.eclipse.gef.sdk-feature/rootfiles/*
%files examples
%defattr(-,root,root,-)
-%doc org.eclipse.gef-feature/rootfiles/*
-%{eclipse_dropin}/gef/eclipse/features/org.eclipse.gef.all_*
-%{eclipse_dropin}/gef/eclipse/features/org.eclipse.gef.examples_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.examples.flow_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.examples.logic_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.examples.shapes_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.examples.source_*
-%{eclipse_dropin}/gef/eclipse/plugins/org.eclipse.gef.examples.text_*
+%{eclipse_dropin}/gef-examples
+%doc org.eclipse.gef.examples-feature/rootfiles/*
%changelog
+* Wed Jul 01 2009 Mat Booth <fedora at matbooth.co.uk> 3.5.0-1
+- Update to 3.5.0 final release (Galileo).
+- Build the features seperately to allow for a saner %%files section.
+- Use %%global instead of %%define.
+
* Wed May 27 2009 Alexander Kurtakov <akurtako at redhat.com> 3.5.0-0.2.RC2
- Update to 3.5.0 RC2.
More information about the fedora-extras-commits
mailing list