From ec150a26a6186fdd94252607786bdb96df768ac9 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 00:12:30 +0100 Subject: [PATCH] update to 1.7.36 [release 1.7.36-1mamba;Wed Aug 10 2022] --- LICENSE.txt | 24 + README.md | 11 +- java-slf4j-1.5.8-integration-build_xml.patch | 43 -- ...4j-1.5.8-integration-maven-build_xml.patch | 20 - ...1.5.8-jcl-over-slf4j-maven-build_xml.patch | 11 - ...j-1.5.8-jul-to-slf4j-maven-build_xml.patch | 11 - ...lf4j-1.5.8-slf4j-api-maven-build_xml.patch | 11 - java-slf4j-1.5.8-slf4j-api-testjar.patch | 14 - ...lf4j-1.5.8-slf4j-ext-maven-build_xml.patch | 11 - ...lf4j-1.5.8-slf4j-jcl-maven-build_xml.patch | 11 - ...4j-1.5.8-slf4j-jdk14-maven-build_xml.patch | 11 - ...-1.5.8-slf4j-log4j12-maven-build_xml.patch | 11 - ...lf4j-1.5.8-slf4j-nop-maven-build_xml.patch | 11 - ...j-1.5.8-slf4j-simple-maven-build_xml.patch | 11 - java-slf4j.spec | 476 ++---------------- maven2-2.2.0-settings.xml | 245 --------- 16 files changed, 79 insertions(+), 853 deletions(-) create mode 100644 LICENSE.txt delete mode 100644 java-slf4j-1.5.8-integration-build_xml.patch delete mode 100644 java-slf4j-1.5.8-integration-maven-build_xml.patch delete mode 100644 java-slf4j-1.5.8-jcl-over-slf4j-maven-build_xml.patch delete mode 100644 java-slf4j-1.5.8-jul-to-slf4j-maven-build_xml.patch delete mode 100644 java-slf4j-1.5.8-slf4j-api-maven-build_xml.patch delete mode 100644 java-slf4j-1.5.8-slf4j-api-testjar.patch delete mode 100644 java-slf4j-1.5.8-slf4j-ext-maven-build_xml.patch delete mode 100644 java-slf4j-1.5.8-slf4j-jcl-maven-build_xml.patch delete mode 100644 java-slf4j-1.5.8-slf4j-jdk14-maven-build_xml.patch delete mode 100644 java-slf4j-1.5.8-slf4j-log4j12-maven-build_xml.patch delete mode 100644 java-slf4j-1.5.8-slf4j-nop-maven-build_xml.patch delete mode 100644 java-slf4j-1.5.8-slf4j-simple-maven-build_xml.patch delete mode 100644 maven2-2.2.0-settings.xml diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..1a3d053 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,24 @@ +Copyright (c) 2004-2022 QOS.ch Sarl (Switzerland) +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + + + diff --git a/README.md b/README.md index 3755112..7cc0706 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,5 @@ # java-slf4j -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. +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. diff --git a/java-slf4j-1.5.8-integration-build_xml.patch b/java-slf4j-1.5.8-integration-build_xml.patch deleted file mode 100644 index aa051ca..0000000 --- a/java-slf4j-1.5.8-integration-build_xml.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- slf4j-1.5.8/integration/build.xml 2009-06-09 21:51:55.000000000 +0200 -+++ slf4j-1.5.8/integration/build.xml-gil 2009-06-23 19:58:36.000000000 +0200 -@@ -61,7 +61,7 @@ - - - -- -+ - - - -@@ -69,7 +69,7 @@ - - - -- -+ - - - -@@ -77,7 +77,7 @@ - - - -- -+ - - - -@@ -85,10 +85,10 @@ - - - -- -+ - - - - - -- -\ No newline at end of file -+ diff --git a/java-slf4j-1.5.8-integration-maven-build_xml.patch b/java-slf4j-1.5.8-integration-maven-build_xml.patch deleted file mode 100644 index 8f7d333..0000000 --- a/java-slf4j-1.5.8-integration-maven-build_xml.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- integration/maven-build.xml 2010-01-19 14:44:35.000000000 +0100 -+++ integration/maven-build.xml-gil 2010-01-19 22:07:47.000000000 +0100 -@@ -67,7 +67,7 @@ - - - -- -+ - - - -- -+ - - - diff --git a/java-slf4j-1.5.8-jcl-over-slf4j-maven-build_xml.patch b/java-slf4j-1.5.8-jcl-over-slf4j-maven-build_xml.patch deleted file mode 100644 index 3339ccb..0000000 --- a/java-slf4j-1.5.8-jcl-over-slf4j-maven-build_xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- jcl-over-slf4j/maven-build.xml 2010-01-19 14:44:28.000000000 +0100 -+++ jcl-over-slf4j/maven-build.xml-gil 2010-01-19 21:48:05.000000000 +0100 -@@ -126,7 +126,7 @@ - unless="junit.skipped" - description="Run the test cases"> - -- -+ - - - diff --git a/java-slf4j-1.5.8-jul-to-slf4j-maven-build_xml.patch b/java-slf4j-1.5.8-jul-to-slf4j-maven-build_xml.patch deleted file mode 100644 index ed744aa..0000000 --- a/java-slf4j-1.5.8-jul-to-slf4j-maven-build_xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- jul-to-slf4j/maven-build.xml 2010-01-19 14:44:32.000000000 +0100 -+++ jul-to-slf4j/maven-build.xml-gil 2010-01-19 21:52:41.000000000 +0100 -@@ -127,7 +127,7 @@ - unless="junit.skipped" - description="Run the test cases"> - -- -+ - - - diff --git a/java-slf4j-1.5.8-slf4j-api-maven-build_xml.patch b/java-slf4j-1.5.8-slf4j-api-maven-build_xml.patch deleted file mode 100644 index 5ae3106..0000000 --- a/java-slf4j-1.5.8-slf4j-api-maven-build_xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- slf4j-api/maven-build.xml 2010-01-19 14:43:13.000000000 +0100 -+++ slf4j-api/maven-build.xml-gil 2010-01-19 20:02:14.000000000 +0100 -@@ -122,7 +122,7 @@ - unless="junit.skipped" - description="Run the test cases"> - -- -+ - - - diff --git a/java-slf4j-1.5.8-slf4j-api-testjar.patch b/java-slf4j-1.5.8-slf4j-api-testjar.patch deleted file mode 100644 index b87bd72..0000000 --- a/java-slf4j-1.5.8-slf4j-api-testjar.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- slf4j-api/maven-build.xml 2010-01-20 09:38:07.000000000 +0100 -+++ slf4j-api/maven-build.xml-gil 2010-01-20 09:37:43.000000000 +0100 -@@ -223,6 +223,11 @@ - manifest="/usr/src/RPM/BUILD/slf4j-1.5.8/slf4j-api/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"/> -+ - - - diff --git a/java-slf4j-1.5.8-slf4j-ext-maven-build_xml.patch b/java-slf4j-1.5.8-slf4j-ext-maven-build_xml.patch deleted file mode 100644 index 3b8b500..0000000 --- a/java-slf4j-1.5.8-slf4j-ext-maven-build_xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- slf4j-ext/maven-build.xml 2010-01-19 14:44:25.000000000 +0100 -+++ slf4j-ext/maven-build.xml-gil 2010-01-19 21:44:17.000000000 +0100 -@@ -134,7 +134,7 @@ - unless="junit.skipped" - description="Run the test cases"> - -- -+ - - - diff --git a/java-slf4j-1.5.8-slf4j-jcl-maven-build_xml.patch b/java-slf4j-1.5.8-slf4j-jcl-maven-build_xml.patch deleted file mode 100644 index 39e10c8..0000000 --- a/java-slf4j-1.5.8-slf4j-jcl-maven-build_xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- slf4j-jcl/maven-build.xml 2010-01-19 14:44:23.000000000 +0100 -+++ slf4j-jcl/maven-build.xml-gil 2010-01-19 21:40:59.000000000 +0100 -@@ -127,7 +127,7 @@ - unless="junit.skipped" - description="Run the test cases"> - -- -+ - - - diff --git a/java-slf4j-1.5.8-slf4j-jdk14-maven-build_xml.patch b/java-slf4j-1.5.8-slf4j-jdk14-maven-build_xml.patch deleted file mode 100644 index 39ed81f..0000000 --- a/java-slf4j-1.5.8-slf4j-jdk14-maven-build_xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- slf4j-jdk14/maven-build.xml 2010-01-19 14:44:20.000000000 +0100 -+++ slf4j-jdk14/maven-build.xml-gil 2010-01-19 20:34:32.000000000 +0100 -@@ -126,7 +126,7 @@ - unless="junit.skipped" - description="Run the test cases"> - -- -+ - - - diff --git a/java-slf4j-1.5.8-slf4j-log4j12-maven-build_xml.patch b/java-slf4j-1.5.8-slf4j-log4j12-maven-build_xml.patch deleted file mode 100644 index cbc13f6..0000000 --- a/java-slf4j-1.5.8-slf4j-log4j12-maven-build_xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- slf4j-log4j12/maven-build.xml 2010-01-19 14:44:22.000000000 +0100 -+++ slf4j-log4j12/maven-build.xml-gil 2010-01-19 20:43:39.000000000 +0100 -@@ -130,7 +130,7 @@ - unless="junit.skipped" - description="Run the test cases"> - -- -+ - - - diff --git a/java-slf4j-1.5.8-slf4j-nop-maven-build_xml.patch b/java-slf4j-1.5.8-slf4j-nop-maven-build_xml.patch deleted file mode 100644 index af1bb83..0000000 --- a/java-slf4j-1.5.8-slf4j-nop-maven-build_xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- slf4j-nop/maven-build.xml 2010-01-19 14:44:18.000000000 +0100 -+++ slf4j-nop/maven-build.xml-gil 2010-01-19 20:30:19.000000000 +0100 -@@ -125,7 +125,7 @@ - unless="junit.skipped" - description="Run the test cases"> - -- -+ - - - diff --git a/java-slf4j-1.5.8-slf4j-simple-maven-build_xml.patch b/java-slf4j-1.5.8-slf4j-simple-maven-build_xml.patch deleted file mode 100644 index 2010239..0000000 --- a/java-slf4j-1.5.8-slf4j-simple-maven-build_xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- slf4j-simple/maven-build.xml 2010-01-19 14:44:16.000000000 +0100 -+++ slf4j-simple/maven-build.xml-gil 2010-01-19 20:20:44.000000000 +0100 -@@ -125,7 +125,7 @@ - unless="junit.skipped" - description="Run the test cases"> - -- -+ - - - diff --git a/java-slf4j.spec b/java-slf4j.spec index 96634ee..ba8ae44 100644 --- a/java-slf4j.spec +++ b/java-slf4j.spec @@ -1,359 +1,72 @@ -%define maven 0 Name: java-slf4j -Version: 1.5.8 -Release: 3mamba +Version: 1.7.36 +Release: 1mamba Summary: Simple Logging Facade for Java (SLF4J) Group: Development/Libraries/Java Vendor: openmamba Distribution: openmamba -Packager: gil -URL: http://www.slf4j.org/ -Source0: http://www.slf4j.org/dist/slf4j-%{version}.tar.gz -Source1: maven2-2.2.0-settings.xml -Source2: java-slf4j-1.5.8-auto-generated-files.tar.gz -Patch0: java-slf4j-1.5.8-integration-build_xml.patch -Patch1: java-slf4j-1.5.8-slf4j-api-maven-build_xml.patch -Patch2: java-slf4j-1.5.8-slf4j-simple-maven-build_xml.patch -Patch3: java-slf4j-1.5.8-slf4j-nop-maven-build_xml.patch -Patch4: java-slf4j-1.5.8-slf4j-jdk14-maven-build_xml.patch -Patch5: java-slf4j-1.5.8-slf4j-log4j12-maven-build_xml.patch -Patch6: java-slf4j-1.5.8-slf4j-jcl-maven-build_xml.patch -Patch7: java-slf4j-1.5.8-slf4j-ext-maven-build_xml.patch -Patch8: java-slf4j-1.5.8-jcl-over-slf4j-maven-build_xml.patch -Patch9: java-slf4j-1.5.8-jul-to-slf4j-maven-build_xml.patch -Patch10: java-slf4j-1.5.8-integration-maven-build_xml.patch -Patch11: java-slf4j-1.5.8-slf4j-api-testjar.patch +Packager: Silvan Calarco +URL: https://www.slf4j.org/ +Source0: https://repo1.maven.org/maven2/org/slf4j/jcl-over-slf4j/%{version}/jcl-over-slf4j-%{version}.jar +Source1: https://repo1.maven.org/maven2/org/slf4j/jul-to-slf4j/%{version}/jul-to-slf4j-%{version}.jar +Source2: https://repo1.maven.org/maven2/org/slf4j/log4j-over-slf4j/%{version}/log4j-over-slf4j-%{version}.jar +Source3: https://repo1.maven.org/maven2/org/slf4j/slf4j-api/%{version}/slf4j-api-%{version}.jar +Source4: https://repo1.maven.org/maven2/org/slf4j/slf4j-ext/%{version}/slf4j-ext-%{version}.jar +Source5: https://repo1.maven.org/maven2/org/slf4j/slf4j-jcl/%{version}/slf4j-jcl-%{version}.jar +Source6: https://repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/%{version}/slf4j-jdk14-%{version}.jar +Source7: https://repo1.maven.org/maven2/org/slf4j/slf4j-reload4j/%{version}/slf4j-reload4j-%{version}.jar +Source8: https://repo1.maven.org/maven2/org/slf4j/slf4j-migrator/%{version}/slf4j-migrator-%{version}.jar +Source9: https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/%{version}/slf4j-nop-%{version}.jar +Source10: https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/%{version}/slf4j-simple-%{version}.jar +Source11: https://raw.githubusercontent.com/qos-ch/slf4j/v_%{version}/LICENSE.txt License: Apache Software License 2.0, GPL, MIT, X11 -BuildRequires: apache-ant -BuildRequires: apache-ant-junit -BuildRequires: apache-log4j -%if %maven -BuildRequires: apache-maven -BuildRequires: apache-maven-plugin-antrun -BuildRequires: apache-maven-plugin-compiler -BuildRequires: apache-maven-plugin-install -BuildRequires: apache-maven-plugin-jar -BuildRequires: apache-maven-plugin-javadoc -BuildRequires: apache-maven-plugin-resources -BuildRequires: apache-maven-plugin-source -BuildRequires: maven-surefire-plugin -%endif -BuildRequires: jakarta-commons-logging -BuildRequires: jakarta-commons-lang24 -BuildRequires: java-excalibur-avalon-framework420 -BuildRequires: java-junit3 -BuildRequires: java-junit381 -BuildRequires: javassist -BuildRequires: jpackage-utils -Requires: jpackage-utils -BuildRoot: %{_tmppath}/%{name}-%{version}-root +## AUTOBUILDREQ-BEGIN +## AUTOBUILDREQ-END +BuildRequires: javapackages +Requires: javapackages %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 -Group: Documentation -Summary: Javadoc for %{name} - -%description javadoc -Simple Logging Facade for Java (SLF4J) - -This package contains javadoc for %{name} - -%if %maven -%package manual -Group: Documentation -Summary: Documents for %{name} - -%description manual -Simple Logging Facade for Java (SLF4J) - -This package contains documents for %{name} -%endif +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. %prep - -%setup -q -n slf4j-%{version} - -for j in $(find . -name "*.jar"); do - mv $j ${j}.no -done -%patch0 -p1 - -%if %maven - export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository - cp %{S:1} settings.xml - - mkdir -p .m2/repository/JPP/maven2 - - sed -i -e "s|__INTERNAL_REPO_PLACEHOLDER__|file://`pwd`/external_repo|g" settings.xml - sed -i -e "s|__EXTERNAL_REPO_PLACEHOLDER__|file://`pwd`/.m2/repository|g" settings.xml - - mkdir external_repo - ln -s %{_javadir} external_repo/JPP - - - mkdir -p $MAVEN_REPO_LOCAL/org.slf4j - ln -sf $(build-classpath maven2/empty-dep) $MAVEN_REPO_LOCAL/org.slf4j/slf4j-api.jar - ln -sf $(build-classpath maven2/empty-dep) $MAVEN_REPO_LOCAL/org.slf4j/slf4j-simple.jar - ln -sf $(build-classpath maven2/empty-dep) $MAVEN_REPO_LOCAL/org.slf4j/slf4j-log4j12.jar - -%else - tar -xf %{SOURCE2} -%patch1 -%patch2 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 -%patch8 -%patch9 -%patch10 -%patch11 - -%endif +%setup -q -c +cp %{SOURCE11} LICENSE.txt %build -export JAVA_HOME=/usr/lib/jvm/jdk-sun -export MAVEN_REPO_LOCAL=$PWD/.m2/repository - -mkdir -p $MAVEN_REPO_LOCAL/junit/junit/3.8.1 -ln -sf $(build-classpath junit381) $MAVEN_REPO_LOCAL/junit/junit/3.8.1/junit-3.8.1.jar -mkdir -p $MAVEN_REPO_LOCAL/log4j/log4j/1.2.14 -ln -sf $(build-classpath log4j) $MAVEN_REPO_LOCAL/log4j/log4j/1.2.14/log4j-1.2.14.jar -mkdir -p $MAVEN_REPO_LOCAL/commons-logging/commons-logging/1.1.1 -ln -sf $(build-classpath commons-logging) $MAVEN_REPO_LOCAL/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar -mkdir -p $MAVEN_REPO_LOCAL/commons-lang/commons-lang/2.4 -ln -sf $(build-classpath commons-lang24) $MAVEN_REPO_LOCAL/commons-lang/commons-lang/2.4/commons-lang-2.4.jar -mkdir -p $MAVEN_REPO_LOCAL/javassist/javassist/3.4.GA -ln -sf $(build-classpath javassist) $MAVEN_REPO_LOCAL/javassist/javassist/3.4.GA/javassist-3.4.GA.jar -mkdir -p $MAVEN_REPO_LOCAL/ant/ant-junit/1.6.5 -ln -sf $(build-classpath ant/ant-junit) $MAVEN_REPO_LOCAL/ant/ant-junit/1.6.5/ant-junit-1.6.5.jar - -%if %maven - export MAVEN_SETTINGS=$PWD/settings.xml - mvn-jpp \ - -e \ - -s $MAVEN_SETTINGS \ - -Dmaven.test.failure.ignore=true \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - ant:ant install javadoc:javadoc -%else - pushd slf4j-api - mkdir -p target/test-classes/ - cp -pr src/main/resources/META-INF target/test-classes/ - export CLASSPATH="" - CLASSPATH=$CLASSPATH:$(build-classpath avalon-framework420 commons-logging) - CLASSPATH=$CLASSPATH:$(build-classpath log4j junit-3.8.2):target/classes:target/test-classes - ant \ - -Duser.home=$PWD \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.settings.offline=true \ - -Dmaven.settings.interactiveMode=false \ - jar javadoc - mkdir -p $MAVEN_REPO_LOCAL/org/slf4j/slf4j-api/%{version} - cp target/slf4j-api-%{version}.jar $MAVEN_REPO_LOCAL/org/slf4j/slf4j-api/%{version}/ - cp target/slf4j-api-%{version}-tests.jar $MAVEN_REPO_LOCAL/org/slf4j/slf4j-api/%{version}/ - popd - pushd slf4j-simple - export CLASSPATH="" - CLASSPATH=$CLASSPATH:../slf4j-api/target/slf4j-api-%{version}.jar - CLASSPATH=$CLASSPATH:$(build-classpath avalon-framework420 commons-logging) - CLASSPATH=$CLASSPATH:$(build-classpath log4j junit-3.8.2):target/classes:target/test-classes - ant \ - -Duser.home=$PWD \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.settings.offline=true \ - -Dmaven.settings.interactiveMode=false \ - jar javadoc - popd - pushd slf4j-nop - export CLASSPATH="" - CLASSPATH=$CLASSPATH:../slf4j-api/target/slf4j-api-%{version}.jar - CLASSPATH=$CLASSPATH:$(build-classpath avalon-framework420 commons-logging) - CLASSPATH=$CLASSPATH:$(build-classpath log4j junit-3.8.2):target/classes:target/test-classes - ant \ - -Duser.home=$PWD \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.settings.offline=true \ - -Dmaven.settings.interactiveMode=false \ - jar javadoc - popd - pushd slf4j-jdk14 - export CLASSPATH="" - CLASSPATH=$CLASSPATH:../slf4j-api/target/slf4j-api-%{version}.jar - CLASSPATH=$CLASSPATH:../slf4j-api/target/slf4j-api-%{version}-tests.jar - CLASSPATH=$CLASSPATH:$(build-classpath avalon-framework420 commons-logging) - CLASSPATH=$CLASSPATH:$(build-classpath log4j junit-3.8.2):target/classes:target/test-classes - ant \ - -Duser.home=$PWD \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.settings.offline=true \ - -Dmaven.settings.interactiveMode=false \ - jar javadoc - mkdir -p $MAVEN_REPO_LOCAL/org/slf4j/slf4j-jdk14/%{version} - cp target/slf4j-jdk14-%{version}.jar $MAVEN_REPO_LOCAL/org/slf4j/slf4j-jdk14/%{version}/ - popd - pushd slf4j-log4j12 - export CLASSPATH="" - CLASSPATH=$CLASSPATH:../slf4j-api/target/slf4j-api-%{version}.jar - CLASSPATH=$CLASSPATH:$(build-classpath avalon-framework420 commons-logging) - CLASSPATH=$CLASSPATH:$(build-classpath log4j junit-3.8.2):target/classes:target/test-classes - ant \ - -Duser.home=$PWD \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.settings.offline=true \ - -Dmaven.settings.interactiveMode=false \ - jar javadoc - - mkdir -p $MAVEN_REPO_LOCAL/org/slf4j/slf4j-log4j12/%{version} - cp target/slf4j-log4j12-%{version}.jar $MAVEN_REPO_LOCAL/org/slf4j/slf4j-log4j12/%{version}/ - popd - pushd slf4j-jcl - export CLASSPATH="" - CLASSPATH=$CLASSPATH:../slf4j-api/target/slf4j-api-%{version}.jar - CLASSPATH=$CLASSPATH:$(build-classpath avalon-framework420 commons-logging) - CLASSPATH=$CLASSPATH:$(build-classpath log4j junit-3.8.2):target/classes:target/test-classes - ant \ - -Duser.home=$PWD \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.settings.offline=true \ - -Dmaven.settings.interactiveMode=false \ - jar javadoc - popd - pushd slf4j-ext - export CLASSPATH="" - CLASSPATH=$CLASSPATH:../slf4j-api/target/slf4j-api-%{version}.jar - CLASSPATH=$CLASSPATH:../slf4j-log4j12/target/slf4j-log4j12-%{version}.jar - CLASSPATH=$CLASSPATH:$(build-classpath commons-lang24 javassist) - CLASSPATH=$CLASSPATH:$(build-classpath avalon-framework420 commons-logging) - CLASSPATH=$CLASSPATH:$(build-classpath log4j junit-3.8.2):target/classes:target/test-classes - ant \ - -Duser.home=$PWD \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.settings.offline=true \ - -Dmaven.settings.interactiveMode=false \ - jar javadoc - popd - pushd jcl-over-slf4j - export CLASSPATH="" - CLASSPATH=$CLASSPATH:../slf4j-api/target/slf4j-api-%{version}.jar - CLASSPATH=$CLASSPATH:../slf4j-jdk14/target/slf4j-jdk14-%{version}.jar - CLASSPATH=$CLASSPATH:$(build-classpath avalon-framework420 commons-logging) - CLASSPATH=$CLASSPATH:$(build-classpath log4j junit-3.8.2):target/classes:target/test-classes - ant \ - -Duser.home=$PWD \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.settings.offline=true \ - -Dmaven.settings.interactiveMode=false \ - jar javadoc - popd - pushd jcl104-over-slf4j - export CLASSPATH="" - CLASSPATH=$CLASSPATH:../slf4j-api/target/slf4j-api-%{version}.jar - CLASSPATH=$CLASSPATH:../slf4j-jdk14/target/slf4j-jdk14-%{version}.jar - CLASSPATH=$CLASSPATH:$(build-classpath avalon-framework420 commons-logging) - CLASSPATH=$CLASSPATH:$(build-classpath log4j junit-3.8.2):target/classes:target/test-classes - ant \ - -Duser.home=$PWD \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.settings.offline=true \ - -Dmaven.settings.interactiveMode=false \ - jar - popd - pushd log4j-over-slf4j - export CLASSPATH="" - CLASSPATH=$CLASSPATH:../slf4j-api/target/slf4j-api-%{version}.jar - CLASSPATH=$CLASSPATH:../slf4j-jdk14/target/slf4j-jdk14-%{version}.jar - CLASSPATH=$CLASSPATH:$(build-classpath avalon-framework420 commons-logging) - CLASSPATH=$CLASSPATH:$(build-classpath log4j junit-3.8.2):target/classes:target/test-classes - ant \ - -Duser.home=$PWD \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.settings.offline=true \ - -Dmaven.settings.interactiveMode=false \ - jar javadoc - popd - pushd jul-to-slf4j - export CLASSPATH="" - CLASSPATH=$CLASSPATH:../slf4j-api/target/slf4j-api-%{version}.jar - CLASSPATH=$CLASSPATH:../slf4j-log4j12/target/slf4j-log4j12-%{version}.jar - CLASSPATH=$CLASSPATH:$(build-classpath avalon-framework420 commons-logging) - CLASSPATH=$CLASSPATH:$(build-classpath log4j junit-3.8.2):target/classes:target/test-classes - ant \ - -Duser.home=$PWD \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.settings.offline=true \ - -Dmaven.settings.interactiveMode=false \ - jar javadoc - popd - pushd slf4j-migrator - export CLASSPATH="" - CLASSPATH=$CLASSPATH:../slf4j-api/target/slf4j-api-%{version}.jar - CLASSPATH=$CLASSPATH:$(build-classpath avalon-framework420 commons-logging) - CLASSPATH=$CLASSPATH:$(build-classpath log4j junit-3.8.2):target/classes:target/test-classes - ant \ - -Duser.home=$PWD \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.settings.offline=true \ - -Dmaven.settings.interactiveMode=false \ - jar javadoc - popd - pushd integration - export CLASSPATH="" - CLASSPATH=$CLASSPATH:../slf4j-api/target/slf4j-api-%{version}.jar - CLASSPATH=$CLASSPATH:$(build-classpath avalon-framework420 commons-logging) - CLASSPATH=$CLASSPATH:$(build-classpath log4j junit-3.8.2 ant/ant-junit):target/classes:target/test-classes - ant \ - -buildfile maven-build.xml \ - -Duser.home=$PWD \ - -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ - -Dmaven.settings.offline=true \ - -Dmaven.settings.interactiveMode=false \ - jar - popd -%endif - %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" mkdir -p %{buildroot}%{_javadir}/slf4j -install -m 644 jcl104-over-slf4j/target/jcl104-over-slf4j-%{version}.jar \ - %{buildroot}%{_javadir}/slf4j/jcl104-over-slf4j-%{version}.jar -install -m 644 jcl-over-slf4j/target/jcl-over-slf4j-%{version}.jar \ +#install -m 644 jcl104-over-slf4j/target/jcl104-over-slf4j-%{version}.jar \ +# %{buildroot}%{_javadir}/slf4j/jcl104-over-slf4j-%{version}.jar +install -m 644 %{SOURCE0} \ %{buildroot}%{_javadir}/slf4j/jcl-over-slf4j-%{version}.jar -install -m 644 jul-to-slf4j/target/jul-to-slf4j-%{version}.jar \ +install -m 644 %{SOURCE1} \ %{buildroot}%{_javadir}/slf4j/jul-to-slf4j-%{version}.jar -install -m 644 log4j-over-slf4j/target/log4j-over-slf4j-%{version}.jar \ +install -m 644 %{SOURCE2} \ %{buildroot}%{_javadir}/slf4j/log4j-over-slf4j-%{version}.jar -install -m 644 slf4j-api/target/slf4j-api-%{version}.jar \ +install -m 644 %{SOURCE3} \ %{buildroot}%{_javadir}/slf4j/api-%{version}.jar -install -m 644 slf4j-api/target/slf4j-api-%{version}-tests.jar \ - %{buildroot}%{_javadir}/slf4j/api-tests-%{version}.jar -install -m 644 slf4j-ext/target/slf4j-ext-%{version}.jar \ +#install -m 644 slf4j-api/target/slf4j-api-%{version}-tests.jar \ +# %{buildroot}%{_javadir}/slf4j/api-tests-%{version}.jar +install -m 644 %{SOURCE4} \ %{buildroot}%{_javadir}/slf4j/ext-%{version}.jar -install -m 644 slf4j-jcl/target/slf4j-jcl-%{version}.jar \ +install -m 644 %{SOURCE5} \ %{buildroot}%{_javadir}/slf4j/jcl-%{version}.jar -install -m 644 slf4j-jdk14/target/slf4j-jdk14-%{version}.jar \ +install -m 644 %{SOURCE6} \ %{buildroot}%{_javadir}/slf4j/jdk14-%{version}.jar -install -m 644 slf4j-log4j12/target/slf4j-log4j12-%{version}.jar \ - %{buildroot}%{_javadir}/slf4j/log4j12-%{version}.jar -install -m 644 slf4j-migrator/target/slf4j-migrator-%{version}.jar \ +install -m 644 %{SOURCE7} \ + %{buildroot}%{_javadir}/slf4j/reload4j-%{version}.jar +#install -m 644 slf4j-log4j12/target/slf4j-log4j12-%{version}.jar \ +# %{buildroot}%{_javadir}/slf4j/log4j12-%{version}.jar +install -m 644 %{SOURCE8} \ %{buildroot}%{_javadir}/slf4j/migrator-%{version}.jar -install -m 644 slf4j-nop/target/slf4j-nop-%{version}.jar \ +install -m 644 %{SOURCE9} \ %{buildroot}%{_javadir}/slf4j/nop-%{version}.jar -install -m 644 slf4j-simple/target/slf4j-simple-%{version}.jar \ +install -m 644 %{SOURCE10} \ %{buildroot}%{_javadir}/slf4j/simple-%{version}.jar #install -m 644 slf4j-site/target/slf4j-site-%{version}.jar \ # %{buildroot}%{_javadir}/slf4j/site-%{version}.jar @@ -365,81 +78,6 @@ install -m 644 slf4j-simple/target/slf4j-simple-%{version}.jar \ done ) -mkdir -p %{buildroot}%{_datadir}/maven2/poms - -%add_to_maven_depmap org.slf4j jcl104-over-slf4j %{version} JPP/slf4j jcl104-over-slf4j -%add_to_maven_depmap org.slf4j jcl-over-slf4j %{version} JPP/slf4j jcl-over-slf4j -%add_to_maven_depmap org.slf4j jul-to-slf4j %{version} JPP/slf4j jul-to-slf4j -%add_to_maven_depmap org.slf4j log4j-over-slf4j %{version} JPP/slf4j log4j-over-slf4j -%add_to_maven_depmap org.slf4j slf4j-parent %{version} JPP/slf4j parent -%add_to_maven_depmap org.slf4j slf4j-api %{version} JPP/slf4j api -%add_to_maven_depmap org.slf4j slf4j-ext %{version} JPP/slf4j ext -%add_to_maven_depmap org.slf4j slf4j-jcl %{version} JPP/slf4j jcl -%add_to_maven_depmap org.slf4j slf4j-jdk14 %{version} JPP/slf4j jdk14 -%add_to_maven_depmap org.slf4j slf4j-log4j12 %{version} JPP/slf4j log4j12 -%add_to_maven_depmap org.slf4j slf4j-migrator %{version} JPP/slf4j migrator -%add_to_maven_depmap org.slf4j slf4j-nop %{version} JPP/slf4j nop -%add_to_maven_depmap org.slf4j slf4j-simple %{version} JPP/slf4j simple - - -install -pm 644 pom.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP.slf4j-parent.pom -install -pm 644 jcl104-over-slf4j/pom.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP.slf4j-jcl104-over-slf4j.pom -install -pm 644 jcl-over-slf4j/pom.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP.slf4j-jcl-over-slf4j.pom -install -pm 644 jul-to-slf4j/pom.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP.slf4j-jul-to-slf4j.pom -install -pm 644 log4j-over-slf4j/pom.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP.slf4j-log4j-over-slf4j.pom -install -pm 644 slf4j-api/pom.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP.slf4j-api.pom -install -m 644 slf4j-ext/pom.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP.slf4j-ext.pom -install -pm 644 slf4j-jcl/pom.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP.slf4j-jcl.pom -install -pm 644 slf4j-jdk14/pom.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP.slf4j-jdk14.pom -install -pm 644 slf4j-log4j12/pom.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP.slf4j-log4j12.pom -install -pm 644 slf4j-migrator/pom.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP.slf4j-migrator.pom -install -pm 644 slf4j-nop/pom.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP.slf4j-nop.pom -install -pm 644 slf4j-simple/pom.xml \ - %{buildroot}%{_datadir}/maven2/poms/JPP.slf4j-simple.pom - -mkdir -p %{buildroot}%{_javadocdir}/slf4j-%{version} -%if %maven - cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/slf4j-%{version} - rm -rf target/site/apidocs -%else - mkdir -p %{buildroot}%{_javadocdir}/slf4j-%{version}/jcl-over-slf4j - cp -pr jcl-over-slf4j/target/site/apidocs/* %{buildroot}%{_javadocdir}/slf4j-%{version}/jcl-over-slf4j - mkdir -p %{buildroot}%{_javadocdir}/slf4j-%{version}/jul-to-slf4j - cp -pr jul-to-slf4j/target/site/apidocs/* %{buildroot}%{_javadocdir}/slf4j-%{version}/jul-to-slf4j - mkdir -p %{buildroot}%{_javadocdir}/slf4j-%{version}/log4j-over-slf4j - cp -pr log4j-over-slf4j/target/site/apidocs/* %{buildroot}%{_javadocdir}/slf4j-%{version}/log4j-over-slf4j - mkdir -p %{buildroot}%{_javadocdir}/slf4j-%{version}/api - cp -pr slf4j-api/target/site/apidocs/* %{buildroot}%{_javadocdir}/slf4j-%{version}/api - mkdir -p %{buildroot}%{_javadocdir}/slf4j-%{version}/ext - cp -pr slf4j-ext/target/site/apidocs/* %{buildroot}%{_javadocdir}/slf4j-%{version}/ext - mkdir -p %{buildroot}%{_javadocdir}/slf4j-%{version}/jcl - cp -pr slf4j-jcl/target/site/apidocs/* %{buildroot}%{_javadocdir}/slf4j-%{version}/jcl - mkdir -p %{buildroot}%{_javadocdir}/slf4j-%{version}/jdk14 - cp -pr slf4j-jdk14/target/site/apidocs/* %{buildroot}%{_javadocdir}/slf4j-%{version}/jdk14 - mkdir -p %{buildroot}%{_javadocdir}/slf4j-%{version}/log4j12 - cp -pr slf4j-log4j12/target/site/apidocs/* %{buildroot}%{_javadocdir}/slf4j-%{version}/log4j12 - mkdir -p %{buildroot}%{_javadocdir}/slf4j-%{version}/migrator - cp -pr slf4j-migrator/target/site/apidocs/* %{buildroot}%{_javadocdir}/slf4j-%{version}/migrator - mkdir -p %{buildroot}%{_javadocdir}/slf4j-%{version}/nop - cp -pr slf4j-nop/target/site/apidocs/* %{buildroot}%{_javadocdir}/slf4j-%{version}/nop - mkdir -p %{buildroot}%{_javadocdir}/slf4j-%{version}/simple - cp -pr slf4j-simple/target/site/apidocs/* %{buildroot}%{_javadocdir}/slf4j-%{version}/simple -%endif -ln -s slf4j-%{version} %{buildroot}%{_javadocdir}/slf4j - - %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -447,8 +85,8 @@ ln -s slf4j-%{version} %{buildroot}%{_javadocdir}/slf4j %defattr(-,root,root) %dir %{_javadir}/slf4j %{_javadir}/slf4j/api-%{version}.jar -%{_javadir}/slf4j/api-tests-%{version}.jar -%{_javadir}/slf4j/api-tests.jar +#%{_javadir}/slf4j/api-tests-%{version}.jar +#%{_javadir}/slf4j/api-tests.jar %{_javadir}/slf4j/api.jar %{_javadir}/slf4j/ext-%{version}.jar %{_javadir}/slf4j/ext.jar @@ -456,38 +94,30 @@ ln -s slf4j-%{version} %{buildroot}%{_javadocdir}/slf4j %{_javadir}/slf4j/jcl-over-slf4j-%{version}.jar %{_javadir}/slf4j/jcl-over-slf4j.jar %{_javadir}/slf4j/jcl.jar -%{_javadir}/slf4j/jcl104-over-slf4j-%{version}.jar -%{_javadir}/slf4j/jcl104-over-slf4j.jar +#%{_javadir}/slf4j/jcl104-over-slf4j-%{version}.jar +#%{_javadir}/slf4j/jcl104-over-slf4j.jar %{_javadir}/slf4j/jdk14-%{version}.jar %{_javadir}/slf4j/jdk14.jar %{_javadir}/slf4j/jul-to-slf4j-%{version}.jar %{_javadir}/slf4j/jul-to-slf4j.jar %{_javadir}/slf4j/log4j-over-slf4j-%{version}.jar %{_javadir}/slf4j/log4j-over-slf4j.jar -%{_javadir}/slf4j/log4j12-%{version}.jar -%{_javadir}/slf4j/log4j12.jar +#%{_javadir}/slf4j/log4j12-%{version}.jar +#%{_javadir}/slf4j/log4j12.jar +%{_javadir}/slf4j/reload4j-%{version}.jar +%{_javadir}/slf4j/reload4j.jar %{_javadir}/slf4j/migrator-%{version}.jar %{_javadir}/slf4j/migrator.jar %{_javadir}/slf4j/nop-%{version}.jar %{_javadir}/slf4j/nop.jar %{_javadir}/slf4j/simple-%{version}.jar %{_javadir}/slf4j/simple.jar -%{_datadir}/maven2/poms -%{_mavendepmapfragdir} %doc LICENSE.txt -%files javadoc -%defattr(-,root,root) -%{_javadocdir}/slf4j-%{version} -%{_javadocdir}/slf4j - -%if %maven -%files manual -%defattr(-,root,root) -%doc target/site -%endif - %changelog +* Wed Aug 10 2022 Silvan Calarco 1.7.36-1mamba +- update to 1.7.36 + * Sat Nov 06 2010 gil 1.5.8-3mamba - rebuilt devel diff --git a/maven2-2.2.0-settings.xml b/maven2-2.2.0-settings.xml deleted file mode 100644 index 0d6ad48..0000000 --- a/maven2-2.2.0-settings.xml +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - __INTERNAL_REPO_PLACEHOLDER__ - - - - - - - - - - - - - - - - - - - - - - - - mirrorId - repositoryId - Human Readable Name for this Mirror. - __EXTERNAL_REPO_PLACEHOLDER__ - - - - - - - - - - - - -