[microba] Use .mfiles generated during build

gil gil at fedoraproject.org
Sat Jun 7 14:08:15 UTC 2014


commit 33bbac64f9501b3af49c482d2aaa60dce8523c37
Author: gil <puntogil at libero.it>
Date:   Sat Jun 7 16:08:19 2014 +0200

    Use .mfiles generated during build

 microba.spec |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)
---
diff --git a/microba.spec b/microba.spec
index bef555d..6a37711 100644
--- a/microba.spec
+++ b/microba.spec
@@ -2,7 +2,6 @@ Name:           microba
 Version:        0.4.4.3
 Release:        11%{?dist}
 Summary:        Set of JFC (Swing) components
-Group:          Development/Libraries
 License:        BSD
 URL:            http://microba.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}-full.zip
@@ -31,9 +30,6 @@ for JTree and JTable, MarkerBar, and GradientEditor.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
-Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
@@ -63,17 +59,9 @@ install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 mkdir -p %{buildroot}%{_javadocdir}
 cp -r javadoc %{buildroot}%{_javadocdir}/%{name}
 
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
 %doc license.txt readme.txt change.log.txt
 
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
 %files javadoc
 %{_javadocdir}/%{name}
 %doc license.txt


More information about the scm-commits mailing list