[apache-mime4j] Adapt to current guidelines.

Alexander Kurtakov akurtakov at fedoraproject.org
Wed Nov 30 19:42:19 UTC 2011


commit 46d1e32e5cc94a62c7676a2a07ba675282d9619a
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Wed Nov 30 21:41:40 2011 +0200

    Adapt to current guidelines.

 apache-mime4j.spec |   19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/apache-mime4j.spec b/apache-mime4j.spec
index d56157f..8ef9df7 100644
--- a/apache-mime4j.spec
+++ b/apache-mime4j.spec
@@ -1,6 +1,6 @@
 Name:           apache-mime4j
 Version:        0.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Apache JAMES Mime4j
 
 Group:          Development/Libraries
@@ -18,8 +18,6 @@ BuildRequires: javacc-maven-plugin
 Requires: apache-commons-logging
 Requires: log4j
 Requires: apache-commons-io
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
 
 %description
 Java stream based MIME message parser
@@ -45,36 +43,31 @@ mvn-rpmbuild install
 install -d -m 0755 %{buildroot}%{_javadir}
 install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
-%add_to_maven_depmap org.apache.james apache-mime4j %{version} JPP apache-mime4j
-
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 rm -rf target/site/api*
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt RELEASE_NOTES.txt
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Nov 30 2011 Alexander Kurtakov <akurtako at redhat.com> 0.6.1-2
+- Adapt to current guidelines.
+
 * Wed Feb 23 2011 Alexander Kurtakov <akurtako at redhat.com> 0.6.1-1
 - Initial package.


More information about the scm-commits mailing list