Hello community, here is the log from the commit of package args4j for openSUSE:Leap:15.2 checked in at 2020-02-05 07:28:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/args4j (Old) and /work/SRC/openSUSE:Leap:15.2/.args4j.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "args4j" Wed Feb 5 07:28:54 2020 rev:10 rq:764428 version:2.33 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/args4j/args4j.changes 2020-01-15 14:47:19.565292945 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.args4j.new.26092/args4j.changes 2020-02-05 07:29:02.450737145 +0100 @@ -1,0 +2,26 @@ +Tue Sep 24 16:39:12 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Update to version 2.33 + * generate and customize the ant build files +- Add option to build with tests on (disabled by default) +- Package the tools in a subpackage + +------------------------------------------------------------------- +Fri Sep 20 11:56:30 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Remove reference to the parent pom since we are not building + using maven + +------------------------------------------------------------------- +Fri Oct 19 17:38:13 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Download from maven central the corresponding pom file and + install it. + +------------------------------------------------------------------- +Tue May 15 13:43:36 UTC 2018 - fst...@suse.com + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility + +------------------------------------------------------------------- Old: ---- args4j-2.0.9.tar.bz2 New: ---- args4j-build.tar.xz args4j-site-2.33.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ args4j.spec ++++++ --- /var/tmp/diff_new_pack.itq0hd/_old 2020-02-05 07:29:02.910737339 +0100 +++ /var/tmp/diff_new_pack.itq0hd/_new 2020-02-05 07:29:02.918737342 +0100 @@ -1,7 +1,7 @@ # # spec file for package args4j # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,27 +12,29 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%bcond_with tests Name: args4j -Version: 2.0.9 +Version: 2.33 Release: 0 -Summary: Java commandline parser +Summary: Java command line arguments parser License: MIT Group: Development/Libraries/Java -Url: http://args4j.kohsuke.org/ -Source0: %{name}-%{version}.tar.bz2 -BuildRequires: ant >= 1.7.0 -BuildRequires: ant-apache-regexp -BuildRequires: ant-contrib -BuildRequires: ant-junit -BuildRequires: ant-nodeps +URL: https://args4j.kohsuke.org +Source0: https://github.com/kohsuke/%{name}/archive/%{name}-site-%{version}.tar.gz +Source1: %{name}-build.tar.xz +BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-tools -Requires: java >= 1.6 +BuildRequires: java-devel +BuildRequires: javapackages-local BuildArch: noarch +%if %{with tests} +BuildRequires: ant-junit +BuildRequires: mockito +%endif %description args4j is a small Java class library that makes it easy @@ -44,34 +46,91 @@ - It is designed to parse javac like options (as opposed to GNU-style where ls -lR is considered to have two options l and R) -%package javadoc -Summary: Javadoc for Java commandline parser +%package tools +Summary: Development-time tool for generating additional artifacts Group: Development/Libraries/Java +Requires: %{name} = %{version} + +%description tools +This package contains args4j development-time tool for generating +additional artifacts. + +%package javadoc +Summary: API documentation for %{name} +Group: Documentation/HTML %description javadoc This package contains the API documentation for %{name}. %prep -%setup -q +%setup -q -n %{name}-%{name}-site-%{version} -a 1 + +# removing classpath addition +sed -i 's/<addClasspath>true/<addClasspath>false/g' %{name}-tools/pom.xml + +# fix ant group id +sed -i 's/<groupId>ant/<groupId>org.apache.ant/g' %{name}-tools/pom.xml + +# removing bundled stuff +find -name '*.class' -exec rm -f '{}' \; +find -name '*.jar' -exec rm -f '{}' \; + +%pom_remove_plugin :maven-shade-plugin %{name}-tools +%pom_remove_plugin -r :maven-site-plugin + +# XMvn cannot generate requires on dependecies with scope "system" +%pom_xpath_remove "pom:profile[pom:id[text()='jdk-tools-jar']]" %{name}-tools + +# we don't need these now +%pom_disable_module args4j-maven-plugin +%pom_disable_module args4j-maven-plugin-example + +for i in args4j args4j-tools; do + %pom_remove_parent $i + %pom_xpath_inject pom:project " + <groupId>args4j</groupId> + <version>%{version}</version> +" $i +done %build -mkdir -p build/generated-sources -ant -Djavac.source=1.6 -Djavac.target=1.6 -Dsource.encoding="ISO-8859-1" +mkdir -p lib +%if %{with tests} +build-jar-repository -s lib cglib/cglib mockito/mockito-core objectweb-asm/asm objenesis/objenesis +%ant package javadoc +%else +%ant -Dtest.skip=true package javadoc +%endif %install -install -d -m 0755 %{buildroot}%{_javadir} -install -m 644 dist/%{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -ln -sf %{_javadir}/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar - -# Java doc -install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} -cp -pr dist/javadoc %{buildroot}%{_javadocdir}/%{name}/ -%fdupes -s %{buildroot}%{_javadocdir}/%{name}/ +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 %{name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +(cd %{buildroot}%{_javadir} && ln -s %{name}/%{name}.jar %{name}.jar) +install -pm 0644 %{name}-tools/target/%{name}-tools-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-tools.jar +(cd %{buildroot}%{_javadir} && ln -s %{name}/%{name}-tools.jar %{name}-tools.jar) + +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +install -pm 0644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +install -pm 0644 %{name}-tools/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-tools.pom +%add_maven_depmap %{name}/%{name}-tools.pom %{name}/%{name}-tools.jar -f tools + +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -r %{name}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{name} +cp -r %{name}-tools/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{name}-tools +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%{_javadir}/%{name}*.jar +%license %{name}/LICENSE.txt -%files -%{_javadir}/* +%files tools -f .mfiles-tools %files javadoc %{_javadocdir}/%{name} +%license %{name}/LICENSE.txt %changelog
