[jpackage-utils/f17] Add patch and raise release number

[Stanislav Ochotnicky]

commit 42b8f406b6d5f68e4ebef84c9231b66aaf083bea
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Mar 29 14:39:50 2012 +0200

    Add patch and raise release number

 ...ven-provides-from-fragments-instead-of-po.patch |   86 ++++++++++++++++++++
 jpackage-utils.spec                                |    4 +-
 2 files changed, 88 insertions(+), 2 deletions(-)
---
diff --git a/0001-Generate-maven-provides-from-fragments-instead-of-po.patch b/0001-Generate-maven-provides-from-fragments-instead-of-po.patch
new file mode 100644
index 0000000..542422e
--- /dev/null
+++ b/0001-Generate-maven-provides-from-fragments-instead-of-po.patch
@@ -0,0 +1,86 @@
+From c6fe42f05478dafee2de51cbfb9e002a81479f03 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Tue, 6 Mar 2012 14:26:32 +0100
+Subject: [PATCH] Generate maven provides from fragments instead of poms
+
+This means we will finally have complete information in provides.
+Before this change a use of
+  add_maven_depmap ... -a "x:y"
+Would not generate "mvn(x:y)" rpm provides. Now it does
+---
+ depgenerators/fileattrs/maven.attr |    2 +-
+ depgenerators/maven.prov           |   37 ++++++++++++++++++-----------------
+ 2 files changed, 20 insertions(+), 19 deletions(-)
+
+diff --git a/depgenerators/fileattrs/maven.attr b/depgenerators/fileattrs/maven.attr
+index b8753a0..526fd45 100644
+--- a/depgenerators/fileattrs/maven.attr
++++ b/depgenerators/fileattrs/maven.attr
+@@ -1,3 +1,3 @@
+ %__maven_provides	%{_rpmconfigdir}/maven.prov
+-%__maven_path	^%{_datadir}/maven-poms/.*\.pom
++%__maven_path	^%{_datadir}/maven-fragments/.*
+ 
+diff --git a/depgenerators/maven.prov b/depgenerators/maven.prov
+index d9ea469..5c53e7b 100644
+--- a/depgenerators/maven.prov
++++ b/depgenerators/maven.prov
+@@ -28,36 +28,37 @@
+ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #
+ # Authors: Alexander Kurtakov <akurtako at redhat.com>
++#          Stanislav Ochotnicky <sochotnicky at redhat.com>
+ 
+ import sys
+-import xml.etree.ElementTree as ET
++from xml.etree.ElementTree import fromstring
++from StringIO import StringIO
+ 
+ class TagBuilder:
+     mavenns = "{http://maven.apache.org/POM/4.0.0}"
+-    
++
+     def __init__ (self, filelist=None):
+         if filelist == None:
+             filelist = sys.stdin
+         paths = map (lambda x: x.rstrip (), filelist.readlines ())
+         for path in paths:
+ 	        self.get_mvn_provide (path)
+-	  
++
+     def get_mvn_provide (self, path):
+-        doc = ET.parse(path)
+-        artifactId = doc.getroot().findtext("%sartifactId"%(self.mavenns))
+-        if artifactId is None:
+-            artifactId = doc.getroot().findtext("artifactId")
+-        if artifactId is None:
+-            return
+-        groupId = doc.getroot().findtext("%sgroupId"%(self.mavenns))
+-        if groupId is None:
+-            groupId = doc.getroot().findtext("groupId")
+-        if groupId is None:
+-            groupId = doc.getroot().findtext("%sparent/%sgroupId"%(self.mavenns, self.mavenns))
+-        if groupId is None:
+-            groupId = doc.getroot().findtext("parent/groupId")
+-        if groupId is not None:
+-            print "mvn(%s:%s)" %(groupId, artifactId)
++        buf = StringIO()
++        buf.write('<fragments>\n')
++        with open(path) as f:
++            buf.write(f.read())
++        buf.write('</fragments>')
++        fragments = buf.getvalue()
++        doc = fromstring(fragments)
++
++        for depmap in doc.getchildren():
++            for dep_part in depmap.getchildren():
++                if dep_part.tag == 'maven':
++                    groupId = dep_part.findtext("groupId")
++                    artifactId = dep_part.findtext("artifactId")
++                    print "mvn(%s:%s)" %(groupId, artifactId)
+ 
+ if __name__ == "__main__":
+     builder = TagBuilder ()
+-- 
+1.7.7.6
+
diff --git a/jpackage-utils.spec b/jpackage-utils.spec
index bfe016f..01d2f04 100644
--- a/jpackage-utils.spec
+++ b/jpackage-utils.spec
@@ -38,7 +38,7 @@
 
 Name:           jpackage-utils
 Version:        1.7.5
-Release:        16%{?dist}
+Release:        17%{?dist}
 Epoch:          0
 Summary:        JPackage utilities
 License:        BSD
@@ -242,7 +242,7 @@ EOF
 
 
 %changelog
-* Thu Mar 29 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7.5-16
+* Thu Mar 29 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.7.5-17
 - Backport patch for generating depmaps from fragments
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.7.5-16