[xml-commons-apis] Use .mfiles generated during build
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Wed May 21 16:42:51 UTC 2014
commit 4fe9461724f4463833672b479735e58596ea5c85
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Wed May 21 18:41:51 2014 +0200
Use .mfiles generated during build
xml-commons-apis.spec | 17 +++++------------
1 files changed, 5 insertions(+), 12 deletions(-)
---
diff --git a/xml-commons-apis.spec b/xml-commons-apis.spec
index 72657e9..c7118c1 100644
--- a/xml-commons-apis.spec
+++ b/xml-commons-apis.spec
@@ -1,6 +1,6 @@
Name: xml-commons-apis
Version: 1.4.01
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: APIs for DOM, SAX, and JAXP
Group: Development/Libraries
License: ASL 2.0 and W3C and Public Domain
@@ -23,8 +23,6 @@ BuildRequires: ant
BuildRequires: zip
Requires: java-headless
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
Obsoletes: xml-commons < %{version}-%{release}
Provides: xml-commons = %{version}-%{release}
@@ -102,20 +100,12 @@ cp -pr build/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}
# prevent apis javadoc from being included in doc
rm -rf build/docs/javadoc
-%pre javadoc
-# workaround for rpm bug, can be removed in F-18
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-%files
+%files -f .mfiles
%doc LICENSE NOTICE
%doc LICENSE.dom-documentation.txt README.dom.txt
%doc LICENSE.dom-software.txt LICENSE.sac.html
%doc LICENSE.sax.txt README-sax README.sax.txt
%{_javadir}/*
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavenpomdir}/JPP-%{name}-ext.pom
%files manual
%doc build/docs/*
@@ -124,6 +114,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%{_javadocdir}/*
%changelog
+* Wed May 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.4.01-16
+- Use .mfiles generated during build
+
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.4.01-15
- Use Requires: java-headless rebuild (#1067528)
More information about the scm-commits
mailing list