up to 1.7.5, verbose files

diff --git a/java-slf4j.spec b/java-slf4j.spec
index d8f755c84a2a428c1e1fcccd1200195ce713c59f..3df1565e67a514e960c216db98d09f2b3c952559 100644 (file)
--- a/java-slf4j.spec
+++ b/java-slf4j.spec
@@ -3,17 +3,17 @@
 # - tests?
 # - split into subpackages?
 
-%include       /usr/lib/rpm/macros.java
-
 %define                srcname         slf4j
+%include       /usr/lib/rpm/macros.java
 Summary:       Simple Logging Facade for Java
-Name:          java-slf4j
-Version:       1.6.1
+Name:          java-%{srcname}
+Version:       1.7.5
 Release:       1
-License:       MIT
+# the log4j-over-slf4j and jcl-over-slf4j submodules are ASL 2.0, rest is MIT
+License:       MIT and ASL 2.0
 Group:         Libraries/Java
-Source0:       http://www.slf4j.org/dist/slf4j-1.6.1.tar.gz
-# Source0-md5: 289d4ce9b710269614e97f1ae6a27906
+Source0:       http://www.slf4j.org/dist/%{srcname}-%{version}.tar.gz
+# Source0-md5: 0f9ff51370f54308f3fd52338363de25
 URL:           http://www.slf4j.org/
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
@@ -23,10 +23,30 @@ BuildArch:  noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-The Simple Logging Facade for Java or (SLF4J) serves as a simple
-facade or abstraction for various logging frameworks, e.g.
-java.util.logging, log4j and logback, allowing the end user to plug in
-the desired logging framework at deployment time.
+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
+Summary:       API documentation for %{name}
+Group:         Documentation
+
+%description javadoc
+This package provides %{summary}.
+
+%package manual
+Summary:       Manual for %{name}
+Group:         Documentation
+
+%description manual
+This package provides documentation for %{name}.
 
 %prep
 %setup -q -n %{srcname}-%{version}
@@ -39,9 +59,9 @@ install -d $RPM_BUILD_ROOT%{_javadir}
 
 # jars
 for j in *%{version}.jar; do
-  n=$(basename $j -%{version}.jar)
-  cp -a $j $RPM_BUILD_ROOT%{_javadir}/$n-%{version}.jar
-  ln -s $n-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$n.jar
+       n=$(basename $j -%{version}.jar)
+       cp -p $j $RPM_BUILD_ROOT%{_javadir}/$n-%{version}.jar
+       ln -s $n-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$n.jar
 done
 
 %clean
@@ -49,4 +69,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%{_javadir}/*.jar
+%{_javadir}/jcl-over-slf4j-%{version}.jar
+%{_javadir}/jcl-over-slf4j.jar
+%{_javadir}/jul-to-slf4j-%{version}.jar
+%{_javadir}/jul-to-slf4j.jar
+%{_javadir}/log4j-over-slf4j-%{version}.jar
+%{_javadir}/log4j-over-slf4j.jar
+%{_javadir}/slf4j-api-%{version}.jar
+%{_javadir}/slf4j-api.jar
+%{_javadir}/slf4j-ext-%{version}.jar
+%{_javadir}/slf4j-ext.jar
+%{_javadir}/slf4j-jcl-%{version}.jar
+%{_javadir}/slf4j-jcl.jar
+%{_javadir}/slf4j-jdk14-%{version}.jar
+%{_javadir}/slf4j-jdk14.jar
+%{_javadir}/slf4j-log4j12-%{version}.jar
+%{_javadir}/slf4j-log4j12.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