[javapackages-tools] Add patches

[Stanislav Ochotnicky]

commit 826f3f0205c28d236b378623804b3315c4bd79da
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Feb 24 09:32:21 2014 +0100

    Add patches

 ...rs-Switch-to-require-java-headless-instea.patch |   26 +++++++++++++++
 ...st-Fix-testsuite-for-java-headless-change.patch |   34 ++++++++++++++++++++
 2 files changed, 60 insertions(+), 0 deletions(-)
---
diff --git a/0001-depgenerators-Switch-to-require-java-headless-instea.patch b/0001-depgenerators-Switch-to-require-java-headless-instea.patch
new file mode 100644
index 0000000..172ef22
--- /dev/null
+++ b/0001-depgenerators-Switch-to-require-java-headless-instea.patch
@@ -0,0 +1,26 @@
+From 102fee5e1e7661356502ca89d6a73889b826af6b Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Wed, 29 Jan 2014 17:23:28 +0100
+Subject: [PATCH 01/15] [depgenerators] Switch to require java-headless instead
+ java
+
+---
+ depgenerators/maven.req | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/depgenerators/maven.req b/depgenerators/maven.req
+index 5bd6c34..c161e3d 100755
+--- a/depgenerators/maven.req
++++ b/depgenerators/maven.req
+@@ -158,7 +158,7 @@ class TagBuilder:
+                             "%mvn_package {art} <package_name>\n".format(art=skipped)
+             raise Exception(skipped_msg)
+ 
+-        reqs = {'java': depmap.get_java_requires(),
++        reqs = {'java-headless': depmap.get_java_requires(),
+                 'java-devel': depmap.get_java_devel_requires()}
+         for name, version in reqs.iteritems():
+             self.__process_jvm_req(name, version)
+-- 
+1.8.5.3
+
diff --git a/0002-test-Fix-testsuite-for-java-headless-change.patch b/0002-test-Fix-testsuite-for-java-headless-change.patch
new file mode 100644
index 0000000..b2c3f4e
--- /dev/null
+++ b/0002-test-Fix-testsuite-for-java-headless-change.patch
@@ -0,0 +1,34 @@
+From 7cf7e60b9ce308cf7d0cbbe3da142781ce736696 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky at redhat.com>
+Date: Wed, 29 Jan 2014 17:40:39 +0100
+Subject: [PATCH 02/15] [test] Fix testsuite for java-headless change
+
+---
+ test/maven_req_test.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/maven_req_test.py b/test/maven_req_test.py
+index 4551bb5..b99672f 100644
+--- a/test/maven_req_test.py
++++ b/test/maven_req_test.py
+@@ -26,7 +26,7 @@ class TestMavenReq(unittest.TestCase):
+     @mavenreq(["require-java/require.xml"])
+     def test_require_java(self, stdout, stderr, return_value):
+         self.assertEquals(return_value, 0, stderr)
+-        self.assertEquals(stdout, "jpackage-utils\nmvn(org.apache.maven:maven-project)\njava >= 1:1.6\n")
++        self.assertEquals(stdout, "jpackage-utils\nmvn(org.apache.maven:maven-project)\njava-headless >= 1:1.6\n")
+ 
+     @mavenreq(["require-java-devel/require.xml"])
+     def test_require_java_devel(self, stdout, stderr, return_value):
+@@ -36,7 +36,7 @@ class TestMavenReq(unittest.TestCase):
+     @mavenreq(["require-java-both/require.xml"])
+     def test_require_java_both(self, stdout, stderr, return_value):
+         self.assertEquals(return_value, 0, stderr)
+-        self.assertEquals(stdout, "jpackage-utils\nmvn(org.apache.maven:maven-project)\njava >= 1:1.6\njava-devel >= 1:1.6\n")
++        self.assertEquals(stdout, "jpackage-utils\nmvn(org.apache.maven:maven-project)\njava-headless >= 1:1.6\njava-devel >= 1:1.6\n")
+ 
+     @mavenreq(["require_parent/require.xml"])
+     def test_require_parent(self, stdout, stderr, return_value):
+-- 
+1.8.5.3
+