Hello community, here is the log from the commit of package jformatstring for openSUSE:Leap:15.2 checked in at 2020-02-05 07:29:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/jformatstring (Old) and /work/SRC/openSUSE:Leap:15.2/.jformatstring.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jformatstring" Wed Feb 5 07:29:18 2020 rev:22 rq:764768 version:0.10~20131207 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/jformatstring/jformatstring.changes 2020-01-15 15:13:24.354174146 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.jformatstring.new.26092/jformatstring.changes 2020-02-05 07:29:24.674746504 +0100 @@ -1,0 +2,20 @@ +Fri Dec 20 09:32:52 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Refetch the gpl-2.0.html to satisfy source validator + +------------------------------------------------------------------- +Wed Dec 19 09:46:22 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Upgrade to a snapshot from 2013-12-07 + * Use the *orig.tar.gz from Debian, since the sources move all + the time and it is unclear what is the autoritative source + now, or even whether an authoritative source exists +- Add maven pom file +- Do not build the junit code, since it requires findbugs to build +- Modified patch: + * jformatstring-sourcetarget.patch -> jformatstring-build.patch + + Don't build the junit directory + + Don't bundle source in the jar file + + Rediff to a changed context + +------------------------------------------------------------------- @@ -4 +24,2 @@ -- Generate javadoc without timestamp to make build reproducible (boo#1047218) +- Generate javadoc without timestamp to make build reproducible + (boo#1047218) Old: ---- jformatstring-0.tar.bz2 jformatstring-sourcetarget.patch New: ---- gpl-2.0.html jFormatString-3.0.0.pom jformatstring-build.patch jformatstring_0.10~20131207.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jformatstring.spec ++++++ --- /var/tmp/diff_new_pack.CIXCe3/_old 2020-02-05 07:29:24.998746640 +0100 +++ /var/tmp/diff_new_pack.CIXCe3/_new 2020-02-05 07:29:24.998746640 +0100 @@ -1,7 +1,7 @@ # # spec file for package jformatstring # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -13,25 +13,25 @@ # 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/ # Name: jformatstring -Version: 0 +Version: 0.10~20131207 Release: 0 Summary: Java library for format string checks -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Libraries/Java -Url: https://jformatstring.dev.java.net/ -# svn -q export -r 8 https://jformatstring.dev.java.net/svn/jformatstring/trunk/jFormatString jformatstring-0 --username guest --password guest && tar cjf jformatstring-0.tar.bz2 jformatstring-0 -Source0: jformatstring-0.tar.bz2 -Patch0: jformatstring-sourcetarget.patch +URL: https://jformatstring.dev.java.net/ +Source0: http://cdn-fastly.deb.debian.org/debian/pool/main/j/jformatstring/jformatstring_%{version}.orig.tar.gz +Source1: http://search.maven.org/remotecontent?filepath=com/google/code/findbugs/jFormatString/3.0.0/jFormatString-3.0.0.pom +Source2: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html +Patch0: jformatstring-build.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: java-devel -BuildRequires: javapackages-tools -BuildRequires: junit +BuildRequires: javapackages-local Provides: jFormatString = %{version}-%{release} Obsoletes: jFormatString < %{version}-%{release} BuildArch: noarch @@ -55,9 +55,7 @@ %package javadoc Summary: Javadoc for %{name} -# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" -Group: Development/Documentation -Requires: java-javadoc +Group: Documentation/HTML %description javadoc Javadoc for %{name}. @@ -66,43 +64,35 @@ %setup -q %patch0 -p1 mkdir -p lib -build-jar-repository -s -p lib junit +cp %{SOURCE2} LICENSE %build -export CLASSPATH= -export OPT_JAR_LIST=: -ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 +ant -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 jarFile +mkdir -p javadoc javadoc -notimestamp -d javadoc -source 1.6 \ - -sourcepath src/java \ - -classpath build/classes:$(build-classpath junit) \ - edu.umd.cs.findbugs.formatStringChecker + $(find src/java -name \*.java | xargs) %install - -mkdir -p %{buildroot}%{_javadir} -cp -p build/jFormatString.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar -ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jFormatString-%{version}.jar -ln -s jFormatString-%{version}.jar %{buildroot}%{_javadir}/jFormatString.jar - -mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version} -cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} -%fdupes -s %{buildroot}%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} -ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jFormatString-%{version} -ln -s jFormatString-%{version} %{buildroot}%{_javadocdir}/jFormatString - -%files -%doc LICENSE -%{_javadir}/%{name}-%{version}.jar -%{_javadir}/%{name}.jar -%{_javadir}/jFormatString-%{version}.jar -%{_javadir}/jFormatString.jar +# jars +install -d -m 755 %{buildroot}%{_javadir} +install -pm 644 build/jFormatString.jar %{buildroot}%{_javadir}/%{name}.jar +ln -s %{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +ln -s %{name}.jar %{buildroot}%{_javadir}/jFormatString.jar +ln -s jFormatString.jar %{buildroot}%{_javadir}/jFormatString-%{version}.jar +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar +# javadoc +mkdir -p %{buildroot}%{_javadocdir} +cp -pr javadoc %{buildroot}%{_javadocdir}/%{name}-%{version} +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE +%{_javadir}/* %files javadoc -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} -%{_javadocdir}/jFormatString-%{version} -%{_javadocdir}/jFormatString +%{_javadocdir}/* %changelog ++++++ gpl-2.0.html ++++++ ++++ 1047 lines (skipped) ++++++ jFormatString-3.0.0.pom ++++++ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.google.code.findbugs</groupId> <artifactId>jFormatString</artifactId> <version>3.0.0</version> <packaging>jar</packaging> <url>http://findbugs.sourceforge.net/</url> <name>FindBugs-jFormatString</name> <description>jFormatString for Findbugs</description> <licenses> <license> <name>GNU Lesser Public License</name> <url>http://www.gnu.org/licenses/lgpl.html</url> <distribution>repo</distribution> </license> </licenses> <scm> <connection>scm:git:http://code.google.com/p/findbugs/</connection> <developerConnection>scm:git:https://code.google.com/p/findbugs/</developerConnection> <url>https://code.google.com/p/findbugs/</url> </scm> <developers> <developer> <id>bp</id> <name>Bill Pugh</name> <email>pugh at cs.umd.edu</email> <url>http://www.cs.umd.edu/~pugh/</url> <roles> <role>Project Lead</role> <role>Primary Developer</role> </roles> <timezone>-5</timezone> </developer> <developer> <id>al</id> <name>Andrey Loskutov</name> <email>losku...@gmx.de</email> <url>http://andrei.gmxhome.de/privat.html</url> <roles> <role>Eclipse plugin</role> </roles> <timezone>+1</timezone> </developer> <developer> <id>bp</id> <name>Keith Lea</name> <email></email> <url>http://keithlea.com/</url> <roles> <role>web cloud</role> </roles> <timezone>-5</timezone> </developer> </developers> <contributors> <contributor> <name>Garvin LeClaire</name> <email>garvin.lecla...@gmail.com</email> <url></url> <roles> <role>Maven</role> </roles> <timezone>-5</timezone> </contributor> <contributor> <name>David H. Hovemeyer</name> <email>dhove...@ycp.edu</email> <url>http://goose.ycp.edu/~dhovemey/</url> <roles> <role>project founder</role> </roles> <timezone>-5</timezone> </contributor> <contributor> <name>Nay Ayewah</name> <email></email> <url></url> <roles> <role></role> </roles> <timezone>-5</timezone> </contributor> <contributor> <name>Ben Langmead</name> <email></email> <url></url> <roles> <role></role> </roles> <timezone>-5</timezone> </contributor> <contributor> <name>Tomas Pollak</name> <email></email> <url></url> <roles> <role>Eclipse plugin tests</role> </roles> <timezone>-5</timezone> </contributor> <contributor> <name>Phil Crosby</name> <email></email> <url></url> <roles> <role></role> </roles> <timezone>-5</timezone> </contributor> <contributor> <name>Peter Friese</name> <email></email> <url></url> <roles> <role>Eclipse plugin</role> </roles> <timezone>-5</timezone> </contributor> <contributor> <name>Dave Brosius</name> <email></email> <url></url> <roles> <role></role> </roles> <timezone>-5</timezone> </contributor> <contributor> <name>Brian Goetz</name> <email></email> <url></url> <roles> <role></role> </roles> <timezone>-5</timezone> </contributor> <contributor> <name>Rohan Lloyd</name> <email></email> <url></url> <roles> <role></role> </roles> <timezone>-5</timezone> </contributor> </contributors> </project> ++++++ jformatstring-build.patch ++++++ --- jformatstring-0.10~20131207/build.xml 2013-12-09 01:34:10.000000000 +0100 +++ jformatstring-0.10~20131207/build.xml 2018-12-19 10:39:08.939945663 +0100 @@ -15,10 +15,9 @@ <target name="classes"> <mkdir dir="build/classes" /> - <javac destdir="build/classes" source="1.5" target="1.5" debug="on" + <javac destdir="build/classes" debug="on" includeantruntime="false"> <src path="src/java" /> - <src path="src/junit" /> <classpath> <pathelement location="build/classes" /> </classpath> @@ -31,9 +30,6 @@ <fileset dir="build/classes"> <include name="**/*.class" /> </fileset> - <fileset dir="src/java"> - <include name="**/*.java" /> - </fileset> </jar> </target> Only in jformatstring-0.10~20131207: build.xml.orig Only in jformatstring-0.10~20131207: build.xml.rej