diff --git a/slf4j.spec b/slf4j.spec index b8d67d2..1cdac20 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -30,7 +30,7 @@ Name: slf4j Version: 1.7.6 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: Simple Logging Facade for Java Group: Development/Libraries @@ -58,21 +58,6 @@ BuildRequires: log4j BuildRequires: apache-commons-logging BuildRequires: cal10n -# temporarily require subpackages until dependenct packages update their BRs -Requires: %{name}-parent = %{version}-%{release} -Requires: %{name}-api = %{version}-%{release} -Requires: %{name}-simple = %{version}-%{release} -Requires: %{name}-nop = %{version}-%{release} -Requires: %{name}-jdk14 = %{version}-%{release} -Requires: %{name}-log4j12 = %{version}-%{release} -Requires: %{name}-jcl = %{version}-%{release} -Requires: %{name}-ext = %{version}-%{release} -Requires: %{name}-site = %{version}-%{release} -Requires: %{name}-migrator = %{version}-%{release} -Requires: jcl-over-slf4j = %{version}-%{release} -Requires: log4j-over-slf4j = %{version}-%{release} -Requires: jul-to-slf4j = %{version}-%{release} - %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 @@ -97,96 +82,47 @@ Summary: Manual for %{name} %description manual This package provides documentation for %{name}. -%package parent -Summary: Parent POM for %{name} -Requires: %{name} = %{version}-%{release} - -%description parent -Parent POM for %{name} - -%package api -Summary: API for %{name} -Requires: %{name} = %{version}-%{release} - -%description api -This package provides API for %{name}. - -%package simple -Summary: simple module for %{name} -Requires: %{name} = %{version}-%{release} - -%description simple -This package provides simple module for %{name}. - -%package nop -Summary: nop module for %{name} -Requires: %{name} = %{version}-%{release} - -%description nop -This package provides nop module for %{name}. - %package jdk14 -Summary: jdk14 module for %{name} -Requires: %{name} = %{version}-%{release} +Summary: SLF4J JDK14 Binding %description jdk14 -This package provides jdk14 module for %{name}. +SLF4J JDK14 Binding. %package log4j12 -Summary: log4j12 module for %{name} -Requires: %{name} = %{version}-%{release} +Summary: SLF4J LOG4J-12 Binding %description log4j12 -This package provides log4j12 module for %{name}. +SLF4J LOG4J-12 Binding. %package jcl -Summary: jcl module for %{name} -Requires: %{name} = %{version}-%{release} +Summary: SLF4J JCL Binding %description jcl -This package provides jcl module for %{name}. +SLF4J JCL Binding. %package ext -Summary: ext module for %{name} -Requires: %{name} = %{version}-%{release} +Summary: SLF4J Extensions Module %description ext -This package provides ext module for %{name}. +Extensions to the SLF4J API. %package -n jcl-over-slf4j -Summary: jcl-over-slf4j module for %{name} -Requires: %{name} = %{version}-%{release} +Summary: JCL 1.1.1 implemented over SLF4J %description -n jcl-over-slf4j -This package provides jcl-over-slf4j module for %{name}. +JCL 1.1.1 implemented over SLF4J. %package -n log4j-over-slf4j -Summary: log4j-over-slf4j module for %{name} -Requires: %{name} = %{version}-%{release} +Summary: Log4j implemented over SLF4J %description -n log4j-over-slf4j -This package provides log4j-over-slf4j module for %{name}. +Log4j implemented over SLF4J. %package -n jul-to-slf4j -Summary: jul-to-slf4j module for %{name} -Requires: %{name} = %{version}-%{release} +Summary: JUL to SLF4J bridge %description -n jul-to-slf4j -This package provides jul-to-slf4j module for %{name}. - -%package site -Summary: site module for %{name} -Requires: %{name} = %{version}-%{release} - -%description site -This package provides site module for %{name}. - -%package migrator -Summary: migrator module for %{name} -Requires: %{name} = %{version}-%{release} - -%description migrator -This package provides migrator module for %{name}. +JUL to SLF4J bridge. %prep %setup -q @@ -196,6 +132,7 @@ cp -p %{SOURCE1} APACHE-LICENSE %pom_disable_module integration %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 @@ -225,6 +162,12 @@ 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 +%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 @@ -244,10 +187,6 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual %doc LICENSE.txt APACHE-LICENSE %{_javadir}/%{name} -%files parent -f .mfiles-%{name}-parent -%files api -f .mfiles-%{name}-api -%files simple -f .mfiles-%{name}-simple -%files nop -f .mfiles-%{name}-nop %files jdk14 -f .mfiles-%{name}-jdk14 %files log4j12 -f .mfiles-%{name}-log4j12 %files jcl -f .mfiles-%{name}-jcl @@ -255,8 +194,6 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual %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 site -f .mfiles-%{name}-site -%files migrator -f .mfiles-%{name}-migrator %files javadoc -f .mfiles-javadoc %doc LICENSE.txt APACHE-LICENSE @@ -264,6 +201,10 @@ cp -pr target/site/* $RPM_BUILD_ROOT%{_defaultdocdir}/%{name}-manual %doc LICENSE.txt APACHE-LICENSE %changelog +* 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