rpms/javapackages-tools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' into jenkins

Browse Source 
Conflicts:
	build.bash
	javapackages-tools.spec
This commit is contained in:
Michal Srb 2015-01-08 08:35:10 +01:00
commit 7c41e351e9
7 changed files with 97 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -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

85
0001-Add-support-for-installing-hpi.patch
View File

@ -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 @@
</stereotypes>
</repository>
<repository>
+ <id>jenkins-plugin</id>
+ <type>jpp</type>
+ <properties>
+ <root>usr/share/jenkins/plugins</root>
+ </properties>
+ <stereotypes>
+ <stereotype>
+ <extension>hpi</extension>
+ <stereotype>
+ </stereotypes>
+ </repository>
+ <repository>
<id>base-jni</id>
<type>jpp</type>
<properties>
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 @@
</stereotypes>
</repository>
<repository>
+ <id>jenkins-plugin</id>
+ <type>jpp</type>
+ <properties>
+ <root>usr/share/jenkins/plugins</root>
+ </properties>
+ <stereotypes>
+ <stereotype>
+ <extension>hpi</extension>
+ </stereotype>
+ </stereotypes>
+ </repository>
+ <repository>
<id>base-jni</id>
<type>jpp</type>
<properties>
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 @@
</stereotypes>
</repository>
<repository>
+ <id>jenkins-plugin</id>
+ <type>jpp</type>
+ <properties>
+ <root>usr/share/jenkins/plugins</root>
+ </properties>
+ <stereotypes>
+ <stereotype>
+ <extension>hpi</extension>
+ </stereotype>
+ </stereotypes>
+ </repository>
+ <repository>
<id>base-jni</id>
<type>jpp</type>
<properties>
@@ -107,6 +119,7 @@
<repository>base-raw-pom</repository>
<repository>base-jar</repository>
<repository>base-jni</repository>
+ <repository>jenkins-plugin</repository>
</repositories>
</configuration>
</repository>
@@ -118,6 +131,7 @@
<repository>base-raw-pom</repository>
<repository>base-jni</repository>
<repository>base-jar</repository>
+ <repository>jenkins-plugin</repository>
</repositories>
</configuration>
</repository>

26
0001-depgenerators-Switch-to-require-java-headless-instea.patch
View File

@ -1,26 +0,0 @@
From 102fee5e1e7661356502ca89d6a73889b826af6b Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@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

34
0002-test-Fix-testsuite-for-java-headless-change.patch
View File

@ -1,34 +0,0 @@
From 7cf7e60b9ce308cf7d0cbbe3da142781ce736696 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@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

37
fedora-rawhide-x86_64.cfg
View File

@ -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
"""

109
javapackages-tools.spec
View File

@ -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 <mizdebsk@redhat.com> - 4.2.0-2
- Remove dependency on python-six
* Mon Jan 05 2015 Michal Srb <msrb@redhat.com> - 4.3.2-1
- Update to upstream version 4.3.2
* Tue Dec 23 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.1-1
- Update to upstream version 4.3.1
* Sun Dec 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.3.0-1
- Update to upstream version 4.3.0
* Fri Nov 28 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.0-11
- Remove dependency on libxslt
* Fri Nov 28 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.0-10
- Scan lib64/ in OSGi dep generators
- Related: rhbz#1166156
* Wed Nov 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.0-9
- Revert adding namespace support in %%mvn_artifact
* Mon Nov 24 2014 Michal Srb <msrb@redhat.com> - 4.2.0-8
- Add namespace support in %%mvn_artifact
* Fri Nov 21 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.2.0-7
- Fix OSGi provides/requires generation in Java libdir
- Resolves: rhbz#1166156
* Wed Nov 12 2014 Michal Srb <msrb@redhat.com> - 4.2.0-6
- Fix cache problem (Resolves: rhbz#1155185)
* Thu Oct 30 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 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 <msimacek@redhat.com> - 4.2.0-4
- Fix pom_editor missing space between xmlns declarations
* Wed Sep 24 2014 Michal Srb <msrb@redhat.com> - 4.2.0-3
- Do not generate OSGi R on eclipse-platform
* Thu Sep 18 2014 Michal Srb <msrb@redhat.com> - 4.2.0-2
- Fix mvn_artifact: generate R, if it's not explicitly disabled
* Thu Jul 24 2014 Michal Srb <msrb@redhat.com> - 4.2.0-1
- Update to upstream version 4.2.0
* Thu Jul 10 2014 Michal Srb <msrb@redhat.com> - 4.1.0-2
- Backport upstream patch for maven.req
* Mon Jun 23 2014 Michal Srb <msrb@redhat.com> - 4.1.0-1
- Update to upstream version 4.1.0
* Thu Jun 12 2014 Michal Srb <msrb@redhat.com> - 4.0.0-8
- Install man page for pom_change_dep
* Tue Jun 10 2014 Michal Srb <msrb@redhat.com> - 4.0.0-7
- Backport fix for maven.prov
* Tue Jun 10 2014 Michal Srb <msrb@redhat.com> - 4.0.0-6
- Update docs
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri May 30 2014 Michal Srb <msrb@redhat.com> - 4.0.0-4
- Backport patch which adds support for "disableEffectivePom" property
* Thu May 29 2014 Michal Srb <msrb@redhat.com> - 4.0.0-3
- Add BR: javapackages-tools
* Thu May 29 2014 Michal Srb <msrb@redhat.com> - 4.0.0-2
- Backport patches for maven.req
- Remove com.sun:tools and sun.jdk:jconsole provides
* Thu May 29 2014 Michal Srb <msrb@redhat.com> - 4.0.0-1
- Update to 4.0.0
* Wed May 28 2014 Michal Srb <msrb@redhat.com> - 3.5.0-9
- Apply the patch from my previous commit
* Wed May 28 2014 Michal Srb <msrb@redhat.com> - 3.5.0-8
- Generate requires on POM artifacts with "pom" extension
* Wed Apr 30 2014 Michal Srb <msrb@redhat.com> - 3.5.0-7
- Improve support for SCLs
* Wed Apr 16 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5.0-6
- Add explicit maven-local requires on java-1.8.0-openjdk-devel

2
sources
View File

@ -1 +1 @@
c3eccf51b90a81e05b10e110fee603ed javapackages-3.5.0.tar.xz
7d1ef162f04e546a0c58d745f2896d3c javapackages-4.3.2.tar.xz