Hello community, here is the log from the commit of package jarjar for openSUSE:Factory checked in at 2017-09-20 17:09:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jarjar (Old) and /work/SRC/openSUSE:Factory/.jarjar.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jarjar" Wed Sep 20 17:09:05 2017 rev:16 rq:527011 version:0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/jarjar/jarjar.changes 2017-05-22 10:48:29.468392624 +0200 +++ /work/SRC/openSUSE:Factory/.jarjar.new/jarjar.changes 2017-09-20 17:09:07.647653120 +0200 @@ -1,0 +2,6 @@ +Mon Sep 18 12:22:22 UTC 2017 - [email protected] + +- Fix build with jdk9: specify java source and target 1.6 +- Clean spec file and fix a warning with duplicate waste + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jarjar.spec ++++++ --- /var/tmp/diff_new_pack.zwl3ju/_old 2017-09-20 17:09:09.919333335 +0200 +++ /var/tmp/diff_new_pack.zwl3ju/_new 2017-09-20 17:09:09.923332772 +0200 @@ -17,7 +17,6 @@ %define section free - Name: jarjar Version: 0.9 Release: 0 @@ -28,25 +27,24 @@ Source0: http://downloads.sourceforge.net/jarjar/jarjar-src-0.9.zip Source1: jarjar-0.9.pom Source2: jarjar-util.pom - BuildRequires: ant >= 1.6 BuildRequires: ant-junit >= 1.6 BuildRequires: asm2 +BuildRequires: fdupes BuildRequires: gnu-regexp +BuildRequires: java-devel BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: junit -%if 0 -BuildRequires: maven2 -%endif -BuildRequires: java-devel BuildRequires: unzip Requires: asm2 Requires: gnu-regexp Requires(post): javapackages-tools Requires(postun): javapackages-tools BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0 +BuildRequires: maven2 +%endif %description Jar Jar Links is a utility that makes it easy to repackage Java @@ -56,13 +54,10 @@ specific version of a library, which may conflict with the dependencies of another library. - - %if 0 - %package maven2-plugin - Summary: Maven2 plugin for %{name} +# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"; Group: Utilities Requires: %{name} = %{version}-%{release} Requires: maven2 @@ -84,10 +79,8 @@ specific version of a library, which may conflict with the dependencies of another library. - - %prep -%setup -q -n %{name}-%{version} +%setup -q # remove all binary libs find . -name "*.jar" | xargs -t rm # maven plugin @@ -99,13 +92,15 @@ ln -sf $(build-classpath asm2/asm) asm.jar ln -sf $(build-classpath asm2/asm-commons) asm-commons.jar ln -sf $(build-classpath asm2/asm-util) asm-util.jar +ln -sf $(build-classpath ant) ant.jar %if 0 ln -sf $(build-classpath maven2/plugin-api) maven-plugin-api.jar %endif popd export OPT_JAR_LIST="ant/ant-junit junit" -export CLASSPATH=$(build-classpath ant) -ant jar jar-util javadoc mojo test +ant \ + -Dcompile.source=1.6 -Dcompile.target=1.6 \ + jar jar-util javadoc mojo test %install # jars @@ -134,9 +129,9 @@ # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name} +%fdupes -s %{buildroot}%{_javadocdir}/%{name} %files -%defattr(0644,root,root,0755) %doc COPYING %{_javadir}/%{name}.jar %{_javadir}/%{name}-util.jar @@ -145,13 +140,11 @@ %if 0 %files maven2-plugin -%defattr(0644,root,root,0755) %{_javadir}/%{name}-maven2-plugin-%{version}.jar %{_javadir}/%{name}-maven2-plugin.jar %endif %files javadoc -%defattr(0644,root,root,0755) %{_javadocdir}/%{name} %changelog
