From 77808ced9fd0662bd52a798f91e4cfe850460cd0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Nov 18 2016 07:34:32 +0000 Subject: Install source JAR for slf4j-simple --- diff --git a/slf4j.spec b/slf4j.spec index b39b418..79d51e1 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -30,7 +30,7 @@ Name: slf4j Version: 1.7.21 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: Simple Logging Facade for Java Group: Development/Libraries @@ -124,6 +124,12 @@ 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 find . -name "*.jar" | xargs rm @@ -133,7 +139,6 @@ cp -p %{SOURCE1} APACHE-LICENSE %pom_disable_module osgi-over-slf4j %pom_disable_module slf4j-android %pom_disable_module slf4j-migrator -%pom_remove_plugin :maven-source-plugin # Because of a non-ASCII comment in slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java %pom_xpath_inject "pom:project/pom:properties" " @@ -170,6 +175,9 @@ cp -p %{SOURCE1} APACHE-LICENSE # 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 @@ -191,8 +199,7 @@ rm -rf target/site/{.htaccess,apidocs} cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual %files -f .mfiles -%doc LICENSE.txt APACHE-LICENSE -%dir %{_javadir}/%{name} +%license LICENSE.txt APACHE-LICENSE %files jdk14 -f .mfiles-%{name}-jdk14 %files log4j12 -f .mfiles-%{name}-log4j12 @@ -202,14 +209,20 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual %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 -%doc LICENSE.txt APACHE-LICENSE +%license LICENSE.txt APACHE-LICENSE %files manual -%doc LICENSE.txt APACHE-LICENSE +%license LICENSE.txt APACHE-LICENSE %{_defaultdocdir}/%{name}-manual %changelog +* 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