From c3c8f26f3a95bc780e96f5f9a112ec3f671e0b1a Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 30 Nov 2012 14:58:57 +0100
Subject: [PATCH] Build with xmvn

---
 slf4j.spec | 90 ++++++++----------------------------------------------
 1 file changed, 12 insertions(+), 78 deletions(-)

diff --git a/slf4j.spec b/slf4j.spec
index b8d60ad..71a0e6f 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -30,7 +30,7 @@
 
 Name:           slf4j
 Version:        1.7.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Simple Logging Facade for Java
 Group:          Development/Libraries
@@ -45,7 +45,7 @@ BuildRequires:  ant >= 0:1.6.5
 BuildRequires:  ant-junit >= 0:1.6.5
 BuildRequires:  javassist >= 0:3.4
 BuildRequires:  junit >= 0:3.8.2
-BuildRequires:  maven
+BuildRequires:  xmvn
 BuildRequires:  maven-antrun-plugin
 BuildRequires:  maven-compiler-plugin
 BuildRequires:  maven-install-plugin
@@ -128,82 +128,14 @@ cp -p %{SOURCE1} APACHE-LICENSE
 sed -i "/Import-Package/s/.$/;resolution:=optional&/" slf4j-api/src/main/resources/META-INF/MANIFEST.MF
 
 %build
-mvn-rpmbuild \
-        -P skipTests \
-        -Dmaven.test.skip=true \
-        install javadoc:aggregate
+%mvn_build -f
 
 %install
-# jars
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}
+%mvn_install
 
-install -m 644 jcl-over-slf4j/target/jcl-over-slf4j-%{version}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl-over-slf4j.jar
-install -m 644 jul-to-slf4j/target/jul-to-slf4j-%{version}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/jul-to-slf4j.jar
-install -m 644 log4j-over-slf4j/target/log4j-over-slf4j-%{version}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/log4j-over-slf4j.jar
-install -m 644 slf4j-api/target/%{name}-api-%{version}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/api.jar
-install -m 644 slf4j-ext/target/%{name}-ext-%{version}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/ext.jar
-install -m 644 slf4j-jcl/target/%{name}-jcl-%{version}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/jcl.jar
-install -m 644 slf4j-jdk14/target/%{name}-jdk14-%{version}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/jdk14.jar
-install -m 644 slf4j-log4j12/target/%{name}-log4j12-%{version}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/log4j12.jar
-install -m 644 slf4j-migrator/target/%{name}-migrator-%{version}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/migrator.jar
-install -m 644 slf4j-nop/target/%{name}-nop-%{version}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/nop.jar
-install -m 644 slf4j-simple/target/%{name}-simple-%{version}.jar \
-   $RPM_BUILD_ROOT%{_javadir}/%{name}/simple.jar
-
-# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-parent.pom
-install -pm 644 jcl-over-slf4j/pom.xml \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jcl-over-slf4j.pom
-install -pm 644 jul-to-slf4j/pom.xml \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jul-to-slf4j.pom
-install -pm 644 log4j-over-slf4j/pom.xml \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-log4j-over-slf4j.pom
-install -pm 644 slf4j-api/pom.xml \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-api.pom
-install -pm 644 slf4j-ext/pom.xml \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-ext.pom
-install -pm 644 slf4j-jcl/pom.xml \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jcl.pom
-install -pm 644 slf4j-jdk14/pom.xml \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-jdk14.pom
-install -pm 644 slf4j-log4j12/pom.xml \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-log4j12.pom
-install -pm 644 slf4j-migrator/pom.xml \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-migrator.pom
-install -pm 644 slf4j-nop/pom.xml \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-nop.pom
-install -pm 644 slf4j-simple/pom.xml \
-    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-simple.pom
-
-%add_maven_depmap JPP.%{name}-parent.pom
-%add_maven_depmap JPP.%{name}-jcl-over-slf4j.pom %{name}/jcl-over-slf4j.jar
-%add_maven_depmap JPP.%{name}-jul-to-slf4j.pom %{name}/jul-to-slf4j.jar
-%add_maven_depmap JPP.%{name}-log4j-over-slf4j.pom %{name}/log4j-over-slf4j.jar
-%add_maven_depmap JPP.%{name}-api.pom %{name}/api.jar
-%add_maven_depmap JPP.%{name}-ext.pom %{name}/ext.jar
-%add_maven_depmap JPP.%{name}-jcl.pom %{name}/jcl.jar
-%add_maven_depmap JPP.%{name}-jdk14.pom %{name}/jdk14.jar
-%add_maven_depmap JPP.%{name}-log4j12.pom %{name}/log4j12.jar
-%add_maven_depmap JPP.%{name}-migrator.pom %{name}/migrator.jar
-%add_maven_depmap JPP.%{name}-nop.pom %{name}/nop.jar
-%add_maven_depmap JPP.%{name}-simple.pom %{name}/simple.jar
-
-# javadoc
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
-rm -rf target/site/api*
+# Compat symlinks
+(cd $RPM_BUILD_ROOT/%{_javadir}/%{name}; for jar in %{name}-*; do
+    ln -s $jar ${jar/%{name}-/}; done)
 
 # manual
 install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
@@ -212,17 +144,19 @@ cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
 
 %files -f .mfiles
 %doc LICENSE.txt APACHE-LICENSE
-%dir %{_javadir}/%{name}
+%{_javadir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt APACHE-LICENSE
-%{_javadocdir}/%{name}
 
 %files manual
 %doc LICENSE.txt APACHE-LICENSE
 %{_docdir}/%{name}-%{version}/site
 
 %changelog
+* Fri Nov 30 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7.2-5
+- Build with xmvn
+
 * Wed Nov 21 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.7.2-4
 - Install Apache license file
 - Resolves: rhbz#878996