[spymemcached] Use .mfiles generated during build

gil gil at fedoraproject.org
Tue Jun 10 01:05:16 UTC 2014


commit a9e06b22a88488cff6a5194ac424207bdf4b51fc
Author: gil <puntogil at libero.it>
Date:   Tue Jun 10 03:05:03 2014 +0200

    Use .mfiles generated during build

 spymemcached.spec |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/spymemcached.spec b/spymemcached.spec
index fd86df0..86cf041 100644
--- a/spymemcached.spec
+++ b/spymemcached.spec
@@ -19,7 +19,7 @@ BuildRequires: java-devel
 
 BuildRequires: ant
 BuildRequires: ant-contrib
-BuildRequires: log4j
+BuildRequires: log4j12
 BuildRequires: slf4j
 BuildRequires: springframework-beans
 
@@ -32,7 +32,7 @@ BuildRequires: jmock >= 1.2.0
 BuildRequires: junit
 %endif
 
-Requires:      log4j
+Requires:      log4j12
 Requires:      slf4j
 Requires:      springframework-beans
 
@@ -56,6 +56,7 @@ find -name '*.class' -delete
 %patch1 -p1
 
 sed -i "s|@VERSION@|%{version}|" build.xml 
+sed -i "s|log4j.jar|log4j12-1.2.17.jar|" build.xml
 
 native2ascii -encoding UTF-8 src/test/java/net/spy/memcached/ProtocolBaseCase.java \
  src/test/java/net/spy/memcached/ProtocolBaseCase.java
@@ -76,10 +77,7 @@ install -pm 644 ivy/pom.template.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
 cp -pr build/docs/* %{buildroot}%{_javadocdir}/%{name}
 
-%files
-%{_javadir}/%{name}*.jar
-%{_mavenpomdir}/JPP-%{name}*.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
 %doc LICENSE.txt README.markdown
 
 %files javadoc


More information about the scm-commits mailing list