From 3e282b406e5049e9e5da0578b70ed2422ae1b376 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 15 Oct 2020 09:41:07 -0700 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/slf4j#85442e5588306c6437a1f1fe9ca434bbad3c3c90 --- .gitignore | 24 +++ slf4j.spec | 515 +++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 2 + 3 files changed, 541 insertions(+) create mode 100644 slf4j.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..e9c8d20 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,24 @@ +slf4j-1.5.8.tar.gz +slf4j-1.5.10.tar.gz +slf4j-1.5.11.tar.gz +slf4j-1.6.1.tar.gz +/slf4j-1.6.6.tar.gz +/slf4j-1.7.3.tar.gz +/LICENSE-2.0.txt +/slf4j-1.7.4.tar.gz +/slf4j-1.7.5.tar.gz +/slf4j-1.7.6.tar.gz +/slf4j-1.7.7.tar.gz +/slf4j-1.7.10.tar.gz +/slf4j-1.7.12.tar.gz +/slf4j-1.7.13.tar.gz +/slf4j-1.7.14.tar.gz +/slf4j-1.7.16.tar.gz +/slf4j-1.7.17.tar.gz +/slf4j-1.7.18.tar.gz +/slf4j-1.7.19.tar.gz +/slf4j-1.7.20.tar.gz +/slf4j-1.7.21.tar.gz +/slf4j-1.7.22.tar.gz +/slf4j-1.7.25.tar.gz +/v_1.7.30.tar.gz diff --git a/slf4j.spec b/slf4j.spec new file mode 100644 index 0000000..30a37c2 --- /dev/null +++ b/slf4j.spec @@ -0,0 +1,515 @@ +# Copyright (c) 2000-2009, JPackage Project +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the +# distribution. +# 3. Neither the name of the JPackage Project nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +Name: slf4j +Version: 1.7.30 +Release: 7%{?dist} +Epoch: 0 +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 ASL 2.0 +URL: http://www.slf4j.org/ +Source0: https://github.com/qos-ch/%{name}/archive/v_%{version}/v_%{version}.tar.gz +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +BuildArch: noarch + +BuildRequires: maven-local +BuildRequires: mvn(ch.qos.cal10n:cal10n-api) +BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: mvn(javassist:javassist) +BuildRequires: mvn(org.apache.commons:commons-lang3) +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) + +# -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 +to plug in the desired implementation at deployment time. SLF4J also +allows for a gradual migration path away from +Jakarta Commons Logging (JCL). + +Logging API implementations can either choose to implement the +SLF4J interfaces directly, e.g. NLOG4J or SimpleLogger. Alternatively, +it is possible (and rather easy) to write SLF4J adapters for the given +API implementation, e.g. Log4jLoggerAdapter or JDK14LoggerAdapter.. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +This package provides %{summary}. + +%package manual +Summary: Manual for %{name} + +%description manual +This package provides documentation for %{name}. + +%package jdk14 +Summary: SLF4J JDK14 Binding + +%description jdk14 +SLF4J JDK14 Binding. + +%package jcl +Summary: SLF4J JCL Binding + +%description jcl +SLF4J JCL Binding. + +%package ext +Summary: SLF4J Extensions Module + +%description ext +Extensions to the SLF4J API. + +%package -n jcl-over-slf4j +Summary: JCL 1.1.1 implemented over SLF4J + +%description -n jcl-over-slf4j +JCL 1.1.1 implemented over SLF4J. + +%package -n log4j-over-slf4j +Summary: Log4j implemented over SLF4J + +%description -n log4j-over-slf4j +Log4j implemented over SLF4J. + +%package -n jul-to-slf4j +Summary: JUL to SLF4J bridge + +%description -n jul-to-slf4j +JUL to SLF4J bridge. + +%package sources +Summary: SLF4J Source JARs + +%description sources +SLF4J Source JARs. + +%prep +%setup -q -n %{name}-v_%{version} +find -name '*.jar' -delete +cp -p %{SOURCE1} APACHE-LICENSE + +%pom_disable_module integration +%pom_disable_module osgi-over-slf4j +%pom_disable_module slf4j-android +%pom_disable_module slf4j-log4j12 +%pom_disable_module slf4j-migrator + +# Because of a non-ASCII comment in slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java +%pom_xpath_inject "pom:project/pom:properties" " + ISO-8859-1" + +%pom_xpath_set "pom:project/pom:properties/pom:required.jdk.version" "1.6" + +# Fix javadoc links +%pom_xpath_remove "pom:links" +%pom_xpath_inject "pom:plugin[pom:artifactId[text()='maven-javadoc-plugin']]/pom:configuration" " + false + false + /usr/share/javadoc/java" + +# dos2unix +find -name "*.css" -o -name "*.js" -o -name "*.txt" | \ + xargs -t sed -i 's/\r$//' + +# Remove wagon-ssh build extension +%pom_xpath_remove pom:extensions + +# Disable default-jar execution of maven-jar-plugin, which is causing +# problems with version 3.0.0 of the plugin. +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions" " + + default-jar + skip + " slf4j-api + +# trivial port to commons-lang3 +%pom_change_dep :commons-lang org.apache.commons:commons-lang3:3.8.1 slf4j-ext + +sed -i "s/org.apache.commons.lang./org.apache.commons.lang3./g" \ + slf4j-ext/src/main/java/org/slf4j/ext/MDCStrLookup.java + +# The general pattern is that the API package exports API classes and does +# not require impl classes. slf4j was breaking that causing "A cycle was +# detected when generating the classpath slf4j.api, slf4j.nop, slf4j.api." +# The API bundle requires impl package, so to avoid cyclic dependencies +# during build time, it is necessary to mark the imported package as an +# optional one. +# Reported upstream: http://bugzilla.slf4j.org/show_bug.cgi?id=283 +sed -i '/Import-Package/s/\}$/};resolution:=optional/' slf4j-api/src/main/resources/META-INF/MANIFEST.MF + +# Source JARs for are required by Maven 3.4.0 +%mvn_package :::sources: sources + +%mvn_package :%{name}-parent __noinstall +%mvn_package :%{name}-site __noinstall +%mvn_package :%{name}-api +%mvn_package :%{name}-simple +%mvn_package :%{name}-nop + +%build +%mvn_build -f -s -- -Dsource=1.6 + +%install +# Compat symlinks +%mvn_file ':%{name}-{*}' %{name}/%{name}-@1 %{name}/@1 + +%mvn_install + +# manual +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 +%license LICENSE.txt APACHE-LICENSE + +%files jdk14 -f .mfiles-%{name}-jdk14 +%files jcl -f .mfiles-%{name}-jcl +%files ext -f .mfiles-%{name}-ext +%files -n jcl-over-slf4j -f .mfiles-jcl-over-slf4j +%files -n log4j-over-slf4j -f .mfiles-log4j-over-slf4j +%files -n jul-to-slf4j -f .mfiles-jul-to-slf4j + +%files sources -f .mfiles-sources +%license LICENSE.txt APACHE-LICENSE + +%files javadoc -f .mfiles-javadoc +%license LICENSE.txt APACHE-LICENSE + +%files manual +%license LICENSE.txt APACHE-LICENSE +%{_defaultdocdir}/%{name}-manual + +%changelog +* Wed Sep 09 2020 Fabio Valentini - 0:1.7.30-7 +- Disable unused log4j12 module. + +* Thu Jul 30 2020 Fabio Valentini - 0:1.7.30-6 +- Port to commons-lang3. + +* Wed Jul 29 2020 Fedora Release Engineering - 0:1.7.30-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 0:1.7.30-4 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu Jun 25 2020 Roland Grunberg - 0:1.7.30-3 +- Use source/target of 1.6 to build against Java 11. +- Set javadoc plugin source value to 1.6. + +* Fri Mar 20 2020 Mat Booth - 0:1.7.30-2 +- Fix broken OSGi metadata + +* Wed Feb 05 2020 Dinesh Prasanth M K - 0:1.7.30-1 +- Update to upstream version 1.7.30 + +* Thu Jan 30 2020 Fedora Release Engineering - 0:1.7.25-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jul 26 2019 Fedora Release Engineering - 0:1.7.25-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu May 09 2019 Dinesh Prasanth M K - 0:1.7.25-7 +- Rebuilt for Fedora 31 + +* Sat Feb 02 2019 Fedora Release Engineering - 0:1.7.25-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0:1.7.25-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Mar 19 2018 Michael Simacek - 0:1.7.25-4 +- Disallow EventData deserialization by default (CVE-2018-8088) +- Resolves rhbz#1549928 + +* Fri Feb 09 2018 Fedora Release Engineering - 0:1.7.25-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0:1.7.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Mar 28 2017 Mikolaj Izdebski - 0:1.7.25-1 +- Update to upstream version 1.7.25 + +* Wed Feb 22 2017 Michael Simacek - 0:1.7.22-4 +- Avoid absolute paths + +* Thu Feb 16 2017 Michael Simacek - 0:1.7.22-3 +- Avoid literal carriage return +- Remove Group tag + +* Sat Feb 11 2017 Fedora Release Engineering - 0:1.7.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Dec 14 2016 Michael Simacek - 0:1.7.22-1 +- Update to upstream version 1.7.22 + +* Fri Nov 18 2016 Mikolaj Izdebski - 0:1.7.21-4 +- Install source JARs in separate package + +* Mon Oct 3 2016 Mikolaj Izdebski - 0:1.7.21-3 +- Remove build-requires on perl + +* Tue May 31 2016 Mikolaj Izdebski - 0:1.7.21-2 +- Fix build issue with maven-jar-plugin 3.0.0 + +* Wed Apr 6 2016 Mikolaj Izdebski - 0:1.7.21-1 +- Update to upstream version 1.7.21 + +* Wed Mar 30 2016 Mikolaj Izdebski - 0:1.7.20-1 +- Update to upstream version 1.7.20 + +* Thu Mar 24 2016 Mikolaj Izdebski - 0:1.7.19-1 +- Update to upstream version 1.7.19 + +* Mon Feb 29 2016 Mikolaj Izdebski - 0:1.7.18-1 +- Update to upstream version 1.7.18 + +* Mon Feb 22 2016 Mikolaj Izdebski - 0:1.7.17-1 +- Update to upstream version 1.7.17 + +* Tue Feb 16 2016 Mikolaj Izdebski - 0:1.7.16-1 +- Update to upstream version 1.7.16 + +* Fri Feb 05 2016 Fedora Release Engineering - 0:1.7.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jan 25 2016 Mikolaj Izdebski - 0:1.7.14-1 +- Update to upstream version 1.7.14 + +* Thu Nov 12 2015 Mikolaj Izdebski - 0:1.7.13-1 +- Update to upstream version 1.7.13 + +* Mon Aug 03 2015 Michael Simacek - 0:1.7.12-3 +- List manual files in %%files section + +* Fri Jun 19 2015 Fedora Release Engineering - 0:1.7.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 14 2015 Mikolaj Izdebski - 0:1.7.12-1 +- Update to upstream version 1.7.12 + +* Mon Jan 19 2015 Mikolaj Izdebski - 0:1.7.10-1 +- Update to upstream version 1.7.10 + +* Fri Oct 24 2014 Mikolaj Izdebski - 0:1.7.7-3 +- Remove workaround for MSHARED-325 + +* Sun Jun 08 2014 Fedora Release Engineering - 0:1.7.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Apr 14 2014 Mikolaj Izdebski - 0:1.7.7-1 +- Update to upstream version 1.7.7 + +* Thu Mar 20 2014 Mikolaj Izdebski - 0:1.7.6-5 +- Disable filtering of bundled JavaScript binaries +- Resolves: rhbz#1078536 + +* Fri Mar 07 2014 Michael Simacek - 0:1.7.6-4 +- Merge api, simple and nop back into main package +- Remove parent, migrator and site subpackages + +* Fri Mar 07 2014 Michael Simacek - 0:1.7.6-3 +- Split into subpackages + +* Thu Mar 6 2014 Mikolaj Izdebski - 0:1.7.6-2 +- Remove wagon-ssh build extension +- Disable slf4j-android module + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0:1.7.6-2 +- Use Requires: java-headless rebuild (#1067528) + +* Thu Feb 6 2014 Mikolaj Izdebski - 0:1.7.6-1 +- Update to upstream version 1.7.6 + +* Tue Aug 06 2013 Stanislav Ochotnicky - 0:1.7.5-3 +- Install manual to versionless docdir (#993551) + +* Sun Aug 04 2013 Fedora Release Engineering - 0:1.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Apr 5 2013 Mikolaj Izdebski - 0:1.7.5-1 +- Update to upstream version 1.7.5 + +* Wed Mar 20 2013 Mikolaj Izdebski - 0:1.7.4-1 +- Update to upstream version 1.7.4 + +* Fri Mar 15 2013 Mikolaj Izdebski - 0:1.7.3-1 +- Update to upstream version 1.7.3 + +* Fri Feb 15 2013 Fedora Release Engineering - 0:1.7.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 0:1.7.2-8 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Jan 9 2013 Mikolaj Izdebski - 0:1.7.2-7 +- Fix install location of manual + +* Tue Jan 8 2013 Mikolaj Izdebski - 0:1.7.2-6 +- Rebuild to generate maven provides + +* Fri Nov 30 2012 Mikolaj Izdebski - 0:1.7.2-5 +- Build with xmvn + +* Wed Nov 21 2012 Mikolaj Izdebski - 0:1.7.2-4 +- Install Apache license file +- Resolves: rhbz#878996 + +* Thu Nov 15 2012 Mikolaj Izdebski - 0:1.7.2-3 +- Avoid cyclic OSGi dependencies + +* Thu Nov 08 2012 Stanislav Ochotnicky - 0:1.7.2-2 +- Fix license to ASL 2.0 and MIT +- Update to add_maven_depmap macro +- Use generated .mfiles list +- Small packaging cleanups + +* Mon Oct 15 2012 Mikolaj Izdebski - 0:1.7.2-1 +- Update to upstream version 1.7.2 + +* Mon Sep 17 2012 Mikolaj Izdebski - 0:1.7.1-1 +- Update to upstream version 1.7.1 + +* Mon Sep 10 2012 Mikolaj Izdebski - 0:1.7.0-1 +- Update to upstream version 1.7.0 + +* Sat Jul 21 2012 Fedora Release Engineering - 0:1.6.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 11 2012 Mikolaj Izdebski - 0:1.6.6-1 +- Update to upstream version 1.6.6 +- Convert patches to POM macros + +* Fri Jan 13 2012 Ville Skyttä - 0:1.6.1-5 +- Crosslink with local JDK API docs. + +* Fri Jan 13 2012 Ville Skyttä - 0:1.6.1-4 +- Specify explicit source encoding to fix build with Java 1.7. +- Remove no longer needed javadoc dir upgrade hack. + +* Wed Jun 8 2011 Alexander Kurtakov 0:1.6.1-3 +- Build with maven 3.x. + +* Wed Feb 09 2011 Fedora Release Engineering - 0:1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jan 25 2011 Alexander Kurtakov 0:1.6.1-1 +- Update to new upstream version. +- Various guidelines fixes. + +* Wed Sep 8 2010 Alexander Kurtakov 0:1.5.11-3 +- Add maven-site-pugin BR. +- Use new package names. + +* Wed Sep 8 2010 Alexander Kurtakov 0:1.5.11-2 +- Skip installing tests jar that is no longer produced. +- Use javadoc aggregate. +- Use mavenpomdir macro. + +* Thu Feb 25 2010 Alexander Kurtakov 0:1.5.11-1 +- Update to 1.5.11. +- Drop depmap and component info files. + +* Wed Feb 10 2010 Mary Ellen Foster 0:1.5.10-5 +- Require cal10n + +* Wed Feb 10 2010 Alexander Kurtakov 0:1.5.10-4 +- Fix javadoc files. + +* Wed Feb 10 2010 Alexander Kurtakov 0:1.5.10-3 +- BR maven-plugin-build-helper. + +* Wed Feb 10 2010 Alexander Kurtakov 0:1.5.10-2 +- BR cal10n. + +* Wed Feb 10 2010 Alexander Kurtakov 0:1.5.10-1 +- Update to upstream 1.5.10. + +* Fri Sep 4 2009 Alexander Kurtakov 0:1.5.8-5 +- Skip tests. + +* Wed Sep 2 2009 Alexander Kurtakov 0:1.5.8-4 +- Fix other line lenghts. + +* Wed Sep 2 2009 Alexander Kurtakov 0:1.5.8-3 +- Fix permissions. +- Fixed descriptions. +- Fix file lengths. + +* Wed Sep 2 2009 Alexander Kurtakov 0:1.5.8-2 +- Adapt for Fedora. + +* Wed Jul 29 2009 Yong Yang 0:1.5.8-1 +- 1.5.8 +- Replace slf4j-1.5.6-integration-tests-current-only.patch with + slf4j-1.5.8-skip-integration-tests.patch because of the failure of "testMatch" + +* Fri Jun 12 2009 Ralph Apel 0:1.5.6-2 +- Add -ext jar, depmap and pom +- Save jcl104-over-slf4j as symlink + +* Tue Feb 18 2009 David Walluck 0:1.5.6-1 +- 1.5.6 +- add repolib +- fix file eol +- fix Release tag + +* Fri Jul 18 2008 David Walluck 0:1.5.2-2 +- use excalibur for avalon +- remove javadoc scriptlets +- GCJ fixes +- fix maven directory ownership +- fix -bc --short-circuit by moving some of %%build to %%prep + +* Sun Jul 06 2008 Ralph Apel 0:1.5.2-1.jpp5 +- 1.5.2 + +* Mon Feb 04 2008 Ralph Apel 0:1.4.2-2jpp +- Fix macro misprint +- Add maven2-plugin BRs + +* Wed Jul 18 2007 Ralph Apel 0:1.4.2-1jpp +- Upgrade to 1.4.2 +- Build with maven2 +- Add poms and depmap frags +- Add gcj_support option + +* Mon Jan 30 2006 Ralph Apel 0:1.0-0.rc5.1jpp +- First JPackage release. diff --git a/sources b/sources new file mode 100644 index 0000000..338a7a0 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 +SHA512 (v_1.7.30.tar.gz) = 4f05c996532560b16f22d78fcd47f8c4ba14691ce218a51ee6d50b283a51f8e40475a3a47f1117c1898a7be922e3f85806c4a7eb526759f0e7ea8426b5c6035f