mbooth pushed to tycho (f22). "Handle possible changes to metadata namespace (ns[0-9]). (..more)"

[notifications at fedoraproject.org]

>From e2bb9a6400399bbb1b83f01c54f1f68755ace0bc Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber at redhat.com>
Date: Mon, 20 Apr 2015 11:03:48 -0400
Subject: Handle possible changes to metadata namespace (ns[0-9]).

It was assumed that maven metadata elements would be under ns1, but
more recent builds have the metadata under ns0. Varying namespaces
should be handled.

diff --git a/tycho.spec b/tycho.spec
index ad456dc..4cd1a87 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -25,7 +25,7 @@
 
 Name:           %{?scl_prefix}tycho
 Version:        0.22.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -253,7 +253,7 @@ sysVer=`grep -C 1 "<artifactId>tycho</artifactId>" %{_mavenpomdir}/JPP.tycho-mai
 mkdir boot
 
 # Copy Tycho POMs from system repo and set their versions to %%{version}-SNAPSHOT.
-for pom in $(grep 'pom</ns1:path>' $medadataFile | sed 's|.*>\(.*\)<.*|\1|'); do
+for pom in $(grep 'pom</ns[0-9]:path>' $medadataFile | sed 's|.*>\(.*\)<.*|\1|'); do
     sed '
     s/$sysVer/%{version}-SNAPSHOT/g
     s/%{fp_p2_version}%{fp_p2_snap}/%{fp_p2_version}/
@@ -268,9 +268,9 @@ jar uf boot/tycho-maven-plugin.jar META-INF/plexus/components.xml
 
 # Create XMvn metadata for the new JARs and POMs by customizing system Tycho metadata.
 sed '
-  s|>/[^<]*/\([^/]*\.pom\)</ns1:path>|>'$PWD'/boot/\1</ns1:path>|
-  s|>'$sysVer'</ns1:version>|>%{version}-SNAPSHOT</ns1:version><ns1:compatVersions><ns1:version>%{version}-SNAPSHOT</ns1:version></ns1:compatVersions>|
-  s|>'%{fp_p2_version}%{fp_p2_snap}'</ns1:version>|>%{fp_p2_version}</ns1:version><ns1:compatVersions><ns1:version>%{fp_p2_version}</ns1:version></ns1:compatVersions>|
+  s|>/[^<]*/\([^/]*\.pom\)</\(ns[0-9]\):path>|>'$PWD'/boot/\1</\2:path>|
+  s|>'$sysVer'</\(ns[0-9]\):version>|>%{version}-SNAPSHOT</\1:version><\1:compatVersions><\1:version>%{version}-SNAPSHOT</\1:version></\1:compatVersions>|
+  s|>'%{fp_p2_version}%{fp_p2_snap}'</\(ns[0-9]\):version>|>%{fp_p2_version}</\1:version><\1:compatVersions><\1:version>%{fp_p2_version}</\1:version></\1:compatVersions>|
   s|%{_javadir}/tycho/tycho-maven-plugin.jar|'$PWD'/boot/tycho-maven-plugin.jar|
 ' $medadataFile >boot/tycho-metadata.xml
 %mvn_config resolverSettings/metadataRepositories/repository $PWD/boot/tycho-metadata.xml
@@ -429,6 +429,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
 %{_javadocdir}/tycho
 
 %changelog
+* Mon Apr 20 2015 Roland Grunberg <rgrunber at redhat.com> - 0.22.0-14
+- Handle possible changes to metadata namespace (ns[0-9]).
+
 * Fri Apr 17 2015 Roland Grunberg <rgrunber at redhat.com> - 0.22.0-13
 - fedoraproject-p2: Subpackages '*-tests' should not be in dropins.
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/tycho.git/commit/?h=f22&id=e2bb9a6400399bbb1b83f01c54f1f68755ace0bc