Hello community, here is the log from the commit of package args4j for openSUSE:Factory checked in at 2019-09-25 08:49:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/args4j (Old) and /work/SRC/openSUSE:Factory/.args4j.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "args4j" Wed Sep 25 08:49:52 2019 rev:8 rq:733004 version:2.33 Changes: -------- --- /work/SRC/openSUSE:Factory/args4j/args4j.changes 2019-09-21 17:30:20.668736581 +0200 +++ /work/SRC/openSUSE:Factory/.args4j.new.7948/args4j.changes 2019-09-25 08:49:57.806210919 +0200 @@ -1,0 +2,8 @@ +Tue Sep 24 16:39:12 UTC 2019 - Fridrich Strba <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- args4j-2.0.9.pom 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.OXy7Nw/_old 2019-09-25 08:49:58.474210829 +0200 +++ /var/tmp/diff_new_pack.OXy7Nw/_new 2019-09-25 08:49:58.478210829 +0200 @@ -16,25 +16,25 @@ # +%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 -Source1: http://central.maven.org/maven2/args4j/%{name}/%{version}/%{name}-%{version}.pom -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: java-devel >= 1.8 +BuildRequires: java-devel BuildRequires: javapackages-local -Requires: java >= 1.8 BuildArch: noarch +%if %{with tests} +BuildRequires: ant-junit +BuildRequires: mockito +%endif %description args4j is a small Java class library that makes it easy @@ -46,50 +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 -cp %{SOURCE1} pom.xml -%pom_remove_parent -%pom_xpath_inject pom:project " +%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>" + <version>%{version}</version> +" $i +done %build -mkdir -p build/generated-sources -ant -Djavac.source=8 -Djavac.target=8 -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 +# 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 -d -m 755 %{buildroot}%{_mavenpomdir} -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom -%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar - -# Java doc -install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} -cp -pr dist/javadoc %{buildroot}%{_javadocdir}/%{name}/ -%fdupes -s %{buildroot}%{_javadocdir}/%{name}/ - -%files -%{_javadir}/* -%{_mavenpomdir}/* -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml* -%endif +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 tools -f .mfiles-tools %files javadoc %{_javadocdir}/%{name} +%license %{name}/LICENSE.txt %changelog
