Hello community, here is the log from the commit of package jgroups for openSUSE:Factory checked in at 2017-09-20 17:10:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jgroups (Old) and /work/SRC/openSUSE:Factory/.jgroups.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jgroups" Wed Sep 20 17:10:36 2017 rev:18 rq:527240 version:2.6.10 Changes: -------- --- /work/SRC/openSUSE:Factory/jgroups/jgroups.changes 2014-07-11 20:05:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jgroups.new/jgroups.changes 2017-09-20 17:10:40.726550433 +0200 @@ -1,0 +2,9 @@ +Tue Sep 19 08:08:14 UTC 2017 - [email protected] + +- Added patch: + * jgroups-nosource.patch + + don't hardcode source level; we specify it on command-line +- Build with java source and target levels 1.6 in order to allow + building with jdk9 + +------------------------------------------------------------------- New: ---- jgroups-nosource.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jgroups.spec ++++++ --- /var/tmp/diff_new_pack.uL2fjo/_old 2017-09-20 17:10:41.434450782 +0200 +++ /var/tmp/diff_new_pack.uL2fjo/_new 2017-09-20 17:10:41.438450220 +0200 @@ -1,7 +1,7 @@ # # spec file for package jgroups # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -22,10 +22,6 @@ %define repodir %{_javadir}/repository.jboss.com/jgroups/2.4.1.SP4-brew %define repodirlib %{repodir}/lib %define repodirsrc %{repodir}/src -# If you don't want to run the unit tests -# give rpmbuild option '--without tests' -%define with_tests %{!?_without_tests:1}%{?_without_tests:0} -%define without_tests %{?_without_tests:1}%{!?_without_tests:0} Name: jgroups Version: 2.6.10 Release: 0 @@ -49,12 +45,15 @@ Source1: jgroups-component-info.xml #PATCH-FIX-OPENSUSE: junit.swingui does not exists in junit 4 Patch0: jgroups-swingui.patch +#PATCH-FIX-OPENSUSE: don't hardcode source so that it can be specified from command-line +Patch1: jgroups-nosource.patch BuildRequires: ant >= 1.6 BuildRequires: ant-junit BuildRequires: apache-commons-logging BuildRequires: bsh +BuildRequires: fdupes BuildRequires: geronimo-jms-1_1-api -BuildRequires: java-devel >= 1.5.0 +BuildRequires: java-devel BuildRequires: javapackages-tools BuildRequires: jaxp_parser_impl BuildRequires: junit @@ -69,7 +68,6 @@ Requires: log4j Provides: javagroups = %{version} Obsoletes: javagroups < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -100,7 +98,6 @@ using JGroups. %if %{with_repolib} - %package repolib Summary: Artifacts to be uploaded to a repository library Group: Development/Libraries/Java @@ -151,6 +148,7 @@ %prep %setup -q -n JGroups-%{version}.merge.src %patch0 -p1 +%patch1 -p1 find . -type f -name '*.jar' | xargs rm -f # this test requires bouncycastle rm tests/junit/org/jgroups/protocols/ENCRYPTAsymmetricTest.java @@ -178,13 +176,7 @@ ln -sf $(build-classpath xalan-j2) . ln -sf $(build-classpath xalan-j2-serializer) . popd -%if %{without_tests} -ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar javadoc gossip-service jgroups-service -%else -#export ANT_OPTS="-Djava.net.preferIPv4Stack=true" -#ant jar javadoc gossip-service jgroups-service unittests-xml testreport -ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar javadoc gossip-service jgroups-service -%endif +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jar javadoc gossip-service jgroups-service %install # jar @@ -197,6 +189,7 @@ # javadoc install -d %{buildroot}%{_javadocdir}/%{name}-%{version} cp -pr dist/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ +%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version} (cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name}) # services install -p -d -m 755 %{buildroot}%{_datadir}/%{name}-%{version} @@ -215,23 +208,18 @@ %endif %files -%defattr(0644,root,root,0755) %doc CREDITS INSTALL.html README LICENSE %{_javadir}/%{name}*jar %{_datadir}/%{name}-%{version} %files javadoc -%defattr(0644,root,root,0755) %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files manual -%defattr(0644,root,root,0755) %doc %{_docdir}/%{name}-%{version} %if %{with_repolib} - %files repolib -%defattr(0644,root,root,0755) %{repodir} %dir %{_javadir}/repository.jboss.com %dir %{_javadir}/repository.jboss.com/%{name} ++++++ jgroups-nosource.patch ++++++ --- JGroups-2.6.10.merge.src/build.xml 2017-09-19 09:56:25.272837434 +0200 +++ JGroups-2.6.10.merge.src/build.xml 2017-09-19 09:57:04.904838110 +0200 @@ -82,7 +82,6 @@ depends="prepare" description="Compiles are Java files"> <javac destdir="${compile.dir}" - source="1.5" classpathref="jg.classpath" debug="on" deprecation="off"
