[plexus-digest] Migration to plexus-containers-component-metadata

Stanislav Ochotnicky sochotni at fedoraproject.org
Tue Aug 16 11:36:10 UTC 2011


commit 304b1ee9d578735a3fd9ec1533c947a2e856eaf0
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Tue Jul 26 19:15:23 2011 +0200

    Migration to plexus-containers-component-metadata

 ...us-digest-migration-to-component-metadata.patch |   17 +++++++++++++++++
 plexus-digest.spec                                 |   19 ++++++++++---------
 2 files changed, 27 insertions(+), 9 deletions(-)
---
diff --git a/plexus-digest-migration-to-component-metadata.patch b/plexus-digest-migration-to-component-metadata.patch
new file mode 100644
index 0000000..c67f57b
--- /dev/null
+++ b/plexus-digest-migration-to-component-metadata.patch
@@ -0,0 +1,17 @@
+diff -Naur plexus-digest.orig/pom.xml plexus-digest/pom.xml
+--- plexus-digest.orig/pom.xml	2007-05-21 21:31:52.000000000 +0200
++++ plexus-digest/pom.xml	2011-07-26 18:54:21.375748376 +0200
+@@ -22,11 +22,11 @@
+     <plugins>
+       <plugin>
+         <groupId>org.codehaus.plexus</groupId>
+-        <artifactId>plexus-maven-plugin</artifactId>
++        <artifactId>plexus-component-metadata</artifactId>
+         <executions>
+           <execution>
+             <goals>
+-              <goal>descriptor</goal>
++              <goal>generate-metadata</goal>
+             </goals>
+           </execution>
+         </executions>
diff --git a/plexus-digest.spec b/plexus-digest.spec
index a580205..18e0209 100644
--- a/plexus-digest.spec
+++ b/plexus-digest.spec
@@ -33,7 +33,7 @@
 
 Name:           plexus-digest
 Version:        1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Plexus Digest / Hashcode Components
 License:        ASL 2.0
@@ -43,6 +43,8 @@ Source0:        %{name}-%{version}-src.tar.gz
 # svn export http://svn.codehaus.org/plexus/plexus-components/tags/plexus-digest-1.1/ plexus-digest/
 # tar czf plexus-digest-1.1-src.tar.gz plexus-digest/
 
+Patch0:         %{name}-migration-to-component-metadata.patch
+
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 0:1.7.2
@@ -54,12 +56,12 @@ BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-surefire-plugin
-BuildRequires:  maven-surefire-provider-junit 
+BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven-doxia
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  qdox >= 1.5
 
-BuildRequires:  plexus-maven-plugin
+BuildRequires:  plexus-containers-component-metadata
 BuildRequires:  plexus-cdc
 
 
@@ -84,6 +86,7 @@ Javadoc for %{name}.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
 
 %build
 mvn-rpmbuild install javadoc:javadoc
@@ -104,12 +107,6 @@ install -pm 644 pom.xml \
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
 %{_javadir}/plexus/*
 %{_mavenpomdir}/*
@@ -119,6 +116,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
 %doc %{_javadocdir}/*
 
 %changelog
+* Tue Jul 26 2011 Jaromir Capik <jcapik at redhat.com> - 0:1.1-5
+- Migration from plexus-maven-plugin to plexus-containers-component-metadata
+- Minor spec file changes according to the latest guidelines
+
 * Sun Jun 12 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.1-4
 - Build with maven 3.x
 


More information about the scm-commits mailing list