rpms/eclipse-gef/F-10 get-gef.sh, NONE, 1.1 .cvsignore, 1.5, 1.6 eclipse-gef.spec, 1.10, 1.11 sources, 1.5, 1.6 eclipse-gef-dont-set-bootclasspath.patch, 1.1, NONE fetch-gef.sh, 1.2, NONE
Mat Booth
mbooth at fedoraproject.org
Thu Nov 20 19:21:42 UTC 2008
Author: mbooth
Update of /cvs/pkgs/rpms/eclipse-gef/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21085
Modified Files:
.cvsignore eclipse-gef.spec sources
Added Files:
get-gef.sh
Removed Files:
eclipse-gef-dont-set-bootclasspath.patch fetch-gef.sh
Log Message:
* Fri Nov 20 2008 Mat Booth <fedora at matbooth.co.uk> 3.4.1-1
- New maintainer.
- Updated to verion 3.4.1.
- Update package for new Eclipse plugin guidelines.
- Own the gcj/%%{name} directory.
- The 'examples.ui.pde' plugin is actually part of the SDK feature.
--- NEW FILE get-gef.sh ---
#!/bin/bash
NAME="gef"
VERSION=3.4.1
TAG="R200809101400"
echo "Exporting from CVS..."
mkdir $NAME-$VERSION
pushd $NAME-$VERSION >/dev/null
MAPFILE=$NAME.map
TEMPMAPFILE=temp.map
wget "http://download.eclipse.org/tools/$NAME/downloads/drops/$VERSION/$TAG/directory.txt" -O $MAPFILE
grep ^[a-z] $MAPFILE > $TEMPMAPFILE
gawk 'BEGIN {
FS=","
}
{
if (NF < 4) {
split($1, version, "=");
split(version[1], directory, "@");
cvsdir=split($2, dirName, ":");
printf("%s %s %s%s %s %s %s %s %s %s %s\n", "cvs", "-d", ":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("%s %s %s%s %s %s %s %s %s %s %s\n", "cvs", "-d", ":pserver:anonymous at dev.eclipse.org:", dirName[cvsdir], "-q", "export", "-r", version[2], "-d", directory[total], $4) | "/bin/bash";
}
}' $TEMPMAPFILE
rm $TEMPMAPFILE $MAPFILE
popd >/dev/null
echo "Creating tarball '$NAME-$VERSION.tar.gz'..."
tar -czf $NAME-$VERSION.tar.gz $NAME-$VERSION
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/F-10/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 27 Aug 2007 17:45:07 -0000 1.5
+++ .cvsignore 20 Nov 2008 19:21:12 -0000 1.6
@@ -1 +1 @@
-eclipse-gef-fetched-src-3.3.0.tar.bz2
+gef-3.4.1.tar.gz
Index: eclipse-gef.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/F-10/eclipse-gef.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- eclipse-gef.spec 17 Jul 2008 15:09:10 -0000 1.10
+++ eclipse-gef.spec 20 Nov 2008 19:21:12 -0000 1.11
@@ -1,146 +1,97 @@
-%define gcj_support 1
-%define eclipse_base %{_datadir}/eclipse
-%define eclipse_lib_base %{_libdir}/eclipse
-
-Summary: Graphical Editor Framework (GEF) plugin for Eclipse
-Name: eclipse-gef
-Version: 3.3.0
-Release: 3%{?dist}
-License: EPL
-Group: System Environment/Libraries
-URL: http://www.eclipse.org/gef/
-
-# Generate the source drop for GEF 3.3 using the enclosed script:
-# sh ./fetch-gef.sh
-Source0: %{name}-fetched-src-%{version}.tar.bz2
+%define eclipse_base %{_libdir}/eclipse
+%define gcj_support 1
-Patch0: %{name}-dont-set-bootclasspath.patch
+Name: eclipse-gef
+Version: 3.4.1
+Release: 1%{?dist}
+Summary: Graphical Editing Framework (GEF) Eclipse plugin
+Group: System Environment/Libraries
+License: EPL
+URL: http://www.eclipse.org/gef/
+
+# source tarball and the script used to generate it from upstream's source control
+# script usage:
+# $ sh get-gef.sh
+Source0: gef-%{version}.tar.gz
+Source1: get-gef.sh
-BuildRequires: eclipse-pde >= 1:3.3
-%if %{gcj_support}
-BuildRequires: gcc-java >= 4.0.2
-BuildRequires: java-gcj-compat-devel >= 1.0.33
-Requires(post): java-gcj-compat >= 1.0.33
-Requires(postun): java-gcj-compat >= 1.0.33
-%else
-BuildRequires: java-devel >= 1.4.2
-%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %{gcj_support}
-ExclusiveArch: %{ix86} x86_64 ppc ia64
+BuildRequires: gcc-java
+BuildRequires: java-gcj-compat-devel
+Requires(post): java-gcj-compat
+Requires(postun): java-gcj-compat
%else
BuildArch: noarch
%endif
-
-Requires: eclipse-platform >= 1:3.3
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%package sdk
-Summary: Eclipse GEF SDK
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%package examples
-Summary: Eclipse GEF examples
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-sdk = %{version}-%{release}
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+BuildRequires: eclipse-pde >= 1:3.4.1
+Requires: java
+Requires: jpackage-utils
+Requires: eclipse-platform >= 1:3.4.1
%description
-The eclipse-gef package contains Eclipse features and plugins that comprise
-the Graphical Editor Framework for Eclipse.
-
-%description sdk
-Source and documentation for Eclipse GEF for use within Eclipse.
-
-%description examples
-Example source code that demonstrates how to use Eclipse GEF.
+The Graphical Editing Framework (GEF) allows developers to create a rich
+graphical editor from an existing application model. GEF is completely
+application neutral and provides the groundwork to build almost any
+application, including but not limited to: activity diagrams, GUI builders,
+class diagram editors, state machines, and even WYSIWYG text editors.
+
+%package sdk
+Summary: Eclipse GEF SDK
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description sdk
+Documentation and source for the Eclipse Graphical Editing Framework (GEF).
+
+%package examples
+Summary: Eclipse GEF examples
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: %{name}-sdk = %{version}-%{release}
+
+%description examples
+Example projects that demonstrate how to use the Eclipse Graphical Editing
+Framework (GEF).
%prep
-%setup -q -c
+%setup -q -n gef-%{version}
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=134567
-pushd org.eclipse.releng.gefbuilder
-%patch0 -p0
-popd
+rm -r org.eclipse.gef-feature/sourceTemplateFeature
+rm -r org.eclipse.draw2d-feature/sourceTemplateFeature
+rm -r org.eclipse.zest-feature/sourceTemplateFeature
+
+# make sure upstream hasn't sneaked in any jars we don't know about
+JARS=""
+for j in `find -name "*.jar"`; do
+ if [ ! -L $j ]; then
+ JARS="$JARS $j"
+ fi
+done
+if [ ! -z "$JARS" ]; then
+ echo "These jars should be deleted and symlinked to system jars: $JARS"
+ exit 1
+fi
%build
-# See comments in the script to understand this.
-%if 0%{?rhel} == 5
-/bin/sh -x %{eclipse_lib_base}/buildscripts/copy-platform SDK %{eclipse_base}
-%else
-/bin/sh -x %{eclipse_base}/buildscripts/copy-platform SDK %{eclipse_base}
-%endif
-SDK=$(cd SDK > /dev/null && pwd)
-
-mkdir home
-homedir=$(cd home > /dev/null && pwd)
-
-cd org.eclipse.releng.gefbuilder
-
-# some notes about what we're doing here:
-#
-# -Duser.home=$homedir: override java.home in the vm so that eclipse only adds files in the buildroot
-# -Dcomponent=sdk: the component of GEF we want to build
-# -DjavacFailOnError=true: fail if there is an error
-# -DdontUnzip=true: don't unzip the result, we will do it manually
-# -DbaseLocation=$SDK: $SDK is a mirror of the system SDK dir that is writable by the process
-# running the build. This let's the build "see" the jars and have a place to
-# put the plugins that have just been built
-# -DskipFetch=true: don't fetch the sources
-# -DbaseExists=true: don't download the SDK, we want to use the one in $SDK
-eclipse \
- -nosplash \
- -application org.eclipse.ant.core.antRunner \
- -Dcomponent=sdk \
- -DjavacFailOnError=true \
- -DdontUnzip=true \
- -DbaseLocation=$SDK \
- -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build/scripts \
- -DskipFetch=true \
- -DbaseExists=true \
- -DmapsLocal=true
-
-# build the examples
-eclipse \
- -nosplash \
- -application org.eclipse.ant.core.antRunner \
- -Dcomponent=examples \
- -DjavacFailOnError=true \
- -DdontUnzip=true \
- -DbaseLocation=$SDK \
- -Dpde.build.scripts=$SDK/plugins/org.eclipse.pde.build/scripts \
- -DskipFetch=true \
- -DbaseExists=true \
- -DmapsLocal=true
+# build all features
+%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.gef.all
%install
-rm -rf ${RPM_BUILD_ROOT}
-install -d -m755 ${RPM_BUILD_ROOT}/%{eclipse_base}
-
-for file in $(pwd)/org.eclipse.releng.gefbuilder/src/eclipse/I*/*.zip; do
- case $file in
- *eclipse*)
- # The ".." is needed since the zip files contain "eclipse/foo".
- (cd $RPM_BUILD_ROOT/%{eclipse_base}/.. && unzip -qq -o $file)
- ;;
- esac
-done
-
-# These are already included in the Eclipse SDK but the packaging guidelines
-# would like them in a directory owned by this package
-mv $RPM_BUILD_ROOT/%{eclipse_base}/epl-v10.html \
- $RPM_BUILD_ROOT/%{eclipse_base}/features/org.eclipse.gef_*
-mv $RPM_BUILD_ROOT/%{eclipse_base}/notice.html \
- $RPM_BUILD_ROOT/%{eclipse_base}/features/org.eclipse.gef_*
+rm -rf %{buildroot}
+INSTALLDIR=%{buildroot}%{_datadir}/eclipse/dropins/gef
+install -d -m 755 $INSTALLDIR
+unzip -q -d $INSTALLDIR build/rpmBuild/org.eclipse.gef.all.zip
%if %{gcj_support}
-aot-compile-rpm
+%{_bindir}/aot-compile-rpm
%endif
-%clean
-rm -rf ${RPM_BUILD_ROOT}
+%clean
+rm -rf %{buildroot}
%if %{gcj_support}
%post -p %{_bindir}/rebuild-gcj-db
@@ -148,44 +99,78 @@
%endif
%files
-%defattr(-,root,root)
-%{eclipse_base}/features/org.eclipse.gef_*
-%{eclipse_base}/plugins/org.eclipse.draw2d_*
-%{eclipse_base}/plugins/org.eclipse.gef_*
+%defattr(-,root,root,-)
+%dir %{_datadir}/eclipse/dropins/gef
+%doc %{_datadir}/eclipse/dropins/gef/eclipse/epl-v10.html
+%doc %{_datadir}/eclipse/dropins/gef/eclipse/notice.html
+%doc %{_datadir}/eclipse/dropins/gef/eclipse/readme
+%{_datadir}/eclipse/dropins/gef/eclipse/content.xml
+%{_datadir}/eclipse/dropins/gef/eclipse/features/org.eclipse.gef_*
+%{_datadir}/eclipse/dropins/gef/eclipse/features/org.eclipse.draw2d_*
+%{_datadir}/eclipse/dropins/gef/eclipse/features/org.eclipse.zest_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.gef_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.draw2d_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.zest.core_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.zest.layouts_*
+
%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.draw2d_*
+%dir %{_libdir}/gcj/%{name}
%{_libdir}/gcj/%{name}/org.eclipse.gef_*
+%{_libdir}/gcj/%{name}/org.eclipse.draw2d_*
+%{_libdir}/gcj/%{name}/org.eclipse.zest.core_*
+%{_libdir}/gcj/%{name}/org.eclipse.zest.layouts_*
%endif
-%doc %{eclipse_base}/readme/*
-%doc %{eclipse_base}/features/org.eclipse.gef_*/notice.html
-%doc %{eclipse_base}/features/org.eclipse.gef_*/epl-v10.html
%files sdk
-%defattr(-,root,root)
-%{eclipse_base}/features/org.eclipse.gef.sdk_*
-%{eclipse_base}/features/org.eclipse.gef.source_*
-%{eclipse_base}/plugins/org.eclipse.draw2d.doc.isv_*
-%{eclipse_base}/plugins/org.eclipse.gef.doc.isv_*
-%{eclipse_base}/plugins/org.eclipse.gef.source_*
+%defattr(-,root,root,-)
+%doc %{_datadir}/eclipse/dropins/gef/eclipse/epl-v10.html
+%doc %{_datadir}/eclipse/dropins/gef/eclipse/notice.html
+%doc %{_datadir}/eclipse/dropins/gef/eclipse/readme
+%{_datadir}/eclipse/dropins/gef/eclipse/features/org.eclipse.gef.sdk_*
+%{_datadir}/eclipse/dropins/gef/eclipse/features/org.eclipse.gef.source_*
+%{_datadir}/eclipse/dropins/gef/eclipse/features/org.eclipse.draw2d.sdk_*
+%{_datadir}/eclipse/dropins/gef/eclipse/features/org.eclipse.draw2d.source_*
+%{_datadir}/eclipse/dropins/gef/eclipse/features/org.eclipse.zest.sdk_*
+%{_datadir}/eclipse/dropins/gef/eclipse/features/org.eclipse.zest.source_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.gef.doc.isv_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.gef.source_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.gef.examples.ui.pde_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.draw2d.doc.isv_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.draw2d.source_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.zest.source_*
+
+%if %{gcj_support}
+%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.ui.pde_*
+%endif
%files examples
-%defattr(-,root,root)
-%{eclipse_base}/features/org.eclipse.gef.examples_*
-%{eclipse_base}/plugins/org.eclipse.gef.examples.source_*
-%{eclipse_base}/plugins/org.eclipse.gef.examples.text_*
-%{eclipse_base}/plugins/org.eclipse.gef.examples.logic_*
-%{eclipse_base}/plugins/org.eclipse.gef.examples.flow_*
-%{eclipse_base}/plugins/org.eclipse.gef.examples.shapes_*
-%{eclipse_base}/plugins/org.eclipse.gef.examples.ui.pde_*
+%defattr(-,root,root,-)
+%doc %{_datadir}/eclipse/dropins/gef/eclipse/epl-v10.html
+%doc %{_datadir}/eclipse/dropins/gef/eclipse/notice.html
+%doc %{_datadir}/eclipse/dropins/gef/eclipse/readme
+%{_datadir}/eclipse/dropins/gef/eclipse/features/org.eclipse.gef.all_*
+%{_datadir}/eclipse/dropins/gef/eclipse/features/org.eclipse.gef.examples_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.gef.examples.flow_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.gef.examples.logic_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.gef.examples.shapes_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.gef.examples.source_*
+%{_datadir}/eclipse/dropins/gef/eclipse/plugins/org.eclipse.gef.examples.text_*
+
%if %{gcj_support}
-%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.text_*
-%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.logic_*
%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.flow_*
+%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.logic_*
%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.shapes_*
-%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.ui.pde_*
+%{_libdir}/gcj/%{name}/org.eclipse.gef.examples.text_*
%endif
%changelog
+* Fri Nov 20 2008 Mat Booth <fedora at matbooth.co.uk> 3.4.1-1
+- New maintainer.
+- Updated to verion 3.4.1.
+- Update package for new Eclipse plugin guidelines.
+- Own the gcj/%%{name} directory.
+- The 'examples.ui.pde' plugin is actually part of the SDK feature.
+
* Thu Jul 17 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.3.0-3
- fix license tag
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-gef/F-10/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 27 Aug 2007 17:45:07 -0000 1.5
+++ sources 20 Nov 2008 19:21:12 -0000 1.6
@@ -1 +1 @@
-51515328d81339598cecfebf798820ce eclipse-gef-fetched-src-3.3.0.tar.bz2
+1e04bcfbf9753d8b21221dddaed14e07 gef-3.4.1.tar.gz
--- eclipse-gef-dont-set-bootclasspath.patch DELETED ---
--- fetch-gef.sh DELETED ---
More information about the fedora-extras-commits
mailing list