[eclipse-photran] Update to 8.2.0.

Alexander Kurtakov akurtakov at fedoraproject.org
Wed Jul 2 11:37:32 UTC 2014


commit bf468362bd6bc62cb6621438b56e4d084fddffaf
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Jul 2 14:37:37 2014 +0300

    Update to 8.2.0.

 .gitignore           |    1 +
 eclipse-photran.spec |   21 +++++++++------------
 makesource.sh        |   12 ------------
 sources              |    2 +-
 4 files changed, 11 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7231de9..5d68721 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ photran-v200910081739.tar.gz
 /org.eclipse.photran-PTP_7_0_2.tar.bz2
 /org.eclipse.photran-PTP_7_0_3.tar.bz2
 /org.eclipse.photran-PTP_7_0_4.tar.bz2
+/org.eclipse.photran-PTP_8_0_0.tar.bz2
diff --git a/eclipse-photran.spec b/eclipse-photran.spec
index a40ccec..47d1e4e 100644
--- a/eclipse-photran.spec
+++ b/eclipse-photran.spec
@@ -1,26 +1,23 @@
 %global eclipse_base            %{_datadir}/eclipse
 %global cdtreq                  1:8.1.0
-%global photran_build_id        201402042348
-%global photran_git_tag         PTP_7_0_4
-#global photran_git_tag         5313e0561fbb3d888ecf1817c6101a36e0b89a07
+%global photran_git_tag         PTP_8_0_0
+%global photran_build_id        201406102021
 
 Summary:        Fortran Development Tools (Photran) for Eclipse
 Name:           eclipse-photran
-Version:        8.1.4
-Release:        2%{?dist}
+Version:        8.2.0
+Release:        1%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/ptp
 
 # The following tarballs were downloaded from the git repositories
 Source0:        http://git.eclipse.org/c/ptp/org.eclipse.photran.git/snapshot/org.eclipse.photran-%{photran_git_tag}.tar.bz2
-# These are made with makesource.sh
-#Source0:        org.eclipse.photran-%{photran_git_tag}.tar.xz
-Source1:        makesource.sh
 
 BuildRequires:  maven-local
 BuildRequires:  tycho
 BuildRequires:  eclipse-cdt >= %{cdtreq}
+BuildRequires:  eclipse-license
 BuildArch:      noarch
 Requires:       eclipse-cdt >= %{cdtreq}
 
@@ -49,9 +46,6 @@ Error parser and managed build tool chain for the IBM XLF compiler.
 
 %prep
 %setup -q -n org.eclipse.photran-%{photran_git_tag}
-# Fix tycho version
-tychover=$(sed -ne '/<version>/{s/.*>\(.*\)<.*/\1/;p;q}' < /usr/share/maven-fragments/tycho)
-sed -i -e "/tycho-version/s/>.*</>${tychover}</" pom.xml
 
 # We need to rebuild this jar from the sources within it
 pwd
@@ -80,7 +74,7 @@ popd
 #Interferes with feature build
 rm -rf cdtdb-4.0.3-eclipse
 # Build the projects
-mvn-rpmbuild -DforceContextQualifier=%{photran_build_id} install
+xmvn -o -DforceContextQualifier=%{photran_build_id} verify
 
 
 %install
@@ -120,6 +114,9 @@ sed -i -e '/org.eclipse.rephraserengine_/d' files.org.eclipse.photran_%{version}
 
 
 %changelog
+* Wed Jul 2 2014 Alexander Kurtakov <akurtako at redhat.com> 8.2.0-1
+- Update to 8.2.0.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.1.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 7defb27..641ad21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-47db694df20b4980cba00a1fb54638bc  org.eclipse.photran-PTP_7_0_4.tar.bz2
+7691fb919aa1c6be7937074b1df20132  org.eclipse.photran-PTP_8_0_0.tar.bz2


More information about the scm-commits mailing list