From a3ce4f87edb125354a20d6994f264481b1c06ad0 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Apr 21 2013 14:43:19 +0000 Subject: Fix FTBFS rhbz #913952. --- diff --git a/.gitignore b/.gitignore index 99bb5c0..eff0532 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /.project /emf-validation-1.6.0.tar.gz +/org.eclipse.emf.validation-Root_R1_6_maintenance.tar.gz diff --git a/eclipse-emf-validation.spec b/eclipse-emf-validation.spec index 935e503..ab37774 100644 --- a/eclipse-emf-validation.spec +++ b/eclipse-emf-validation.spec @@ -1,23 +1,19 @@ %global eclipse_base %{_libdir}/eclipse %global eclipse_dropin %{_datadir}/eclipse/dropins - -# Note: Use the tag in get-mdt-ocl.sh as the context qualifier because it's -# later than the tags of the individual plugins. -%global contextQualifier R201206271200 +%global gittag Root_R1_6_maintenance Name: eclipse-emf-validation Version: 1.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Verify the integrity of EMF models Group: System Environment/Libraries License: EPL URL: http://www.eclipse.org/modeling/emf/?project=validation -# source tarball and the script used to generate it from upstream's source control -# script usage: -# $ sh get-emf-validation.sh -Source0: emf-validation-%{version}.tar.gz -Source1: get-emf-validation.sh +Source0: http://git.eclipse.org/c/emf-validation/org.eclipse.emf.validation.git/snapshot/org.eclipse.emf.validation-%{gittag}.tar.gz + +# patch to accomodate ICU4J changing version number schemes +Patch0: fix-icu-version.patch BuildArch: noarch @@ -26,11 +22,13 @@ BuildRequires: jpackage-utils BuildRequires: eclipse-pde >= 1:4.2.0 BuildRequires: eclipse-emf >= 2.8.0 BuildRequires: eclipse-mdt-ocl >= 4.0.0 +BuildRequires: eclipse-mdt-uml2 >= 4.0.0 Requires: java Requires: jpackage-utils Requires: eclipse-platform >= 1:4.2.0 Requires: eclipse-emf >= 2.8.0 Requires: eclipse-mdt-ocl >= 4.0.0 +Requires: eclipse-mdt-uml2 >= 4.0.0 %description The validation component provides an API for defining constraints for any EMF @@ -44,19 +42,17 @@ to constraints that need to be enforced on these objects and provides support for listening to validation events. %prep -%setup -q -n emf-validation-%{version} - -# remove spurious exec permissions from docs -find -wholename "*/rootfiles/*" | xargs chmod -x +%setup -q -n org.eclipse.emf.validation-%{gittag} +%patch0 -p0 -b .orig %build # build emf-validation features eclipse-pdebuild -f org.eclipse.emf.validation \ - -d "../../java/emf emf mdt-ocl" -a "-DforceContextQualifier=%{contextQualifier}" + -d "emf mdt-ocl mdt-uml2" eclipse-pdebuild -f org.eclipse.emf.validation.ocl \ - -d "../../java/emf emf mdt-ocl /usr/share/java/emf" -a "-DforceContextQualifier=%{contextQualifier}" + -d "emf mdt-ocl mdt-uml2" eclipse-pdebuild -f org.eclipse.emf.validation.doc \ - -a "-DforceContextQualifier=%{contextQualifier}" + -d "emf mdt-ocl mdt-uml2" %install install -d -m 755 %{buildroot}%{eclipse_dropin} @@ -69,6 +65,9 @@ unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-validation build/rpmBuild/org.e %doc org.eclipse.emf.validation-feature/rootfiles/* %changelog +* Sun Apr 21 2013 Mat Booth - 1.6.0-3 +- Fix FTBFS rhbz #913952. + * Wed Feb 13 2013 Fedora Release Engineering - 1.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/fix-icu-version.patch b/fix-icu-version.patch new file mode 100644 index 0000000..652b48e --- /dev/null +++ b/fix-icu-version.patch @@ -0,0 +1,26 @@ +--- ./org.eclipse.emf.validation.ui/META-INF/MANIFEST.MF.orig 2013-04-21 15:21:59.920138691 +0100 ++++ ./org.eclipse.emf.validation.ui/META-INF/MANIFEST.MF 2013-04-21 15:22:17.104103090 +0100 +@@ -11,7 +11,7 @@ + org.eclipse.emf.validation.ui.internal.l10n;x-internal:=true, + org.eclipse.emf.validation.ui.internal.preferences;x-internal:=true, + org.eclipse.emf.validation.ui.preferences +-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)" ++Import-Package: com.ibm.icu.text + Require-Bundle: org.eclipse.emf.validation;bundle-version="[1.2.0,2.0.0)", + org.eclipse.ui;bundle-version="[3.2.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", +--- ./org.eclipse.emf.validation/META-INF/MANIFEST.MF.orig 2013-04-21 15:21:20.499220307 +0100 ++++ ./org.eclipse.emf.validation/META-INF/MANIFEST.MF 2013-04-21 15:21:48.807161707 +0100 +@@ -22,9 +22,9 @@ + org.eclipse.emf.validation.service, + org.eclipse.emf.validation.util, + org.eclipse.emf.validation.xml +-Import-Package: com.ibm.icu.text;version="[4.0.0,5.0.0)", +- com.ibm.icu.lang;version="[4.0.0,5.0.0)", +- com.ibm.icu.util;version="[4.0.0,5.0.0)" ++Import-Package: com.ibm.icu.text, ++ com.ibm.icu.lang, ++ com.ibm.icu.util + Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.3.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.3.0,3.0.0)", + org.eclipse.core.expressions;bundle-version="[3.2.0,4.0.0)", diff --git a/get-emf-validation.sh b/get-emf-validation.sh deleted file mode 100644 index a757230..0000000 --- a/get-emf-validation.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -NAME="emf-validation" -VERSION=1.6.0 -TAG="R201206271200" - -echo "Exporting from CVS..." -mkdir $NAME-$VERSION -pushd $NAME-$VERSION >/dev/null - -MAPFILE=$NAME.map -TEMPMAPFILE=temp.map -wget "http://download.eclipse.org/modeling/emf/validation/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@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\n", ":pserver:anonymous@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 diff --git a/sources b/sources index 78f08d8..5fd91bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea7fd3245e85e65d5c6c93db34d56a90 emf-validation-1.6.0.tar.gz +77178bbe212ff9d8220cccfa7682399a org.eclipse.emf.validation-Root_R1_6_maintenance.tar.gz