[apache-commons-fileupload] Use .mfiles generated during build
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Wed May 21 15:48:04 UTC 2014
commit 8795d99cc505818aa3b8737800ae241c800e981d
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed May 21 17:47:49 2014 +0200
Use .mfiles generated during build
apache-commons-fileupload.spec | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/apache-commons-fileupload.spec b/apache-commons-fileupload.spec
index dfd32ae..f1b4fa1 100644
--- a/apache-commons-fileupload.spec
+++ b/apache-commons-fileupload.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: This package provides an api to work with html file upload
License: ASL 2.0
Group: Development/Libraries
@@ -101,18 +101,10 @@ install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{short_name}.pom
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}"
-%pre javadoc
-# workaround for rpm bug, can be removed in F-20
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-
-%files
+%files -f .mfiles
%doc LICENSE.txt NOTICE.txt
%{_javadir}/%{name}.jar
%{_javadir}/%{short_name}.jar
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{short_name}.pom
%files javadoc
%doc LICENSE.txt NOTICE.txt
@@ -121,6 +113,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
# -----------------------------------------------------------------------------
%changelog
+* Wed May 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.3.1-3
+- Use .mfiles generated during build
+
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.3.1-2
- Use Requires: java-headless rebuild (#1067528)
More information about the scm-commits
mailing list