Fridrich Strba 2022-02-24 19:17:28 +00:00 committed by Git OBS Bridge
parent b0136615b1
commit cc99164f4c
5 changed files with 24 additions and 18 deletions

View File

@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/qos-ch/slf4j.git</param>
<param name="revision">v_1.7.32</param>
<param name="revision">v_1.7.36</param>
<param name="match-tag">v_*</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v_(.*)</param>

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4a4b31b1488ed43e9239545ea99b6ed9ada625133cf767828afd8f3247680ea7
size 7880
oid sha256:dd511a2221df4e753a8e7a340a2031d686126b690cc0f185fa84ca287b5e3cc1
size 7500

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3394567be9f31307d69e4d41a62e8be48f8c080ed9ae8ec6911515fe64ab948b
size 2022484

BIN
slf4j-1.7.36.tar.xz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -18,7 +18,7 @@
Name: slf4j
Version: 1.7.32
Version: 1.7.36
Release: 0
Summary: Simple Logging Facade for Java
# the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
@ -82,13 +82,15 @@ Requires: mvn(org.slf4j:slf4j-api) = %{version}
%description jdk14
SLF4J JDK14 Binding.
%package log4j12
%package reload4j
Summary: SLF4J LOG4J-12 Binding
Group: Development/Libraries/Java
Requires: mvn(log4j:log4j)
Requires: mvn(ch.qos.reload4j:reload4j)
Requires: mvn(org.slf4j:slf4j-api) = %{version}
Provides: %{name}-log4j12 = %{version}
Obsoletes: %{name}-log4j12 < %{version}
%description log4j12
%description reload4j
SLF4J LOG4J-12 Binding.
%package jcl
@ -185,7 +187,7 @@ ant -Dmaven2.jpp.mode=true \
package javadoc \
# Sources
for i in api ext jcl jdk14 log4j12 nop simple; do
for i in api ext jcl jdk14 reload4j nop simple; do
mkdir -p %{name}-${i}/target
jar cf %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar -C %{name}-${i}/src/main/java .
jar uf %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar -C %{name}-${i}/src/main/resources .
@ -201,7 +203,7 @@ done
# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
for i in api ext jcl jdk14 log4j12 nop simple; do
for i in api ext jcl jdk14 reload4j nop simple; do
install -m 644 slf4j-${i}/target/slf4j-${i}-%{version}.jar \
%{buildroot}%{_javadir}/%{name}/${i}.jar
ln -sf ${i}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar
@ -211,7 +213,7 @@ for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
install -m 644 ${i}/target/${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${i}.jar
done
for i in api ext jcl jdk14 log4j12 nop simple; do
for i in api ext jcl jdk14 reload4j nop simple; do
install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}-sources.jar \
%{buildroot}%{_javadir}/%{name}/%{name}-${i}-sources.jar
done
@ -224,7 +226,7 @@ done
# poms
install -d -m 755 %{buildroot}%{_mavenpomdir}/%{name}
for i in api ext jcl jdk14 log4j12 nop simple; do
for i in api ext jcl jdk14 reload4j nop simple; do
%pom_remove_parent slf4j-${i}
%pom_xpath_inject "pom:project" "
<groupId>org.slf4j</groupId>
@ -244,14 +246,18 @@ for i in api nop simple; do
%add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar
done
for i in ext jcl jdk14 log4j12 jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
for i in ext jcl jdk14 jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
%add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f ${i}
done
for i in api ext jcl jdk14 log4j12 nop simple; do
%add_maven_depmap %{name}/reload4j.pom %{name}/reload4j.jar -f reload4j -a org.slf4j:%{name}-log4j12
for i in api ext jcl jdk14 reload4j nop simple; do
%add_maven_depmap org.slf4j:%{name}-${i}:jar:sources:%{version} %{name}/%{name}-${i}-sources.jar -f sources
done
%add_maven_depmap org.slf4j:%{name}-log4j12:jar:sources:%{version} %{name}/%{name}-reload4j-sources.jar -f sources
for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do
%add_maven_depmap org.slf4j:${i}:jar:sources:%{version} %{name}/${i}-sources.jar -f sources
done
@ -277,8 +283,8 @@ rm -rf target/site
%files jdk14 -f .mfiles-jdk14
%{_javadir}/%{name}/%{name}-jdk14.jar
%files log4j12 -f .mfiles-log4j12
%{_javadir}/%{name}/%{name}-log4j12.jar
%files reload4j -f .mfiles-reload4j
%{_javadir}/%{name}/%{name}-reload4j.jar
%files jcl -f .mfiles-jcl
%{_javadir}/%{name}/%{name}-jcl.jar