[eclipse-emf-transaction/f19] Fix FTBFS rhbz #913951.
mbooth
mbooth at fedoraproject.org
Sun Apr 21 21:43:59 UTC 2013
commit b33ff50ce201844294fc45aae56974c7448077f6
Author: Mat Booth <fedora at matbooth.co.uk>
Date: Sun Apr 21 22:43:22 2013 +0100
Fix FTBFS rhbz #913951.
.gitignore | 1 +
eclipse-emf-transaction.spec | 31 +++++++++++--------------------
get-emf-transaction.sh | 41 -----------------------------------------
sources | 2 +-
4 files changed, 13 insertions(+), 62 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2480235..b7887f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/.project
/emf-transaction-1.6.0.tar.gz
+/org.eclipse.emf.transaction-Root_R1_6_maintenance.tar.gz
diff --git a/eclipse-emf-transaction.spec b/eclipse-emf-transaction.spec
index 1a6bf6c..ce34739 100644
--- a/eclipse-emf-transaction.spec
+++ b/eclipse-emf-transaction.spec
@@ -1,23 +1,16 @@
%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-transaction
Version: 1.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A model management layer for managing EMF resources
Group: System Environment/Libraries
License: EPL
URL: http://www.eclipse.org/modeling/emf/?project=transaction
-# source tarball and the script used to generate it from upstream's source control
-# script usage:
-# $ sh get-emf-transaction.sh
-Source0: emf-transaction-%{version}.tar.gz
-Source1: get-emf-transaction.sh
+Source0: http://git.eclipse.org/c/emf-transaction/org.eclipse.emf.transaction.git/snapshot/org.eclipse.emf.transaction-%{gittag}.tar.gz
BuildArch: noarch
@@ -25,13 +18,11 @@ BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: eclipse-pde >= 1:4.2.0
BuildRequires: eclipse-emf >= 2.8.0
-BuildRequires: eclipse-emf-query >= 1.6.0
BuildRequires: eclipse-emf-validation >= 1.6.0
Requires: java
Requires: jpackage-utils
Requires: eclipse-platform >= 1:4.2.0
Requires: eclipse-emf >= 2.8.0
-Requires: eclipse-emf-query >= 1.6.0
Requires: eclipse-emf-validation >= 1.6.0
%description
@@ -45,21 +36,18 @@ without the need for client code to use EMF edit commands. These changes are
encapsulated in transactions/operations that can undo and redo themselves.
%prep
-%setup -q -n emf-transaction-%{version}
-
-# remove spurious exec permissions from docs
-find -wholename "*/rootfiles/*" | xargs chmod -x
+%setup -q -n org.eclipse.emf.transaction-%{gittag}
%build
# build emf-transaction features
eclipse-pdebuild -f org.eclipse.emf.transaction \
- -d "../../java/emf emf emf-validation emf-validation" -a "-DforceContextQualifier=%{contextQualifier}"
+ -d "emf emf-validation"
eclipse-pdebuild -f org.eclipse.emf.workspace \
- -d "../../java/emf emf emf-validation emf-validation" -a "-DforceContextQualifier=%{contextQualifier}"
+ -d "emf emf-validation"
eclipse-pdebuild -f org.eclipse.emf.transaction.doc \
- -a "-DforceContextQualifier=%{contextQualifier}"
+ -d "emf emf-validation"
eclipse-pdebuild -f org.eclipse.emf.workspace.doc \
- -a "-DforceContextQualifier=%{contextQualifier}"
+ -d "emf emf-validation"
%install
install -d -m 755 %{buildroot}%{eclipse_dropin}
@@ -73,6 +61,9 @@ unzip -q -n -d %{buildroot}%{eclipse_dropin}/emf-transaction build/rpmBuild/org.
%doc org.eclipse.emf.transaction-feature/rootfiles/*
%changelog
+* Sun Apr 21 2013 Mat Booth <fedora at matbooth.co.uk> - 1.6.0-3
+- Fix FTBFS rhbz #913951.
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 03b899f..c43fa62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9c82851913eb1176d06809d6ef7facb emf-transaction-1.6.0.tar.gz
+999734c5ef81f64351cc7e006e49b5c5 org.eclipse.emf.transaction-Root_R1_6_maintenance.tar.gz
More information about the scm-commits
mailing list