.gitignore

@@ -1 +1 @@
-SOURCES/v_1.7.32.tar.gz
+SOURCES/v_1.7.30.tar.gz

.slf4j.metadata

@@ -1 +1 @@
-f5e93dd752d58f2801c504a21e51a79bb8d8599c SOURCES/v_1.7.32.tar.gz
+99d103004692d3ced37c2afdec97b5bdf0c276bd SOURCES/v_1.7.30.tar.gz

SPECS/slf4j.spec

@@ -31,28 +31,30 @@
 #
 
 Name:           slf4j
-Version:        1.7.32
-Release:        13%{?dist}
+Version:        1.7.30
+Release:        14%{?dist}
 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
+License:        MIT and ASL 2.0
 URL:            http://www.slf4j.org/
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 Source0:        https://github.com/qos-ch/slf4j/archive/v_%{version}.tar.gz
 Source1:        https://www.apache.org/licenses/LICENSE-2.0.txt
 
+BuildRequires:  maven-local-openjdk8
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local
 BuildRequires:  mvn(commons-logging:commons-logging)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 %endif
 
+# -log4j12 subpackage removed in fedora 34
+Obsoletes:      slf4j-log4j12 < 0:1.7.30-7
+
 %description
 The Simple Logging Facade for Java or (SLF4J) is intended to serve
 as a simple facade for various logging APIs allowing to the end-user
@@ -97,18 +99,6 @@ Summary:        JUL to SLF4J bridge
 %description -n jul-to-slf4j
 JUL to SLF4J bridge.
 
-%package -n log4j-over-slf4j
-Summary:        Log4j implemented over SLF4J
-
-%description -n log4j-over-slf4j
-Log4j implemented over SLF4J.
-
-%package -n slf4j-migrator
-Summary:        SLF4J Migrator
-
-%description -n slf4j-migrator
-SLF4J Migrator.
-
 %package sources
 Summary:        SLF4J Source JARs
 
@@ -122,9 +112,11 @@ install -p -m 0644 %{SOURCE1} APACHE-LICENSE
 
 %pom_disable_module integration
 %pom_disable_module osgi-over-slf4j
+%pom_disable_module log4j-over-slf4j
 %pom_disable_module slf4j-android
 %pom_disable_module slf4j-ext
 %pom_disable_module slf4j-log4j12
+%pom_disable_module slf4j-migrator
 
 # Port to maven-antrun-plugin 3.0.0
 sed -i s/tasks/target/ slf4j-api/pom.xml
@@ -174,7 +166,7 @@ sed -i '/Import-Package/s/\}$/};resolution:=optional/' slf4j-api/src/main/resour
 %mvn_package :%{name}-nop
 
 %build
-%mvn_build -f -s -- -Drequired.jdk.version=1.8
+%mvn_build -f -s -- -Drequired.jdk.version=1.6
 
 %install
 # Compat symlinks
@@ -187,15 +179,13 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 rm -rf target/site/{.htaccess,apidocs}
 cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 
-%files -f .mfiles
+%files -n %{?module_prefix}%{name} -f .mfiles
 %license LICENSE.txt APACHE-LICENSE
 
 %files jdk14 -f .mfiles-%{name}-jdk14
 %files jcl -f .mfiles-%{name}-jcl
 %files -n jcl-over-slf4j -f .mfiles-jcl-over-slf4j
 %files -n jul-to-slf4j -f .mfiles-jul-to-slf4j
-%files -n log4j-over-slf4j -f .mfiles-log4j-over-slf4j
-%files -n slf4j-migrator -f .mfiles-slf4j-migrator
 
 %files sources -f .mfiles-sources
 %license LICENSE.txt APACHE-LICENSE
@@ -205,51 +195,21 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual
 %{_defaultdocdir}/%{name}-manual
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.7.32-13
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1.7.32-12
-- Bump release for Aug 2024 java mass rebuild
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.7.32-11
-- Bump release for June 2024 mass rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.32-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.32-9
-- Rebuild to regenerate auto-Requires on java
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.32-8
-- Convert License tag to SPDX format
-
-* Tue Aug 15 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.32-7
-- Build with default JDK 17
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.32-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.32-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.32-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.7.32-3
-- Rebuilt for java-17-openjdk as system jdk
+* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1.7.30-14
+- Rebuild with regenerated Requires on Java
 
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.32-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.30-13
+- Rebuild to regenerate auto-requires
 
-* Mon Nov 22 2021 Simon Legner <Simon.Legner@gmail.com> - 1.7.32-1
-- Update to upstream version 1.7.32
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.7.30-12
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Tue Nov 16 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.7.30-11
-- Enable slf4j-migrator and log4j-over-slf4j modules
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.30-11
+- Rebuild to workaround DistroBaker issue
 
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.30-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.30-10
+- Bootstrap Maven for CentOS Stream 9
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7.30-9
 - Bootstrap build