Accepting request 796004 from Java:packages

- 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
- 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

OBS-URL: https://build.opensuse.org/request/show/796004
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slf4j?expand=0&rev=24

slf4j-sources.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Apr 11 19:11:24 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- 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
+
 -------------------------------------------------------------------
 Wed Feb 26 12:40:57 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 

slf4j-sources.spec

@@ -25,17 +25,12 @@ Summary:        SLF4J Source JARs
 # 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 @@ find . -name "*.jar" | xargs rm
 cp -p %{SOURCE1} APACHE-LICENSE
 
 # Compat symlinks
-%mvn_file ':{*}' %{base_name}/@1
+%{mvn_file} ':{*}' %{base_name}/@1
-%mvn_package :::sources: 
+%{mvn_package} :::sources:
 
 %build
 rm -f */src/main/resources/META-INF/MANIFEST.MF
@@ -56,17 +51,27 @@ for i in api ext jcl jdk14 log4j12 nop simple; do
   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.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Apr 11 19:11:24 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- 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
+
 -------------------------------------------------------------------
 Wed Feb 26 12:40:57 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 

slf4j.spec

@@ -24,7 +24,7 @@ Summary:        Simple Logging Facade for Java
 # 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