[eclipse-mdt-uml2] Update to latest version, adapt newer packaging guidelines, Fix FTBFS.
mbooth
mbooth at fedoraproject.org
Mon Aug 6 22:45:16 UTC 2012
commit aae6d07dfcb2f52211ebf6fa2b60f1303d719f88
Author: Mat Booth <fedora at matbooth.co.uk>
Date: Mon Aug 6 23:53:23 2012 +0100
Update to latest version, adapt newer packaging guidelines, Fix FTBFS.
.gitignore | 2 +
eclipse-mdt-uml2.spec | 66 +++++++++++++++---------------------------------
get-mdt-uml2.sh | 45 +++++++--------------------------
sources | 2 +-
4 files changed, 34 insertions(+), 81 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 29ba102..b718085 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
mdt-uml2-3.0.1.tar.gz
/mdt-uml2-3.1.0.tar.gz
+/mdt-uml2-4.0.0.tar.gz
+/.project
diff --git a/eclipse-mdt-uml2.spec b/eclipse-mdt-uml2.spec
index f4bc8a9..b015a66 100644
--- a/eclipse-mdt-uml2.spec
+++ b/eclipse-mdt-uml2.spec
@@ -1,14 +1,10 @@
%global eclipse_base %{_libdir}/eclipse
%global eclipse_dropin %{_datadir}/eclipse/dropins
-# Note: Use the tag in get-mdt-uml2.sh as the context qualifier because it's
-# later than the tags of the individual plugins.
-%global contextQualifier v201006071241
-
Name: eclipse-mdt-uml2
-Version: 3.1.0
-Release: 4%{?dist}
-Summary: Implementation of the UML2 OMG metamodel for Eclipse
+Version: 4.0.0
+Release: 1%{?dist}
+Summary: Implementation of the UML2 OMG meta-model for Eclipse
Group: System Environment/Libraries
License: EPL
URL: http://www.eclipse.org/modeling/mdt/uml2
@@ -19,74 +15,54 @@ URL: http://www.eclipse.org/modeling/mdt/uml2
Source0: mdt-uml2-%{version}.tar.gz
Source1: get-mdt-uml2.sh
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildArch: noarch
BuildRequires: java-devel
BuildRequires: jpackage-utils
-BuildRequires: eclipse-pde >= 1:3.6.0
-BuildRequires: eclipse-emf >= 2.6.0
+BuildRequires: eclipse-pde >= 1:4.2.0
+BuildRequires: eclipse-emf >= 2.8.0
+BuildRequires: eclipse-emf-validation
Requires: java
Requires: jpackage-utils
-Requires: eclipse-platform >= 1:3.6.0
-Requires: eclipse-emf >= 2.6.0
+Requires: eclipse-platform >= 1:4.2.0
+Requires: eclipse-emf >= 2.8.0
+Requires: eclipse-emf-validation
%description
UML2 is an EMF-based implementation of the Unified Modeling Language (UML) 2.x
-OMG metamodel for the Eclipse platform. The objectives of the UML2 component
-are to provide a usable implementation of the UML metamodel to support the
+OMG meta-model for the Eclipse platform. The objectives of the UML2 component
+are to provide a usable implementation of the UML meta-model to support the
development of modeling tools, a common XMI schema to facilitate interchange
of semantic models, test cases as a means of validating the specification and
validation rules as a means of defining and enforcing levels of compliance.
-#TODO - sdk/examples subpackages?
-
%prep
%setup -q -n mdt-uml2-%{version}
-# this is provided by eclipse-emf
-rm ./org.eclipse.uml2.uml.ecore.importer/emf.ant.tasks.jar
-
-# 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
-
# remove spurious exec permissions from docs
find -wholename "*/rootfiles/*" | xargs chmod -x
%build
-# put eclipse-emf ant tasks where the build expects them to be
-mkdir -p org.eclipse.emf.ant
-unzip %{eclipse_dropin}/emf/eclipse/plugins/org.eclipse.emf.ant* \
- ant_tasks/emf.ant.tasks.jar -d org.eclipse.emf.ant
-
# build mdt-uml2 features
-%{eclipse_base}/buildscripts/pdebuild -f org.eclipse.uml2 \
- -d "emf" -a "-DforceContextQualifier=%{contextQualifier}"
+eclipse-pdebuild -f org.eclipse.uml2 \
+ -d "emf emf-validation"
+eclipse-pdebuild -f org.eclipse.uml2.doc
%install
-rm -rf %{buildroot}
install -d -m 755 %{buildroot}%{eclipse_dropin}
unzip -q -n -d %{buildroot}%{eclipse_dropin}/mdt-uml2 build/rpmBuild/org.eclipse.uml2.zip
-
-%clean
-rm -rf %{buildroot}
+unzip -q -n -d %{buildroot}%{eclipse_dropin}/mdt-uml2 build/rpmBuild/org.eclipse.uml2.doc.zip
%files
-%defattr(-,root,root,-)
%{eclipse_dropin}/mdt-uml2
-%doc org.eclipse.uml2-feature/rootfiles/*
+%doc org.eclipse.uml2.license-feature/rootfiles/*
%changelog
+* Mon Aug 06 2012 Mat Booth <fedora at matbooth.co.uk> - 4.0.0-1
+- Update to latest version.
+- Adapt newer packaging guidelines.
+- Fix FTBFS.
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/get-mdt-uml2.sh b/get-mdt-uml2.sh
index eaf9f07..2dd3d5b 100644
--- a/get-mdt-uml2.sh
+++ b/get-mdt-uml2.sh
@@ -1,41 +1,16 @@
#!/bin/bash
NAME="mdt-uml2"
-VERSION=3.1.0
-TAG="R201006071241"
+VERSION=4.0.0
+TAG="0763e346bd2b4d9dad17bd0f4155a3cc3d2eed45"
-echo "Exporting from CVS..."
-mkdir $NAME-$VERSION
-pushd $NAME-$VERSION >/dev/null
-
-MAPFILE=$NAME.map
-TEMPMAPFILE=temp.map
-wget "http://download.eclipse.org/modeling/mdt/uml2/downloads/drops/$VERSION/$TAG/directory.txt" -O $MAPFILE
-dos2unix $MAPFILE
-grep ^[a-z] $MAPFILE > $TEMPMAPFILE
-
-gawk 'BEGIN {
- FS=","
-}
-{
-if (NF < 4) {
-
- split($1, version, "=");
- split(version[1], directory, "@");
- cvsdir=split($2, dirName, ":");
- 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 {
+git clone git://git.eclipse.org/gitroot/uml2/org.eclipse.uml2.git
+pushd org.eclipse.uml2
+ git checkout $TAG
+popd
- split($1, version, "=");
- total=split($4, directory, "/");
- cvsdir=split($2, dirName, ":");
- 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
-
-rm $TEMPMAPFILE $MAPFILE
-popd >/dev/null
+mkdir $NAME-$VERSION
+mv org.eclipse.uml2/{doc,examples,plugins,releng,tests}/* $NAME-$VERSION
-echo "Creating tarball '$NAME-$VERSION.tar.gz'..."
tar -czf $NAME-$VERSION.tar.gz $NAME-$VERSION
+rm -rf org.eclipse.uml2/
+rm -rf $NAME-$VERSION/
diff --git a/sources b/sources
index 0bfd815..f9ea070 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7cbf75f8a5528a8c9bd366631cfa0d8 mdt-uml2-3.1.0.tar.gz
+8ab137ba95d31664ace4d119a52f2abf mdt-uml2-4.0.0.tar.gz
More information about the scm-commits
mailing list