- updated to 1.7.30 (using prebuilt jars, building from source needs working maven)

diff --git a/java-slf4j.spec b/java-slf4j.spec
index 7c1eb50dcbedd3aad1d87954da483240ac9a52a2..fbe52027eb5db27821f01c57da26fd72927f3e80 100644 (file)
--- a/java-slf4j.spec
+++ b/java-slf4j.spec
@@ -1,5 +1,5 @@
 # TODO:
-# - build from source
+# - build from source (using maven)
 # - tests?
 # - split into subpackages?
 
@@ -7,13 +7,41 @@
 Summary:       Simple Logging Facade for Java
 Summary(pl.UTF-8):     Simple Logging Facade for Java - prosta fasada do logowania dla Javy
 Name:          java-%{srcname}
-Version:       1.7.10
+Version:       1.7.30
 Release:       1
 # 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/%{srcname}-%{version}.tar.gz
-# Source0-md5: dce921c782f761dd30607a4f4d631644
+#Source0Download: https://github.com/qos-ch/slf4j/releases
+Source0:       https://github.com/qos-ch/slf4j/archive/v_%{version}/%{srcname}-%{version}.tar.gz
+# Source0-md5: 332f34940151b920724f1a0157a19196
+Source1:       https://repo1.maven.org/maven2/org/slf4j/jcl-over-slf4j/%{version}/jcl-over-slf4j-%{version}.jar
+# Source1-md5: 69ad224b2feb6f86554fe8997b9c3d4b
+Source2:       https://repo1.maven.org/maven2/org/slf4j/jul-to-slf4j/%{version}/jul-to-slf4j-%{version}.jar
+# Source2-md5: f2c78cb93d70dc5dea0c50f36ace09c1
+Source3:       https://repo1.maven.org/maven2/org/slf4j/log4j-over-slf4j/%{version}/log4j-over-slf4j-%{version}.jar
+# Source3-md5: 3b22990e0f731c139873e7c5f48853dd
+Source4:       https://repo1.maven.org/maven2/org/slf4j/osgi-over-slf4j/%{version}/osgi-over-slf4j-%{version}.jar
+# Source4-md5: 60d20e658d5bfa27db742fd412746fbb
+Source5:       https://repo1.maven.org/maven2/org/slf4j/slf4j-android/%{version}/slf4j-android-%{version}.jar
+# Source5-md5: 60567058a512183cd953271c03c55360
+Source6:       https://repo1.maven.org/maven2/org/slf4j/slf4j-api/%{version}/slf4j-api-%{version}.jar
+# Source6-md5: f8be00da99bc4ab64c79ab1e2be7cb7c
+Source7:       https://repo1.maven.org/maven2/org/slf4j/slf4j-ext/%{version}/slf4j-ext-%{version}.jar
+# Source7-md5: e20ffb6713978cc8bd90835e36c5cc66
+Source8:       https://repo1.maven.org/maven2/org/slf4j/slf4j-jcl/%{version}/slf4j-jcl-%{version}.jar
+# Source8-md5: 046fbb4bb678f459d918067fb8d41efa
+Source9:       https://repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/%{version}/slf4j-jdk14-%{version}.jar
+# Source9-md5: 84d1846ed0e770858885ee9742a9d620
+Source10:      https://repo1.maven.org/maven2/org/slf4j/slf4j-log4j12/%{version}/slf4j-log4j12-%{version}.jar
+# Source10-md5:        78f1ff83b38c52a30a278dec6e023a6d
+Source11:      https://repo1.maven.org/maven2/org/slf4j/slf4j-migrator/%{version}/slf4j-migrator-%{version}.jar
+# Source11-md5:        2b656f312a383a2b53e8c5eb9f86a1b8
+Source12:      https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/%{version}/slf4j-nop-%{version}.jar
+# Source12-md5:        a693866cc58b82118054b26b698aed3a
+Source13:      https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/%{version}/slf4j-simple-%{version}.jar
+# Source13-md5:        6577a4799237b81bc9bdc153d6347c30
+
 URL:           http://www.slf4j.org/
 BuildRequires: jpackage-utils
 BuildRequires: rpm-javaprov
@@ -48,22 +76,30 @@ API documentation for SFL4J.
 Dokumentacja API biblioteki SFL4J.
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n %{srcname}-v_%{version}
+
+install -d built-jars
+cp -p %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} \
+       %{SOURCE7} %{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} \
+       %{SOURCE13} built-jars
 
 %build
+# TODO
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}}
 
 # jars
-for j in *%{version}.jar; do
+for j in built-jars/*%{version}.jar; do
        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
 
-cp -rf site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/slf4j-%{version}
+# FIXME: package real apidocs again (after building with mvn)
+#cp -rf site/apidocs $RPM_BUILD_ROOT%{_javadocdir}/slf4j-%{version}
+cp -pr slf4j-site/src/site/pages $RPM_BUILD_ROOT%{_javadocdir}/slf4j-%{version}
 ln -sf slf4j-%{version} $RPM_BUILD_ROOT%{_javadocdir}/slf4j
 
 %clean
@@ -71,7 +107,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE.txt README.md site/changes/*.txt
+%doc LICENSE.txt README.md
 %{_javadir}/jcl-over-slf4j-%{version}.jar
 %{_javadir}/jcl-over-slf4j.jar
 %{_javadir}/jul-to-slf4j-%{version}.jar