[jibx] Use .mfiles generated during build

gil gil at fedoraproject.org
Mon Jun 9 16:58:25 UTC 2014


commit 2134872e74cc39afee3d7b76b1a5699338ecad15
Author: gil <puntogil at libero.it>
Date:   Mon Jun 9 18:58:10 2014 +0200

    Use .mfiles generated during build

 jibx.spec |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/jibx.spec b/jibx.spec
index befed27..4f4b43c 100644
--- a/jibx.spec
+++ b/jibx.spec
@@ -94,15 +94,16 @@ bea-stax-api \
 dom4j \
 jdom \
 joda-time \
-log4j \
 qdox \
 xpp3 
 
 ln -s $(build-classpath objectweb-asm3/asm) lib/
 ln -s $(build-classpath objectweb-asm3/asm-commons) lib/
+ln -s $(build-classpath log4j12-1.2.17) lib/
 
 sed -i '/Class-Path/I d' %{_builddir}/%{name}/build/build.xml
 
+#sed -i 's|log4j*.jar|log4j12-1.2.17.jar|' %%{_builddir}/%%{name}/build/build.xml
 
 %build
 pushd build/
@@ -130,11 +131,8 @@ cp -rp %{_builddir}/%{name}/build/docs/* \
 %{buildroot}/%{_javadocdir}/%{name}/
 
 
-%files
-%{_javadir}/%{name}/*.jar
+%files -f .mfiles
 %dir %{_javadir}/%{name}
-%{_mavenpomdir}/JPP.%{name}-*.pom
-%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
 %{_javadocdir}/%{name}


More information about the scm-commits mailing list