diff --git a/slf4j.changes b/slf4j.changes index 8067828..6807919 100644 --- a/slf4j.changes +++ b/slf4j.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 15 14:52:23 UTC 2018 - Fridrich Strba + +- Install the maven artefacts to have mvn dependencies/provides + generated automatically + ------------------------------------------------------------------- Fri May 18 09:17:44 UTC 2018 - pmonrealgonzalez@suse.com diff --git a/slf4j.spec b/slf4j.spec index 631d6a0..a5c8a30 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,7 +23,7 @@ Release: 0 Summary: Simple Logging Facade for Java License: MIT Group: Development/Libraries/Java -Url: http://www.slf4j.org/ +URL: http://www.slf4j.org/ Source0: http://www.slf4j.org/dist/%{name}-%{version}.tar.gz Source1: build.xml.tar.bz2 Patch1: build-remove-slf4j_api-binder.patch @@ -35,6 +35,7 @@ BuildRequires: apache-commons-lang3 BuildRequires: apache-commons-logging BuildRequires: cal10n BuildRequires: java-devel >= 1.5.0 +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: javassist >= 3.4 BuildRequires: junit >= 3.8.2 @@ -44,7 +45,6 @@ Requires: java # this is ugly hack, which creates package wich requires the same, # however slf4j is not splitted between -api and -impl, but pom files are modeled as it was Provides: osgi(slf4j.api) -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -135,6 +135,17 @@ install -m 644 slf4j-nop/target/%{name}-nop-%{version}.jar \ install -m 644 slf4j-simple/target/%{name}-simple-%{version}.jar \ %{buildroot}%{_javadir}/%{name}/simple.jar +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +for i in api ext jcl jdk14 log4j12 migrator nop simple; do +install -pm 644 slf4j-$i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-$i.pom +%add_maven_depmap %{name}-$i.pom %{name}/$i.jar +done +for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do +install -pm 644 $i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-$i.pom +%add_maven_depmap %{name}-$i.pom %{name}/$i.jar +done + # manual install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version} rm -f target/site/.htaccess @@ -147,17 +158,20 @@ cp -pr target/site/* %{buildroot}%{_javadocdir}/%{name}/ rm -rf target/site %files -%defattr(-,root,root,-) %dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/LICENSE.txt +%license %{_docdir}/%{name}-%{version}/LICENSE.txt %{_javadir}/%{name} +%{_mavenpomdir}/* +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name} +%else +%{_datadir}/maven-metadata/%{name}.xml* +%endif %files javadoc -%defattr(-,root,root,-) %{_javadocdir}/%{name} %files manual -%defattr(-,root,root,-) %{_docdir}/%{name}-%{version}/site %changelog