From b0b29499b72e8f2e799c08bb84a9aef4753186bc02d40c1f548a645b25268171 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 22 Feb 2022 20:47:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=61 --- _service | 15 +++++++++++++++ build.xml.tar.bz2 | 3 --- build.xml.tar.xz | 3 +++ slf4j-1.7.32.tar.xz | 3 +++ slf4j-sources.changes | 7 +++++++ slf4j-sources.spec | 4 ++-- slf4j.changes | 7 +++++++ slf4j.spec | 9 +++++---- v_1.7.32.tar.gz | 3 --- 9 files changed, 42 insertions(+), 12 deletions(-) create mode 100644 _service delete mode 100644 build.xml.tar.bz2 create mode 100644 build.xml.tar.xz create mode 100644 slf4j-1.7.32.tar.xz delete mode 100644 v_1.7.32.tar.gz diff --git a/_service b/_service new file mode 100644 index 0000000..12ff674 --- /dev/null +++ b/_service @@ -0,0 +1,15 @@ + + + git + https://github.com/qos-ch/slf4j.git + v_1.7.32 + v_* + @PARENT_TAG@ + v_(.*) + + + *.tar + xz + + + diff --git a/build.xml.tar.bz2 b/build.xml.tar.bz2 deleted file mode 100644 index 0a471ac..0000000 --- a/build.xml.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:748214c48efa50088936dd57575a72555dde17bf79f0b24240e5e62605e7d9c6 -size 9405 diff --git a/build.xml.tar.xz b/build.xml.tar.xz new file mode 100644 index 0000000..307baa0 --- /dev/null +++ b/build.xml.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a4b31b1488ed43e9239545ea99b6ed9ada625133cf767828afd8f3247680ea7 +size 7880 diff --git a/slf4j-1.7.32.tar.xz b/slf4j-1.7.32.tar.xz new file mode 100644 index 0000000..62228eb --- /dev/null +++ b/slf4j-1.7.32.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3394567be9f31307d69e4d41a62e8be48f8c080ed9ae8ec6911515fe64ab948b +size 2022484 diff --git a/slf4j-sources.changes b/slf4j-sources.changes index 31b6863..91f12d8 100644 --- a/slf4j-sources.changes +++ b/slf4j-sources.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 22 20:45:12 UTC 2022 - Fridrich Strba + +- Fetch sources using source service +- Depend for build on reload4j +- Fix dependencies of the module slf4j-log4j12 + ------------------------------------------------------------------- Tue Feb 22 09:50:47 UTC 2022 - Fridrich Strba diff --git a/slf4j-sources.spec b/slf4j-sources.spec index 03ca6ce..fde97d3 100644 --- a/slf4j-sources.spec +++ b/slf4j-sources.spec @@ -26,7 +26,7 @@ Summary: SLF4J Source JARs License: Apache-2.0 AND MIT Group: Development/Libraries/Java URL: https://www.slf4j.org/ -Source0: https://github.com/qos-ch/%{base_name}/archive/v_%{version}.tar.gz +Source0: %{base_name}-%{version}.tar.xz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Patch2: slf4j-commons-lang3.patch Patch3: slf4j-reload4j.patch @@ -37,7 +37,7 @@ BuildArch: noarch SLF4J Source JARs. %prep -%setup -q -n %{base_name}-v_%{version} +%setup -q -n %{base_name}-%{version} %patch2 -p1 %patch3 -p1 find . -name "*.jar" | xargs rm diff --git a/slf4j.changes b/slf4j.changes index 31b6863..91f12d8 100644 --- a/slf4j.changes +++ b/slf4j.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 22 20:45:12 UTC 2022 - Fridrich Strba + +- Fetch sources using source service +- Depend for build on reload4j +- Fix dependencies of the module slf4j-log4j12 + ------------------------------------------------------------------- Tue Feb 22 09:50:47 UTC 2022 - Fridrich Strba diff --git a/slf4j.spec b/slf4j.spec index 59ad479..882c528 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -25,9 +25,9 @@ Summary: Simple Logging Facade for Java License: Apache-2.0 AND MIT Group: Development/Libraries/Java URL: https://www.slf4j.org/ -Source0: https://github.com/qos-ch/%{name}/archive/v_%{version}.tar.gz +Source0: %{name}-%{version}.tar.xz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -Source2: build.xml.tar.bz2 +Source2: build.xml.tar.xz Patch1: build-remove-slf4j_api-binder.patch Patch2: slf4j-commons-lang3.patch Patch3: slf4j-reload4j.patch @@ -41,7 +41,7 @@ BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: javassist >= 3.4 BuildRequires: junit >= 3.8.2 -BuildRequires: log4j12-mini +BuildRequires: reload4j Requires: cal10n Requires: java # this is ugly hack, which creates package which requires the same, @@ -86,6 +86,7 @@ SLF4J JDK14 Binding. %package log4j12 Summary: SLF4J LOG4J-12 Binding Group: Development/Libraries/Java +Requires: mvn(log4j:log4j) Requires: mvn(org.slf4j:slf4j-api) = %{version} %description log4j12 @@ -133,7 +134,7 @@ Requires: mvn(org.slf4j:slf4j-api) = %{version} JUL to SLF4J bridge. %prep -%setup -q -n %{name}-v_%{version} -a2 +%setup -q -n %{name}-%{version} -a2 %patch1 -p1 %patch2 -p1 %patch3 -p1 diff --git a/v_1.7.32.tar.gz b/v_1.7.32.tar.gz deleted file mode 100644 index 47e2349..0000000 --- a/v_1.7.32.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c5d99d1fbd06ad33fcbe732c3696606262d129375ea0e788ee88514eac24389 -size 2277207