Hello community, here is the log from the commit of package slf4j for openSUSE:Factory checked in at 2020-04-23 18:29:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slf4j (Old) and /work/SRC/openSUSE:Factory/.slf4j.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slf4j" Thu Apr 23 18:29:09 2020 rev:24 rq:796004 version:1.7.30 Changes: -------- --- /work/SRC/openSUSE:Factory/slf4j/slf4j-sources.changes 2020-03-01 21:25:52.808296396 +0100 +++ /work/SRC/openSUSE:Factory/.slf4j.new.2738/slf4j-sources.changes 2020-04-23 18:29:14.819951067 +0200 @@ -1,0 +2,7 @@ +Sat Apr 11 19:11:24 UTC 2020 - Fridrich Strba <[email protected]> + +- Don't use %%mvn_artifact, but %%add_maven_depmap for the + sources artifacts, so that they don't suck in half of the xmvn* + stack in order to build + +------------------------------------------------------------------- slf4j.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slf4j-sources.spec ++++++ --- /var/tmp/diff_new_pack.VR1o5r/_old 2020-04-23 18:29:20.039961053 +0200 +++ /var/tmp/diff_new_pack.VR1o5r/_new 2020-04-23 18:29:20.039961053 +0200 @@ -25,17 +25,12 @@ # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT License: MIT AND Apache-2.0 Group: Development/Libraries/Java -URL: http://www.slf4j.org/ +URL: https://www.slf4j.org/ Source0: https://github.com/qos-ch/%{base_name}/archive/v_%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Patch2: slf4j-commons-lang3.patch BuildRequires: javapackages-local -BuildRequires: xmvn-install -BuildRequires: xmvn-resolve BuildArch: noarch -Requires: mvn(commons-logging:commons-logging) -Requires: mvn(log4j:log4j:1.2.17) -Requires: mvn(org.slf4j:slf4j-api) = %{version} %description SLF4J Source JARs. @@ -47,8 +42,8 @@ cp -p %{SOURCE1} APACHE-LICENSE # Compat symlinks -%mvn_file ':{*}' %{base_name}/@1 -%mvn_package :::sources: +%{mvn_file} ':{*}' %{base_name}/@1 +%{mvn_package} :::sources: %build rm -f */src/main/resources/META-INF/MANIFEST.MF @@ -56,17 +51,27 @@ mkdir -p %{base_name}-${i}/target jar cf %{base_name}-${i}/target/%{base_name}-${i}-%{version}-sources.jar -C %{base_name}-${i}/src/main/java . jar uf %{base_name}-${i}/target/%{base_name}-${i}-%{version}-sources.jar -C %{base_name}-${i}/src/main/resources . - %mvn_artifact org.slf4j:%{base_name}-${i}:jar:sources:%{version} %{base_name}-${i}/target/%{base_name}-${i}-%{version}-sources.jar +# %{mvn_artifact} org.slf4j:%{base_name}-${i}:jar:sources:%{version} %{base_name}-${i}/target/%{base_name}-${i}-%{version}-sources.jar done for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do mkdir -p ${i}/target jar cf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/java . jar uf ${i}/target/${i}-%{version}-sources.jar -C ${i}/src/main/resources . - %mvn_artifact org.slf4j:${i}:jar:sources:%{version} ${i}/target/${i}-%{version}-sources.jar +# %{mvn_artifact} org.slf4j:${i}:jar:sources:%{version} ${i}/target/${i}-%{version}-sources.jar done %install -%mvn_install +install -dm 0755 %{buildroot}%{_javadir}/%{base_name} +for i in api ext jcl jdk14 log4j12 nop simple; do + install -pm 0644 %{base_name}-${i}/target/%{base_name}-${i}-%{version}-sources.jar \ + %{buildroot}%{_javadir}/%{base_name}/%{base_name}-${i}-sources.jar + %add_maven_depmap org.slf4j:%{base_name}-${i}:jar:sources:%{version} %{base_name}/%{base_name}-${i}-sources.jar +done +for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do + install -pm 0644 ${i}/target/${i}-%{version}-sources.jar \ + %{buildroot}%{_javadir}/%{base_name}/${i}-sources.jar + %add_maven_depmap org.slf4j:${i}:jar:sources:%{version} %{base_name}/${i}-sources.jar +done %files -f .mfiles %license LICENSE.txt APACHE-LICENSE ++++++ slf4j.spec ++++++ --- /var/tmp/diff_new_pack.VR1o5r/_old 2020-04-23 18:29:20.067961107 +0200 +++ /var/tmp/diff_new_pack.VR1o5r/_new 2020-04-23 18:29:20.067961107 +0200 @@ -24,7 +24,7 @@ # the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT License: MIT AND Apache-2.0 Group: Development/Libraries/Java -URL: http://www.slf4j.org/ +URL: https://www.slf4j.org/ Source0: https://github.com/qos-ch/%{name}/archive/v_%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: build.xml.tar.bz2
