From 7a17c9de6a1e62d613dd840c729eca1ef5dba998 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 4 Nov 2013 13:11:19 +0100 Subject: [PATCH 01/15] Add .gitignore --- .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 From e9c6e08858635b44dcf5e746f4d2bbd6c178f920 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 25 Apr 2014 13:18:58 +0200 Subject: [PATCH 02/15] Add spec file --- javapackages-tools.spec | 488 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 488 insertions(+) create mode 100644 javapackages-tools.spec diff --git a/javapackages-tools.spec b/javapackages-tools.spec new file mode 100644 index 0000000..2af73ea --- /dev/null +++ b/javapackages-tools.spec @@ -0,0 +1,488 @@ +Name: javapackages-tools +Version: 3.5.0 +Release: 6%{?dist} + +Summary: Macros and scripts for Java packaging support + +License: BSD +URL: https://fedorahosted.org/javapackages/ +Source0: javapackages-%{version}.tar.xz + +BuildArch: noarch + +BuildRequires: jpackage-utils +BuildRequires: asciidoc +BuildRequires: xmlto +BuildRequires: python-lxml +BuildRequires: python2-devel +BuildRequires: python-setuptools +BuildRequires: python-formencode +BuildRequires: scl-utils-build +BuildRequires: python-nose +BuildRequires: dia +BuildRequires: PyXB + +Requires: coreutils +Requires: libxslt +Requires: lua +Requires: python +Requires: python-javapackages = %{version}-%{release} + +Provides: jpackage-utils = %{version}-%{release} +Obsoletes: jpackage-utils < %{version}-%{release} + +%description +This package provides macros and scripts to support Java packaging. + +%package -n maven-local +Summary: Macros and scripts for Maven packaging support +Requires: %{name} = %{version}-%{release} +Requires: maven +Requires: xmvn >= 1.0.0-0.1 +# POM files needed by maven itself +Requires: apache-commons-parent +Requires: apache-parent +Requires: geronimo-parent-poms +Requires: httpcomponents-project +Requires: jboss-parent +Requires: jvnet-parent +Requires: maven-parent +Requires: maven-plugins-pom +Requires: mojo-parent +Requires: objectweb-pom +Requires: plexus-components-pom +Requires: plexus-pom +Requires: plexus-tools-pom +Requires: sonatype-oss-parent +Requires: weld-parent +# Common Maven plugins required by almost every build. It wouldn't make +# sense to explicitly require them in every package built with Maven. +Requires: maven-assembly-plugin +Requires: maven-compiler-plugin +Requires: maven-enforcer-plugin +Requires: maven-jar-plugin +Requires: maven-javadoc-plugin +Requires: maven-resources-plugin +Requires: maven-surefire-plugin +# Tests based on JUnit are very common and JUnit itself is small. +# Include JUnit provider for Surefire just for convenience. +Requires: maven-surefire-provider-junit +# testng is quite common as well +Requires: maven-surefire-provider-testng + +%description -n maven-local +This package provides macros and scripts to support packaging Maven artifacts. + +%package -n ivy-local +Summary: Local mode for Apache Ivy +Requires: %{name} = %{version}-%{release} +Requires: apache-ivy >= 2.3.0-8 +Requires: guava +Requires: maven +Requires: plexus-classworlds +Requires: plexus-containers-container-default +Requires: plexus-utils +Requires: xbean +Requires: xmvn >= 1.5 + +%description -n ivy-local +This package implements local mode fow Apache Ivy, which allows +artifact resolution using XMvn resolver. + +%package -n python-javapackages +Summary: Module for handling various files for Java packaging +Requires: PyXB +Requires: python-lxml + +%description -n python-javapackages +Module for handling, querying and manipulating of various files for Java +packaging in Linux distributions + +%package -n fedora-review-plugin-java +Summary: fedora-review plugin for checking Java packaging guidelines +License: GPLv2+ +Requires: fedora-review + +%description -n fedora-review-plugin-java +%{summary}. + +%package doc +Summary: Guide for Java packaging + +%description doc +User guide for Java packaging and using utilities from javapackages-tools + + +%prep +%setup -q -n javapackages-%{version} + +%build +%configure +./build +pushd python +%{__python} setup.py build +popd + +%install +./install +sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-* + +pushd python +%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT +popd + +#%%check +#./check + + + +%files -f files-common +%doc LICENSE + +%files -n maven-local -f files-maven + +%files -n ivy-local -f files-ivy + +%files -n python-javapackages +%doc LICENSE +%{python_sitelib}/javapackages* + +%files -n fedora-review-plugin-java +%{_datadir}/fedora-review/plugins/* + +%files doc -f files-doc +%doc LICENSE + + +%changelog +* Thu Mar 27 2014 Michael Simacek - 3.5.0-6 +- Install documentation + +* Mon Feb 24 2014 Stanislav Ochotnicky - 3.5.0-5 +- Backport java-headless patches + +* Mon Feb 10 2014 Michal Srb - 3.5.0-4 +- Add support for installing Maven artifacts with .hpi extension + +* Fri Jan 17 2014 Michael Simacek - 3.5.0-3 +- Use upstream method of running tests (nosetests) + +* Thu Jan 16 2014 Mikolaj Izdebski - 3.5.0-2 +- Add version requirements on xmvn and ivy + +* Thu Jan 16 2014 Mikolaj Izdebski - 3.5.0-1 +- Update to upstream version 3.5.0 +- Add ivy-local subpackage + +* Tue Jan 7 2014 Mikolaj Izdebski - 3.4.2-3 +- Update patch for ZIP files + +* Tue Jan 7 2014 Mikolaj Izdebski - 3.4.2-2 +- Allow ZIP files in %{_javadir} + +* Thu Dec 05 2013 Michal Srb - 3.4.2-1 +- Update to upstream bugfix release 3.4.2 + +* Wed Dec 4 2013 Mikolaj Izdebski - 3.4.1-3 +- Add Requires on objectweb-pom + +* Tue Nov 19 2013 Stanislav Ochotnicky - 3.4.1-2 +- Do not create parent dirs for pom.properties +- Resolves: rhbz#1031769 + +* Tue Nov 05 2013 Stanislav Ochotnicky - 3.4.1-1 +- Update to upstream bugfix release 3.4.1 + +* Mon Oct 21 2013 Mikolaj Izdebski - 3.4.0-3 +- Fix XMvn configuration for native JNI repos +- Resolves: rhbz#1021608 + +* Mon Oct 14 2013 Mikolaj Izdebski - 3.4.0-2 +- Require exact version of python-javapackages + +* Mon Oct 14 2013 Mikolaj Izdebski - 3.4.0-1 +- Update to upstream version 3.4.0 + +* Wed Oct 2 2013 Mikolaj Izdebski - 3.3.1-1 +- Update to upstream version 3.3.1 +- Remove workaround for sisu-guice no_aop + +* Tue Oct 01 2013 Stanislav Ochotnicky - 3.3.0-1 +- Update to upstream version 3.3.0 + +* Wed Sep 25 2013 Stanislav Ochotnicky - 3.2.4-2 +- Fix installation of artifacts with classifier + +* Tue Sep 24 2013 Stanislav Ochotnicky - 3.2.4-1 +- Update to upstream version 3.2.4 + +* Tue Sep 24 2013 Stanislav Ochotnicky - 3.2.3-1 +- Update to upstream version 3.2.3 + +* Fri Sep 20 2013 Michal Srb - 3.2.2-1 +- Update to upstream version 3.2.2 + +* Fri Sep 20 2013 Mikolaj Izdebski - 3.2.1-1 +- Update to upstream version 3.2.1 + +* Fri Sep 20 2013 Mikolaj Izdebski - 3.2.0-1 +- Update to upstream version 3.2.0 + +* Fri Sep 20 2013 Mikolaj Izdebski - 3.1.2-1 +- Update to upstream version 3.1.2 + +* Thu Sep 19 2013 Stanislav Ochotnicky - 3.1.1-1 +- Update to upstream version 3.1.1 + +* Thu Sep 19 2013 Stanislav Ochotnicky - 3.1.0-1 +- Update to upstream version 3.1.0 + +* Mon Sep 16 2013 Mikolaj Izdebski - 3.0.4-2 +- Add depmap for sun.jdk:jconsole + +* Fri Sep 13 2013 Stanislav Ochotnicky - 3.0.4-1 +- Update to upstream version 3.0.4 + +* Wed Sep 11 2013 Stanislav Ochotnicky - 3.0.3-1 +- Update to upstream version 3.0.3 + +* Tue Sep 10 2013 Stanislav Ochotnicky - 3.0.2-3 +- Fix a typo in temporary depmap + +* Tue Sep 10 2013 Stanislav Ochotnicky - 3.0.2-2 +- Make sure we do not provide google guice mapping + +* Tue Sep 10 2013 Stanislav Ochotnicky 3.0.2-1 +- Update to upstream version 3.0.2 +- Add separate python-javapackages subpackage +- Add separate fedora-review-plugin-java subpackage +- Enable part of unit tests + +* Tue Sep 3 2013 Stanislav Ochotnicky 3.0.0-0.2 +- Fix javadoc directory override + +* Tue Sep 3 2013 Stanislav Ochotnicky 3.0.0-0.1 +- Update to upstream pre-release version 3.0.0 + +* Fri Jul 26 2013 Mikolaj Izdebski - 2.0.1-1 +- Update to upstream version 2.0.1 +- Fix creation of artifact aliases, resolves: rhbz#988462 + +* Thu Jul 25 2013 Mikolaj Izdebski - 2.0.0-2 +- Require maven-resources-plugin by maven-local + +* Thu Jul 11 2013 Mikolaj Izdebski - 2.0.0-1 +- Update to upstream version 2.0.0 +- Merge functionality of jpackage-utils +- Provide and obsolete jpackage-utils +- %%add_maven_depmap macro now injects pom.properties to every JAR +- %%add_to_maven_depmap and %%update_maven_depmap macros were removed +- maven2jpp-mapdeps.xsl template has been removed +- Macros related to installation of icons and desktop files were removed +- 14 new manual pages were added +- Documentation specific to JPackage was removed +- Add BuildRequires: asciidoc, xmlto + +* Mon Jul 1 2013 Mikolaj Izdebski - 0.15.0-2 +- Add R: jvnet-parent + +* Wed Jun 5 2013 Mikolaj Izdebski - 0.15.0-1 +- Update to upstream version 0.15.0 +- Added depmap for tools.jar +- Added support for versioned autorequires +- New plugin metadata from Maven Central + +* Tue Jun 4 2013 Stanislav Ochotnicky - 0.14.1-2 +- Add several maven plugins to maven-local requires + +* Wed May 29 2013 Stanislav Ochotnicky - 0.14.1-1 +- Update to upstream version 0.14.1 with disabled debugging + +* Tue Apr 09 2013 Michal Srb - 0.14.0-1 +- Update to upstream version 0.14.0 + +* Mon Apr 8 2013 Mikolaj Izdebski - 0.13.7-2 +- Add R: maven-surefire-provider-junit4 to maven-local + +* Fri Mar 22 2013 Mikolaj Izdebski - 0.13.7-1 +- Update to upstream version 0.13.7 + +* Wed Mar 20 2013 Mikolaj Izdebski - 0.13.6-4 +- Add geronimo-parent-poms to common POMs + +* Wed Mar 20 2013 Mikolaj Izdebski - 0.13.6-3 +- Add weld-parent to common POMs + +* Wed Mar 20 2013 Stanislav Ochotnicky - 0.13.6-2 +- Fix conditional macro to evaluate properly when fedora is not defined + +* Mon Mar 18 2013 Mikolaj Izdebski - 0.13.6-1 +- Update to upstream version 0.13.6 + +* Wed Mar 13 2013 Mikolaj Izdebski - 0.13.5-1 +- Update to upstream version 0.13.5 + +* Wed Mar 13 2013 Mikolaj Izdebski - 0.13.4-1 +- Update to upstream version 0.13.4 + +* Tue Mar 12 2013 Mikolaj Izdebski - 0.13.3-1 +- Update to upstream version 0.13.3 + +* Thu Mar 7 2013 Mikolaj Izdebski - 0.13.2-1 +- Update to upstream version 0.13.2 + +* Thu Mar 7 2013 Mikolaj Izdebski - 0.13.1-1 +- Update to upstream version 0.13.1 + +* Wed Mar 6 2013 Mikolaj Izdebski - 0.13.0-1 +- Update to upstream version 0.13.0 + +* Wed Mar 6 2013 Mikolaj Izdebski - 0.13.0-0.1.git2f13366 +- Upate to upstream pre-release snapshot 2f13366 + +* Mon Mar 4 2013 Mikolaj Izdebski - 0.12.6-1 +- Update to upstream version 0.12.6 +- Resolves: rhbz#917618 (remove jetty orbit provides) +- Resolves: rhbz#917647 (system.bundle into autogenerated deps) + +* Fri Mar 1 2013 Stanislav Ochotnicky - 0.12.5-1 +- Update to upstream version 0.12.5 +- Resolves problems with compat package provides and automatic requires + +* Wed Feb 27 2013 Mikolaj Izdebski - 0.12.4-2 +- Don't mark RPM macro files as configuration + +* Mon Feb 25 2013 Mikolaj Izdebski - 0.12.4-1 +- Update to upstream version 0.12.4 +- Resolves: rhbz#913630 (versioned requires between subpackages) + +* Fri Feb 22 2013 Mikolaj Izdebski - 0.12.3-1 +- Update to upstream version 0.12.3 +- Resolves: rhbz#913694 (No plugin found for prefix 'X') + +* Wed Feb 20 2013 Mikolaj Izdebski - 0.12.2-1 +- Update to upstream version 0.12.2 +- Resolves: rhbz#913120 (MAVEN_OPTS are not passed to Maven) + +* Mon Feb 18 2013 Mikolaj Izdebski - 0.12.1-1 +- Update to upstream version 0.12.1 +- Resolves: rhbz#912333 (M2_HOME is not exported) + +* Fri Feb 15 2013 Mikolaj Izdebski - 0.12.0-1 +- Update to upstream version 0.12.0 +- Implement new pom macros: xpath_replace and xpath_set +- Remove Support-local-depmaps.patch (accepted upstream) + +* Fri Feb 15 2013 Mikolaj Izdebski - 0.11.2-6 +- Support local depmaps + +* Thu Feb 14 2013 Mikolaj Izdebski - 0.11.2-5 +- Add some maven-local Requires for convenience + +* Thu Feb 7 2013 Mikolaj Izdebski - 0.11.2-4 +- Add missing R: httpcomponents-project + +* Thu Feb 7 2013 Mikolaj Izdebski - 0.11.2-3 +- Add missing R: jboss-patent + +* Wed Feb 6 2013 Mikolaj Izdebski - 0.11.2-2 +- Don't install mvn-local and mvn-rpmbuild on F18 + +* Wed Jan 30 2013 Mikolaj Izdebski - 0.11.2-1 +- Update to upstream version 0.11.2 + +* Wed Jan 30 2013 Mikolaj Izdebski - 0.11.1-1 +- Update to upstream version 0.11.1 + +* Wed Jan 23 2013 Mikolaj Izdebski - 0.11.0-1 +- Update to upstream version 0.11.0 +- Add mvn-local and mvn-rpmbuild scripts + +* Mon Jan 21 2013 Mikolaj Izdebski - 0.10.1-1 +- Update to upstream version 0.10.1 + +* Mon Jan 7 2013 Mikolaj Izdebski - 0.10.0-1 +- Update to upstream version 0.10.0 +- Implement %%xmvn_alias, %%xmvn_file and %%xmvn_package macros +- Fix regex in osgi.attr +- Add support for pre- and post-goals in mvn-build script + +* Mon Dec 10 2012 Mikolaj Izdebski - 0.9.1-1 +- Update to upstream version 0.9.1 +- Resolves: rhbz#885636 + +* Thu Dec 6 2012 Stanislav Ochotnicky - 0.9.0-1 +- Update to latest upstream version +- Enable maven requires generator for xmvn packages +- Enable requires generator for javadoc packages + +* Wed Dec 5 2012 Stanislav Ochotnicky - 0.8.3-1 +- Update to upstream version 0.8.3 +- Fix maven provides generator for new XML valid fragments + +* Fri Nov 30 2012 Mikolaj Izdebski - 0.8.2-1 +- Update to upstream version 0.8.2 + +* Fri Nov 30 2012 Mikolaj Izdebski - 0.8.1-1 +- Update to upstream version 0.8.1 + +* Wed Nov 28 2012 Mikolaj Izdebski - 0.8.0-1 +- Update to upstream version 0.8.0 +- Add xmvn macros + +* Tue Nov 27 2012 Mikolaj Izdebski - 0.7.5-3 +- Add BR: jpackage-utils + +* Tue Nov 27 2012 Mikolaj Izdebski - 0.7.5-2 +- Add maven-local subpackage + +* Thu Nov 08 2012 Stanislav Ochotnicky - 0.7.5-1 +- Fix versioned pom installation by quoting _jpath + +* Wed Oct 31 2012 Stanislav Ochotnicky - 0.7.4-1 +- Shorten maven filelist filenames + +* Wed Oct 31 2012 Mikolaj Izdebski - 0.7.3-1 +- Update to upstream version 0.7.3 + +* Wed Oct 31 2012 Stanislav Ochotnicky - 0.7.2-1 +- Make sure add_maven_depmap fails when python tracebacks + +* Wed Oct 31 2012 Stanislav Ochotnicky - 0.7.1-1 +- Fix problem with exception in default add_maven_depmap invocation + +* Tue Oct 30 2012 Stanislav Ochotnicky - 0.7.0-1 +- Update to latest upstream +- Full support for compat depmap generation +- Generate maven-files-%%{name} with a list of files to package +- Add support for maven repo generation (alpha version) + +* Mon Jul 30 2012 Stanislav Ochotnicky - 0.6.0-1 +- Update to upstream version 0.6.0 +- Make maven provides versioned +- Add additional pom_ macros to simplify additional pom editing + +* Wed Jul 25 2012 Stanislav Ochotnicky - 0.5.0-1 +- Update to upstream version 0.5.0 - add support for add_maven_depmap -v + +* Thu Jul 19 2012 Fedora Release Engineering - 0.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Jul 9 2012 Mikolaj Izdebski - 0.4.1-1 +- Update to upstream version 0.4.1 +- Fixes #837203 + +* Wed Jun 27 2012 Mikolaj Izdebski - 0.4.0-1 +- Update to upstream version 0.4.0 + +* Tue Mar 6 2012 Stanislav Ochotnicky - 0.3.1-1 +- Create maven provides from fragments instead of poms + +* Thu Feb 16 2012 Stanislav Ochotnicky - 0.3.0-3 +- Fix maven_depmap installation + +* Wed Feb 15 2012 Stanislav Ochotnicky - 0.3.0-2 +- Add conflicts with older jpackage-utils + +* Wed Feb 15 2012 Stanislav Ochotnicky - 0.3.0-1 +- Initial version split from jpackage-utils From bd9e0cc28cf28a2289b17640398e9f3bbde2c9a5 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 25 Apr 2014 13:20:27 +0200 Subject: [PATCH 03/15] Remove gitignore file --- .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e69de29..0000000 From 67050553e583f0ebde0a6ac73db0806e8c5b112b Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 25 Apr 2014 13:33:00 +0200 Subject: [PATCH 04/15] Add custom mock config --- fedora-rawhide-x86_64.cfg | 47 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 fedora-rawhide-x86_64.cfg diff --git a/fedora-rawhide-x86_64.cfg b/fedora-rawhide-x86_64.cfg new file mode 100644 index 0000000..168d0bc --- /dev/null +++ b/fedora-rawhide-x86_64.cfg @@ -0,0 +1,47 @@ +config_opts['root'] = 'fedora-rawhide-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) +config_opts['chroot_setup_cmd'] = 'install @buildsys-build' +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] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= + +# repos +[mizdebsk-override] +name=Copr repo for override owned by mizdebsk +baseurl=http://copr-be.cloud.fedoraproject.org/results/mizdebsk/override/fedora-rawhide-$basearch/ +skip_if_unavailable=True +gpgcheck=0 +enabled=1 + +[fedora] +name=fedora +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64 +failovermethod=priority +enabled=0 + +[local] +name=local +baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64/ +cost=2000 +enabled=0 + +[debug] +name=Fedora Rawhide - x86_64 - Debug +failovermethod=priority +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-debug&arch=x86_64 +enabled=0 +""" From 9c960d5775547ffd96f0258b3834dc37bf782294 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Apr 2014 13:46:58 +0200 Subject: [PATCH 05/15] Update mock config --- fedora-rawhide-x86_64.cfg | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/fedora-rawhide-x86_64.cfg b/fedora-rawhide-x86_64.cfg index 168d0bc..c1d6ba9 100644 --- a/fedora-rawhide-x86_64.cfg +++ b/fedora-rawhide-x86_64.cfg @@ -8,40 +8,29 @@ config_opts['releasever'] = '21' config_opts['yum.conf'] = """ [main] -cachedir=/var/cache/yum -debuglevel=1 -reposdir=/dev/null logfile=/var/log/yum.log retries=20 -obsoletes=1 gpgcheck=0 assumeyes=1 syslog_ident=mock syslog_device= +metadata_expire=600 +mirrorlist_expire=600 +debuglevel=2 -# repos -[mizdebsk-override] -name=Copr repo for override owned by mizdebsk -baseurl=http://copr-be.cloud.fedoraproject.org/results/mizdebsk/override/fedora-rawhide-$basearch/ -skip_if_unavailable=True -gpgcheck=0 -enabled=1 +[mock-rawhide] +name=mock-rawhide +baseurl=http://ftp.linux.cz/pub/linux/fedora/linux/development/rawhide/x86_64/os +cost=1000 -[fedora] -name=fedora -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64 -failovermethod=priority -enabled=0 - -[local] -name=local +[mock-koji] +name=mock-koji baseurl=http://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64/ cost=2000 -enabled=0 -[debug] -name=Fedora Rawhide - x86_64 - Debug -failovermethod=priority -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-debug&arch=x86_64 -enabled=0 +[mock-override] +name=mock-override +baseurl=http://copr-be.cloud.fedoraproject.org/results/mizdebsk/override/fedora-rawhide-x86_64/ +gpgcheck=0 +cost=500 """ From 7dbdde9262143f8fd72a74d3f0ded94bf2ac703d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Apr 2014 13:47:32 +0200 Subject: [PATCH 06/15] Untabify spec file --- javapackages-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 2af73ea..a489271 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -91,7 +91,7 @@ artifact resolution using XMvn resolver. %package -n python-javapackages Summary: Module for handling various files for Java packaging -Requires: PyXB +Requires: PyXB Requires: python-lxml %description -n python-javapackages From 1274386eebef791a7f97c793254b5b1d847f6a36 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Apr 2014 13:52:46 +0200 Subject: [PATCH 07/15] Remove BR on jpackage-utils --- javapackages-tools.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index a489271..99f288b 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -10,7 +10,6 @@ Source0: javapackages-%{version}.tar.xz BuildArch: noarch -BuildRequires: jpackage-utils BuildRequires: asciidoc BuildRequires: xmlto BuildRequires: python-lxml From de2db282ea614fdd5775f03fef77202fc21ce07b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Apr 2014 13:53:20 +0200 Subject: [PATCH 08/15] Update mock config --- fedora-rawhide-x86_64.cfg | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fedora-rawhide-x86_64.cfg b/fedora-rawhide-x86_64.cfg index c1d6ba9..1d7e445 100644 --- a/fedora-rawhide-x86_64.cfg +++ b/fedora-rawhide-x86_64.cfg @@ -1,7 +1,7 @@ -config_opts['root'] = 'fedora-rawhide-x86_64' +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' +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' @@ -20,7 +20,8 @@ debuglevel=2 [mock-rawhide] name=mock-rawhide -baseurl=http://ftp.linux.cz/pub/linux/fedora/linux/development/rawhide/x86_64/os +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64 +failovermethod=priority cost=1000 [mock-koji] From 6a5f48817315491627aaa457dc2ebcb88417fc48 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Apr 2014 14:09:31 +0200 Subject: [PATCH 09/15] Disable mock-override repo --- fedora-rawhide-x86_64.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-rawhide-x86_64.cfg b/fedora-rawhide-x86_64.cfg index 1d7e445..5f15372 100644 --- a/fedora-rawhide-x86_64.cfg +++ b/fedora-rawhide-x86_64.cfg @@ -34,4 +34,5 @@ name=mock-override baseurl=http://copr-be.cloud.fedoraproject.org/results/mizdebsk/override/fedora-rawhide-x86_64/ gpgcheck=0 cost=500 +enabled=0 """ From e68a59badaab6fabb75a09f859779bcf451c53b5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Apr 2014 14:13:52 +0200 Subject: [PATCH 10/15] Move mock override repo to a different location --- fedora-rawhide-x86_64.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fedora-rawhide-x86_64.cfg b/fedora-rawhide-x86_64.cfg index 5f15372..49dfb14 100644 --- a/fedora-rawhide-x86_64.cfg +++ b/fedora-rawhide-x86_64.cfg @@ -31,8 +31,7 @@ cost=2000 [mock-override] name=mock-override -baseurl=http://copr-be.cloud.fedoraproject.org/results/mizdebsk/override/fedora-rawhide-x86_64/ +baseurl=http://people.redhat.com/~mizdebsk/jenkins-extra-repo/ gpgcheck=0 cost=500 -enabled=0 """ From 080b72fdbde93bc0f54f09b175d5b58da00ba297 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 28 Apr 2014 12:18:29 +0200 Subject: [PATCH 11/15] Add provides com.sun:tools and sun.jdk:jconsole --- javapackages-tools.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 99f288b..7d943eb 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -30,6 +30,9 @@ Requires: python-javapackages = %{version}-%{release} Provides: jpackage-utils = %{version}-%{release} Obsoletes: jpackage-utils < %{version}-%{release} +Provides: mvn(com.sun:tools) +Provides: mvn(sun.jdk:jconsole) + %description This package provides macros and scripts to support Java packaging. From 96efd1478011be7bf69b22e16c364263ca88e79c Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 28 Apr 2014 12:50:09 +0200 Subject: [PATCH 12/15] Add current build script --- build.bash | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 build.bash diff --git a/build.bash b/build.bash new file mode 100644 index 0000000..919cb5f --- /dev/null +++ b/build.bash @@ -0,0 +1,60 @@ +#!/bin/bash -ex + +JSTART=`date` + +REPO=RPM/latest/ +RPMDIR="/var/lib/mock/fedora-rawhide-x86_64/result" + +if [ ! -d ${REPO} ]; then + mkdir -p ${REPO} +fi + +curl https://raw.githubusercontent.com/msrb/jenkins-configs/javapackages-tools/fedora-rawhide-x86_64.cfg > fedora-rawhide-x86_64.cfg + +touch -d '01 Jan 2000' fedora-rawhide-x86_64.cfg + +rm -f javapackages-tools.spec default.spec && curl https://raw.githubusercontent.com/msrb/jenkins-configs/javapackages-tools/javapackages-tools.spec > default.spec + +cp default.spec javapackages-tools.spec + +VERSION=`sed 's/-SNAPSHOT//' VERSION` +RELEASE=$(git describe --match="[^(jenkins)].*" --tags | sed 's/[^-]*-/0./;s/-/./;s/g/git/') +git archive -v --prefix=javapackages-${VERSION}/ HEAD | xz > javapackages-${VERSION}.tar.xz +sed -i "s/^Version:\s\+[0-9.]*$/Version: ${VERSION}/" javapackages-tools.spec +sed -i "s/^Release:\s\+[0-9.]*%{?dist}$/Release: ${RELEASE}/" javapackages-tools.spec + +rm -f SRPMS/* +rpmbuild -bs --clean --define "_topdir `pwd`" --define "_sourcedir `pwd`" javapackages-tools.spec + +#trap "cat ${RPMDIR}/root.log | tail -30; cat ${RPMDIR}/build.log || :" 0 + +mock -r ../..$PWD/fedora-rawhide-x86_64 SRPMS/*.src.rpm + + +LAST_BN=`grep "Build number" ${REPO}/info.log | awk '{ print $3 }'` +if [ -n "${LAST_BN}" ]; then + mkdir -p RPM/${LAST_BN} + mv ${REPO}/* RPM/${LAST_BN} + + # we only want keep RPMs from last 10 builds + REMOVE_BN=`expr $LAST_BN - 10` + rm -Rf RPM/${REMOVE_BN} +fi + +# copy resulting RPMs to RPM/latest +RESULT="/var/lib/mock/javapackages-rawhide/result/" +for pkg in `ls -1 ${RESULT}/ | grep ".noarch.rpm"`; do + cp ${RESULT}/$pkg ${REPO}/${pkg} +done +tail -n 50 ${RESULT}/build.log +rm -Rf ${RESULT}/* + +createrepo ${REPO} + +rm -f javapackages-*.tar.xz + +JEND=`date` + +echo "Job start: $JSTART" > ${REPO}/info.log +echo "Job end: $JEND" >> ${REPO}/info.log +echo "Build number: $BUILD_NUMBER" >> ${REPO}/info.log From ba865b3c0cbd3e742e0e6d9f193ef280c5484938 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 28 Apr 2014 13:35:53 +0200 Subject: [PATCH 13/15] Refactoring in build.bash --- build.bash | 76 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/build.bash b/build.bash index 919cb5f..18a2803 100644 --- a/build.bash +++ b/build.bash @@ -1,60 +1,62 @@ #!/bin/bash -ex -JSTART=`date` - -REPO=RPM/latest/ -RPMDIR="/var/lib/mock/fedora-rawhide-x86_64/result" - -if [ ! -d ${REPO} ]; then - mkdir -p ${REPO} -fi +resultdir="/var/lib/mock/javapackages-rawhide/result/" +# download custom mock config curl https://raw.githubusercontent.com/msrb/jenkins-configs/javapackages-tools/fedora-rawhide-x86_64.cfg > fedora-rawhide-x86_64.cfg - touch -d '01 Jan 2000' fedora-rawhide-x86_64.cfg -rm -f javapackages-tools.spec default.spec && curl https://raw.githubusercontent.com/msrb/jenkins-configs/javapackages-tools/javapackages-tools.spec > default.spec +# download custom mock config +curl https://raw.githubusercontent.com/msrb/jenkins-configs/javapackages-tools/javapackages-tools.spec > javapackages-tools.spec -cp default.spec javapackages-tools.spec +# create directories +repo=RPM/latest/ +[[ ! -d ${repo} ]] && mkdir -p ${repo} -VERSION=`sed 's/-SNAPSHOT//' VERSION` -RELEASE=$(git describe --match="[^(jenkins)].*" --tags | sed 's/[^-]*-/0./;s/-/./;s/g/git/') -git archive -v --prefix=javapackages-${VERSION}/ HEAD | xz > javapackages-${VERSION}.tar.xz -sed -i "s/^Version:\s\+[0-9.]*$/Version: ${VERSION}/" javapackages-tools.spec -sed -i "s/^Release:\s\+[0-9.]*%{?dist}$/Release: ${RELEASE}/" javapackages-tools.spec +# update version and release tag in spec file +version=`sed 's/-SNAPSHOT//' VERSION` +release=$(git describe --match="[^(jenkins)].*" --tags | sed 's/[^-]*-/0./;s/-/./;s/g/git/') +sed -i "s/^Version:\s\+[0-9.]*$/Version: ${version}/" javapackages-tools.spec +sed -i "s/^Release:\s\+[0-9.]*%{?dist}$/Release: ${release}/" javapackages-tools.spec +# make tarball +git archive -v --prefix=javapackages-${version}/ HEAD | xz > javapackages-${version}.tar.xz + +# print root.log and build.log in case of failure +trap "cat ${resultdir}/root.log | tail -30; cat ${resultdir}/build.log || :" 0 + +# crate srpm rm -f SRPMS/* rpmbuild -bs --clean --define "_topdir `pwd`" --define "_sourcedir `pwd`" javapackages-tools.spec -#trap "cat ${RPMDIR}/root.log | tail -30; cat ${RPMDIR}/build.log || :" 0 - +# build RPM with custom mock config +rm -Rf ${resultdir}/* mock -r ../..$PWD/fedora-rawhide-x86_64 SRPMS/*.src.rpm +# remove unneeded stuff +rm -f javapackages-*.tar.xz -LAST_BN=`grep "Build number" ${REPO}/info.log | awk '{ print $3 }'` -if [ -n "${LAST_BN}" ]; then - mkdir -p RPM/${LAST_BN} - mv ${REPO}/* RPM/${LAST_BN} +last_bn=`grep "Build number" ${repo}/info.log | awk '{ print $3 }'` +if [ -n "${last_bn}" ]; then + mkdir -p RPM/${last_bn} + mv ${repo}/* RPM/${last_bn} - # we only want keep RPMs from last 10 builds - REMOVE_BN=`expr $LAST_BN - 10` - rm -Rf RPM/${REMOVE_BN} + # we only want keep RPMs from last 10 builds + blist=`find ./RPM/ -name "[0-9]*"` + for bn in $blist; do + if [ `basename $bn` -lt `expr $last_bn - 10` ]; then + rm -Rf RPM/$bn + fi + done fi # copy resulting RPMs to RPM/latest -RESULT="/var/lib/mock/javapackages-rawhide/result/" -for pkg in `ls -1 ${RESULT}/ | grep ".noarch.rpm"`; do - cp ${RESULT}/$pkg ${REPO}/${pkg} -done -tail -n 50 ${RESULT}/build.log -rm -Rf ${RESULT}/* +cp ${resultdir}/* ${repo} -createrepo ${REPO} +tail -n 50 ${resultdir}/build.log -rm -f javapackages-*.tar.xz +createrepo ${repo} -JEND=`date` +# store current build number into the file +echo "Build number: $BUILD_NUMBER" >> ${repo}/info.log -echo "Job start: $JSTART" > ${REPO}/info.log -echo "Job end: $JEND" >> ${REPO}/info.log -echo "Build number: $BUILD_NUMBER" >> ${REPO}/info.log From 538d0081f413ef0df4935831b225e5efbf6b1f59 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 28 Apr 2014 13:45:09 +0200 Subject: [PATCH 14/15] [build] Fix removing old build --- build.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.bash b/build.bash index 18a2803..5bd749a 100644 --- a/build.bash +++ b/build.bash @@ -42,10 +42,10 @@ if [ -n "${last_bn}" ]; then mv ${repo}/* RPM/${last_bn} # we only want keep RPMs from last 10 builds - blist=`find ./RPM/ -name "[0-9]*"` + blist=`find ./RPM/ -maxdepth 1 -name "[0-9]*"` for bn in $blist; do if [ `basename $bn` -lt `expr $last_bn - 10` ]; then - rm -Rf RPM/$bn + rm -Rf $bn fi done fi From 343e3d080a2f961a3595accd310f8daee1c285b0 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 28 Apr 2014 13:58:35 +0200 Subject: [PATCH 15/15] [build] Fix in commentary --- build.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.bash b/build.bash index 5bd749a..b796fd1 100644 --- a/build.bash +++ b/build.bash @@ -6,7 +6,7 @@ resultdir="/var/lib/mock/javapackages-rawhide/result/" curl https://raw.githubusercontent.com/msrb/jenkins-configs/javapackages-tools/fedora-rawhide-x86_64.cfg > fedora-rawhide-x86_64.cfg touch -d '01 Jan 2000' fedora-rawhide-x86_64.cfg -# download custom mock config +# download spec file curl https://raw.githubusercontent.com/msrb/jenkins-configs/javapackages-tools/javapackages-tools.spec > javapackages-tools.spec # create directories