[tycho-extras] Update to 0.16.0 Release.

Roland Grunberg rgrunber at fedoraproject.org
Fri Oct 19 21:13:21 UTC 2012


commit ff8444e58041dd831f401adde84b0c23aed77707
Author: Roland Grunberg <rgrunber at redhat.com>
Date:   Fri Oct 19 15:22:23 2012 -0400

    Update to 0.16.0 Release.

 .gitignore                     |    5 ++---
 sources                        |    2 +-
 tycho-extras-remove-core.patch |   30 ++++++++++++++++++++++++++++++
 tycho-extras.spec              |   17 ++++++++++-------
 4 files changed, 43 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2efb3b9..eea668b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/tycho-extras-0.14.x.tar.bz2
-/tycho-extras-0.15.x.tar.bz2
-/org.eclipse.tycho.extras-e58861033fdadbae0563a703feae75bc50245bee.tar.bz2
+/tycho-extras-*.bz2
+/org.eclipse.tycho.extras-*.bz2
diff --git a/sources b/sources
index ef90065..db4805d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f510afa5a501bd10dd44d95828de5a4e  org.eclipse.tycho.extras-e58861033fdadbae0563a703feae75bc50245bee.tar.bz2
+0568752ff0ae1b8e40263b6e3637488c  tycho-extras-0.16.x.tar.bz2
diff --git a/tycho-extras-remove-core.patch b/tycho-extras-remove-core.patch
new file mode 100644
index 0000000..a5e5a89
--- /dev/null
+++ b/tycho-extras-remove-core.patch
@@ -0,0 +1,30 @@
+diff --git a/tycho-p2-extras-plugin/pom.xml b/tycho-p2-extras-plugin/pom.xml
+index b1f97ed..2721b8d 100644
+--- a/tycho-p2-extras-plugin/pom.xml
++++ b/tycho-p2-extras-plugin/pom.xml
+@@ -46,8 +46,8 @@
+ 			<version>${project.version}</version>
+ 		</dependency>
+ 
+-        <dependency>
+             <!--
++        <dependency>
+                 Workaround 387848 and 348394.
+ 
+                 Ideally, we want to be able to run unit/integration tests in three distinct environments
+@@ -65,7 +65,6 @@
+                   from remote repositories.
+                 - new snapshots/releases <pluginRepository> in test pom.xml files gives test project access to
+                   tycho-core artifacts
+-             -->
+             <groupId>org.apache.maven</groupId>
+             <artifactId>apache-maven</artifactId>
+             <version>${maven-version}</version>
+@@ -73,6 +72,7 @@
+             <type>tar.gz</type>
+             <scope>provided</scope>
+         </dependency>
++             -->
+ 	</dependencies>
+ 
+ 	<build>
diff --git a/tycho-extras.spec b/tycho-extras.spec
index 1bdac47..dfc4fcf 100644
--- a/tycho-extras.spec
+++ b/tycho-extras.spec
@@ -1,16 +1,15 @@
-%global sha e58861033fdadbae0563a703feae75bc50245bee
-
 Name:           tycho-extras
 Version:        0.16.0
-Release:        1.e58861%{?dist}
+Release:        2%{?dist}
 Summary:        Additional plugins for Tycho
 
 Group:          Development/Libraries
 License:        EPL
 URL:            http://eclipse.org/tycho/
-Source0:        http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/org.eclipse.tycho.extras-%{sha}.tar.bz2
+Source0:        http://git.eclipse.org/c/tycho/org.eclipse.tycho.extras.git/snapshot/tycho-extras-0.16.x.tar.bz2
 # maven-properties-plugin is only needed for tests
 Patch0:         %{name}-no-maven-properties-plugin.patch
+Patch1:         %{name}-remove-core.patch
 
 BuildArch:      noarch
 
@@ -39,8 +38,9 @@ Requires:       jpackage-utils
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n org.eclipse.tycho.extras-%{sha}
+%setup -q -n tycho-extras-0.16.x
 %patch0 -p1
+%patch1 -p1
 
 %build
 # To run tests, we need :
@@ -55,13 +55,13 @@ install -pm 644 pom.xml  %{buildroot}%{_mavenpomdir}/JPP.%{name}-main.pom
 %add_maven_depmap JPP.%{name}-main.pom -a "org.eclipse.tycho:tycho-extras,org.sonatype.tycho:tycho-extras"
 
 for mod in tycho-{custom-bundle,eclipserun,source-feature,version-bump}-plugin \
-           tycho-buildtimestamp-jgit tycho-p2-extras-plugin \
+           tycho-{buildtimestamp,sourceref}-jgit tycho-p2-extras-plugin \
            pack200/tycho-pack200{{a,b}-plugin,-impl} \
            target-platform-validation-plugin ; do
    echo $mod
    aid=`basename $mod`
    install -pm 644 $mod/pom.xml  %{buildroot}%{_mavenpomdir}/JPP.%{name}-$aid.pom
-   install -m 644 $mod/target/$aid-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}/$aid.jar
+   install -m 644 $mod/target/$aid-%{version}.jar %{buildroot}%{_javadir}/%{name}/$aid.jar
    %add_maven_depmap JPP.%{name}-$aid.pom %{name}/$aid.jar -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
 done
 
@@ -86,6 +86,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Oct 19 2012 Roland Grunberg <rgrunber at redhat.com> 0.16.0-2
+- Update to 0.16.0 Release.
+
 * Mon Jul 30 2012 Roland Grunberg <rgrunber at redhat.com> 0.16.0-1.e58861
 - Update to 0.16.0 SNAPSHOT.
 


More information about the scm-commits mailing list