diff --git a/.gitignore b/.gitignore index fa67ae2..16cb761 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,9 @@ /javapackages-3.4.1.tar.xz /javapackages-3.4.2.tar.xz /javapackages-3.5.0.tar.xz +/javapackages-4.0.0.tar.xz +/javapackages-4.1.0.tar.xz +/javapackages-4.2.0.tar.xz +/javapackages-4.3.0.tar.xz +/javapackages-4.3.1.tar.xz +/javapackages-4.3.2.tar.xz diff --git a/0001-Add-support-for-installing-hpi.patch b/0001-Add-support-for-installing-hpi.patch deleted file mode 100644 index e5526a2..0000000 --- a/0001-Add-support-for-installing-hpi.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/configs/configuration-20-rpmbuild-raw.xml b/configs/configuration-20-rpmbuild-raw.xml -index eb99908..9ab7b30 100644 ---- a/configs/configuration-20-rpmbuild-raw.xml -+++ b/configs/configuration-20-rpmbuild-raw.xml -@@ -37,6 +37,18 @@ - - - -+ jenkins-plugin -+ jpp -+ -+ usr/share/jenkins/plugins -+ -+ -+ -+ hpi -+ -+ -+ -+ - base-jni - jpp - -diff --git a/configs/configuration-20-rpmbuild.xml b/configs/configuration-20-rpmbuild.xml -index 5ecb4ba..7a7b543 100644 ---- a/configs/configuration-20-rpmbuild.xml -+++ b/configs/configuration-20-rpmbuild.xml -@@ -49,6 +49,18 @@ - - - -+ jenkins-plugin -+ jpp -+ -+ usr/share/jenkins/plugins -+ -+ -+ -+ hpi -+ -+ -+ -+ - base-jni - jpp - -diff --git a/configs/configuration-20.xml b/configs/configuration-20.xml -index 1186b46..fa6798d 100644 ---- a/configs/configuration-20.xml -+++ b/configs/configuration-20.xml -@@ -86,6 +86,18 @@ - - - -+ jenkins-plugin -+ jpp -+ -+ usr/share/jenkins/plugins -+ -+ -+ -+ hpi -+ -+ -+ -+ - base-jni - jpp - -@@ -107,6 +119,7 @@ - base-raw-pom - base-jar - base-jni -+ jenkins-plugin - - - -@@ -118,6 +131,7 @@ - base-raw-pom - base-jni - base-jar -+ jenkins-plugin - - - diff --git a/0001-depgenerators-Switch-to-require-java-headless-instea.patch b/0001-depgenerators-Switch-to-require-java-headless-instea.patch deleted file mode 100644 index 172ef22..0000000 --- a/0001-depgenerators-Switch-to-require-java-headless-instea.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 102fee5e1e7661356502ca89d6a73889b826af6b Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -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} \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 deleted file mode 100644 index b2c3f4e..0000000 --- a/0002-test-Fix-testsuite-for-java-headless-change.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7cf7e60b9ce308cf7d0cbbe3da142781ce736696 Mon Sep 17 00:00:00 2001 -From: Stanislav Ochotnicky -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 - diff --git a/fedora-rawhide-x86_64.cfg b/fedora-rawhide-x86_64.cfg deleted file mode 100644 index 54bb30b..0000000 --- a/fedora-rawhide-x86_64.cfg +++ /dev/null @@ -1,37 +0,0 @@ -config_opts['root'] = 'javapackages-rawhide' -config_opts['target_arch'] = 'x86_64' -config_opts['legal_host_arches'] = ('x86_64',) -config_opts['chroot_setup_cmd'] = 'install @buildsys-build PyXB asciidoc dia python-formencode python-lxml python-nose python-setuptools python2-devel scl-utils-build xmlto' -config_opts['dist'] = 'rawhide' # only useful for --resultdir variable subst -config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['releasever'] = '21' - -config_opts['yum.conf'] = """ -[main] -logfile=/var/log/yum.log -retries=20 -gpgcheck=0 -assumeyes=1 -syslog_ident=mock -syslog_device= -metadata_expire=1 -mirrorlist_expire=1 -debuglevel=2 - -[mock-rawhide] -name=mock-rawhide -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64 -failovermethod=priority -cost=1000 - -[mock-koji] -name=mock-koji -baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64/ -cost=2000 - -[mock-override] -name=mock-override -baseurl=http://people.redhat.com/~mizdebsk/jenkins-extra-repo/ -gpgcheck=0 -cost=500 -""" diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 86376a7..c39583e 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,4 +1,4 @@ -%if 0%{?fedora} > 12 +%if 0%{?fedora} > 21 %global with_python3 1 %else %{!?__python2: %global __python2 /usr/bin/python2} @@ -6,8 +6,8 @@ %endif Name: javapackages-tools -Version: 4.2.0 -Release: 2%{?dist} +Version: 4.4.0 +Release: 1%{?dist} Summary: Macros and scripts for Java packaging support @@ -35,10 +35,9 @@ BuildRequires: xmlto BuildRequires: scl-utils-build BuildRequires: dia BuildRequires: javapackages-tools >= 4.0.0 -BuildRequires: xmvn-resolve >= 2.0.0 +BuildRequires: xmvn-resolve >= 2 Requires: coreutils -Requires: libxslt Requires: lua %if 0%{?with_python3} Requires: python3-javapackages = %{version}-%{release} @@ -169,16 +168,12 @@ find ./depgenerators -name '*.prov' | xargs sed -i '1s|^#!.*python|#!%{__python3 %build -%configure -./build - -pushd python %if 0%{?with_python3} - %{__python3} setup.py build +%configure --pyinterpreter=%{__python3} %else -%{__python2} setup.py build +%configure --pyinterpreter=%{__python2} %endif -popd +./build %install ./install @@ -193,11 +188,7 @@ pushd python popd %check -%if 0%{?with_python3} -./check 3 -%else -./check 2 -%endif +./check %files -f files-common %doc LICENSE @@ -225,12 +216,92 @@ popd %doc LICENSE %changelog -* Tue Dec 23 2014 Mikolaj Izdebski - 4.2.0-2 -- Remove dependency on python-six +* Mon Jan 05 2015 Michal Srb - 4.3.2-1 +- Update to upstream version 4.3.2 + +* Tue Dec 23 2014 Mikolaj Izdebski - 4.3.1-1 +- Update to upstream version 4.3.1 + +* Sun Dec 14 2014 Mikolaj Izdebski - 4.3.0-1 +- Update to upstream version 4.3.0 + +* Fri Nov 28 2014 Mikolaj Izdebski - 4.2.0-11 +- Remove dependency on libxslt + +* Fri Nov 28 2014 Mikolaj Izdebski - 4.2.0-10 +- Scan lib64/ in OSGi dep generators +- Related: rhbz#1166156 + +* Wed Nov 26 2014 Mikolaj Izdebski - 4.2.0-9 +- Revert adding namespace support in %%mvn_artifact + +* Mon Nov 24 2014 Michal Srb - 4.2.0-8 +- Add namespace support in %%mvn_artifact + +* Fri Nov 21 2014 Mikolaj Izdebski - 4.2.0-7 +- Fix OSGi provides/requires generation in Java libdir +- Resolves: rhbz#1166156 + +* Wed Nov 12 2014 Michal Srb - 4.2.0-6 +- Fix cache problem (Resolves: rhbz#1155185) + +* Thu Oct 30 2014 Mikolaj Izdebski - 4.2.0-5 +- Use wrapper script to inject ABRT agent JVM argument +- Fix path to ABRT agent DSO +- Resolves: rhbz#1153652 + +* Tue Oct 21 2014 Michael Simacek - 4.2.0-4 +- Fix pom_editor missing space between xmlns declarations + +* Wed Sep 24 2014 Michal Srb - 4.2.0-3 +- Do not generate OSGi R on eclipse-platform + +* Thu Sep 18 2014 Michal Srb - 4.2.0-2 +- Fix mvn_artifact: generate R, if it's not explicitly disabled * Thu Jul 24 2014 Michal Srb - 4.2.0-1 - Update to upstream version 4.2.0 +* Thu Jul 10 2014 Michal Srb - 4.1.0-2 +- Backport upstream patch for maven.req + +* Mon Jun 23 2014 Michal Srb - 4.1.0-1 +- Update to upstream version 4.1.0 + +* Thu Jun 12 2014 Michal Srb - 4.0.0-8 +- Install man page for pom_change_dep + +* Tue Jun 10 2014 Michal Srb - 4.0.0-7 +- Backport fix for maven.prov + +* Tue Jun 10 2014 Michal Srb - 4.0.0-6 +- Update docs + +* Sat Jun 07 2014 Fedora Release Engineering - 4.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri May 30 2014 Michal Srb - 4.0.0-4 +- Backport patch which adds support for "disableEffectivePom" property + +* Thu May 29 2014 Michal Srb - 4.0.0-3 +- Add BR: javapackages-tools + +* Thu May 29 2014 Michal Srb - 4.0.0-2 +- Backport patches for maven.req +- Remove com.sun:tools and sun.jdk:jconsole provides + +* Thu May 29 2014 Michal Srb - 4.0.0-1 +- Update to 4.0.0 + +* Wed May 28 2014 Michal Srb - 3.5.0-9 +- Apply the patch from my previous commit + +* Wed May 28 2014 Michal Srb - 3.5.0-8 +- Generate requires on POM artifacts with "pom" extension + +* Wed Apr 30 2014 Michal Srb - 3.5.0-7 +- Improve support for SCLs + * Wed Apr 16 2014 Mikolaj Izdebski - 3.5.0-6 - Add explicit maven-local requires on java-1.8.0-openjdk-devel diff --git a/sources b/sources index f733f20..e22be2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3eccf51b90a81e05b10e110fee603ed javapackages-3.5.0.tar.xz +7d1ef162f04e546a0c58d745f2896d3c javapackages-4.3.2.tar.xz