[sonatype-oss-parent] Cleanup spec according to latest guidelines

Stanislav Ochotnicky sochotni at fedoraproject.org
Thu Jul 26 13:50:11 UTC 2012


commit 02d6ebc5c3c1cc5ffe294bc1132149d679380e85
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Jul 26 15:32:53 2012 +0200

    Cleanup spec according to latest guidelines
    
    - Use pom macro to remove enforcer plugin from pom

 sonatype-oss-parent.spec |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/sonatype-oss-parent.spec b/sonatype-oss-parent.spec
index 5a148fa..ba64800 100644
--- a/sonatype-oss-parent.spec
+++ b/sonatype-oss-parent.spec
@@ -2,7 +2,7 @@
 
 Name:           sonatype-oss-parent
 Version:        6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Sonatype OSS Parent
 
 Group:          Development/Libraries
@@ -18,14 +18,13 @@ BuildRequires:  jpackage-utils >= 0:1.7.2
 
 Requires:          jpackage-utils
 Requires:          maven-release-plugin
-Requires(post):    jpackage-utils >= 0:1.7.2
-Requires(postun):  jpackage-utils >= 0:1.7.2
 
 %description
 Sonatype OSS parent pom used by other sonatype packages
 
 %prep
 %setup -q -n %{name}-%{version}
+%pom_remove_plugin org.apache.maven.plugins:maven-enforcer-plugin
 
 %build
 #nothing to do for the pom
@@ -36,20 +35,17 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
-%add_to_maven_depmap org.sonatype.oss %{artifactid} %{version} JPP %{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.pom
 
 %files
-%defattr(-,root,root,-)
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/%{name}
 
 %changelog
+* Thu Jul 26 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 6-5
+- Cleanup spec according to latest guidelines
+- Use pom macro to remove enforcer plugin from pom
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 6-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list