Hello community, here is the log from the commit of package sat4j for openSUSE:Factory checked in at 2017-09-20 17:13:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sat4j (Old) and /work/SRC/openSUSE:Factory/.sat4j.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sat4j" Wed Sep 20 17:13:53 2017 rev:18 rq:527466 version:2.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/sat4j/sat4j.changes 2017-05-22 10:49:10.290638914 +0200 +++ /work/SRC/openSUSE:Factory/.sat4j.new/sat4j.changes 2017-09-20 17:13:54.499273207 +0200 @@ -1,0 +2,12 @@ +Wed Sep 20 07:19:52 UTC 2017 - [email protected] + +- Added patches: + * sat4j-sourcetarget.patch + + make the java source and target level consistent with what + is specified on command-line + + specify the UTF-8 encoding of the source files + * sat4j-manifest.patch + + fix rpmlint warning about Class-path in manifest + + remove all mentions of Class-path from MANIFEST.MF files + +------------------------------------------------------------------- New: ---- sat4j-manifest.patch sat4j-sourcetarget.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sat4j.spec ++++++ --- /var/tmp/diff_new_pack.1rEYbN/_old 2017-09-20 17:13:55.423143155 +0200 +++ /var/tmp/diff_new_pack.1rEYbN/_new 2017-09-20 17:13:55.423143155 +0200 @@ -23,11 +23,13 @@ Version: 2.3.2 Release: 0 Summary: A library of SAT solvers written in Java -License: EPL-1.0 and LGPL-2.0 +License: EPL-1.0 AND LGPL-2.0 Group: Development/Libraries/Java Url: http://www.sat4j.org/ # svn co svn://svn.forge.objectweb.org/svnroot/sat4j/maven/tags/org.sat4j.pom-2.3.2 Source0: %{name}-%{version}.tar.bz2 +Patch0: sat4j-sourcetarget.patch +Patch1: sat4j-manifest.patch BuildRequires: ant Requires: java BuildArch: noarch @@ -40,11 +42,15 @@ %prep %setup -q -n org.%{name}.pom-%{version} +%patch0 -p1 +%patch1 -p1 # Only used for the tests rm lib/commons-cli.jar %build -ant -Dbuild.compiler=modern -Drelease=%{version} -DBUILD_DATE=%{qualifier} -Dsource=1.5 -Dtarget=1.5 p2 +ant \ + -Dbuild.compiler=modern -Drelease=%{version} \ + -DBUILD_DATE=%{qualifier} -Dsource=1.6 -Dtarget=1.6 p2 %install install -d -m 755 %{buildroot}%{_javadir} @@ -53,7 +59,6 @@ (cd %{buildroot}%{_javadir}/ && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done) %files -%defattr(-,root,root,-) %{_javadir}/org.%{name}*.jar %changelog ++++++ sat4j-manifest.patch ++++++ --- org.sat4j.pom-2.3.2/org.sat4j.csp/META-INF/MANIFEST.MF 2017-09-20 09:05:47.513887173 +0200 +++ org.sat4j.pom-2.3.2/org.sat4j.csp/META-INF/MANIFEST.MF 2017-09-20 09:16:38.860739366 +0200 @@ -20,5 +20,4 @@ Implementation-Title: SAT4J Implementation-Version: 9.9.9.token Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois -Class-Path: org.sat4j.core.jar lib/js.jar lib/cspparserxml.jar Bundle-RequiredExecutionEnvironment: J2SE-1.4 --- org.sat4j.pom-2.3.2/org.sat4j.intervalorders/META-INF/MANIFEST.MF 2017-09-20 09:05:47.517887173 +0200 +++ org.sat4j.pom-2.3.2/org.sat4j.intervalorders/META-INF/MANIFEST.MF 2017-09-20 09:16:49.132739405 +0200 @@ -7,4 +7,3 @@ Implementation-Title: SAT4J Implementation-Version: 9.9.9.token Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois -Class-Path: org.sat4j.core.jar org.sat4j.pb.jar \ No newline at end of file --- org.sat4j.pom-2.3.2/org.sat4j.maxsat/META-INF/MANIFEST.MF 2017-09-20 09:05:47.513887173 +0200 +++ org.sat4j.pom-2.3.2/org.sat4j.maxsat/META-INF/MANIFEST.MF 2017-09-20 09:16:31.380739338 +0200 @@ -18,5 +18,4 @@ Implementation-Title: SAT4J Implementation-Version: 2.0 Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois -Class-Path: org.sat4j.pb.jar lib/commons-cli.jar Bundle-RequiredExecutionEnvironment: J2SE-1.5 --- org.sat4j.pom-2.3.2/org.sat4j.pb/META-INF/MANIFEST.MF 2017-09-20 09:05:47.509887173 +0200 +++ org.sat4j.pom-2.3.2/org.sat4j.pb/META-INF/MANIFEST.MF 2017-09-20 09:17:04.052739461 +0200 @@ -21,5 +21,4 @@ Implementation-Title: SAT4J Implementation-Version: 9.9.9.token Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois -Class-Path: org.sat4j.core.jar Bundle-RequiredExecutionEnvironment: J2SE-1.5 --- org.sat4j.pom-2.3.2/org.sat4j.sat/META-INF/MANIFEST.MF 2017-09-20 09:05:47.513887173 +0200 +++ org.sat4j.pom-2.3.2/org.sat4j.sat/META-INF/MANIFEST.MF 2017-09-20 09:16:13.548739271 +0200 @@ -7,7 +7,6 @@ Implementation-Title: SAT4J Implementation-Version: 9.9.9.token Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois -Class-Path: org.sat4j.core.jar org.sat4j.pb.jar lib/commons-beanutils.jar lib/commons-cli.jar lib/commons-logging.jar Export-Package: org.sat4j.sat;version="9.9.9.token" Bundle-SymbolicName: org.sat4j.sat Bundle-Version: 9.9.9.token --- org.sat4j.pom-2.3.2/org.sat4j.sudoku/META-INF/MANIFEST.MF 2017-09-20 09:05:47.509887173 +0200 +++ org.sat4j.pom-2.3.2/org.sat4j.sudoku/META-INF/MANIFEST.MF 2017-09-20 09:17:09.484739482 +0200 @@ -7,4 +7,3 @@ Implementation-Title: SAT4J Implementation-Version: 9.9.9.token Implementation-Vendor: CRIL CNRS UMR 8188 - Universite d'Artois -Class-Path: org.sat4j.core.jar lib/jlfgr-1_0.jar ++++++ sat4j-sourcetarget.patch ++++++ --- org.sat4j.pom-2.3.2/build.xml 2017-09-20 09:05:47.517887173 +0200 +++ org.sat4j.pom-2.3.2/build.xml 2017-09-20 09:13:23.469210761 +0200 @@ -277,7 +277,8 @@ <echo>Generating Javodoc</echo> <javadoc destdir="${doc}/${module}" access="public" - source="1.6" + encoding="UTF-8" + source="${source}" use="true" notree="false" nonavbar="false" @@ -303,8 +304,9 @@ <javac srcdir="${src}" destdir="${build}" - source="1.5" + source="${source}" target="${target}" + encoding="UTF-8" includeantruntime="false"> <classpath refid="somePath"/> </javac> @@ -408,7 +410,7 @@ <target name="tests" description="Launch JUnit tests and generate a report"> <echo>Compiling test files</echo> - <javac srcdir="${test}" destdir="${build}" source="1.5" target="1.5" debug="true"> + <javac srcdir="${test}" destdir="${build}" source="${source}" target="${target}" encoding="UTF-8" debug="true"> <classpath refid="somePath"/> </javac> <echo>Running JUNIT tests</echo>
