[maven-changelog-plugin] Migrated to plexus-containers-container-default (Resolves: #878552)

Stanislav Ochotnicky sochotni at fedoraproject.org
Tue Dec 11 13:28:07 UTC 2012


commit b625918e0671bcd4c5acc1865fa69dd0a9c9cf0a
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Dec 11 13:55:16 2012 +0100

    Migrated to plexus-containers-container-default (Resolves: #878552)
    
    - Added license
    - Use add_maven_depmap instead of add_to_maven_depmap

 maven-changelog-plugin.spec |   30 +++++++++++++++---------------
 sources                     |    1 +
 2 files changed, 16 insertions(+), 15 deletions(-)
---
diff --git a/maven-changelog-plugin.spec b/maven-changelog-plugin.spec
index dce8358..3348a67 100644
--- a/maven-changelog-plugin.spec
+++ b/maven-changelog-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-changelog-plugin
 Version:        2.2
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Produce SCM changelog reports
 
 Group:          Development/Libraries
@@ -9,8 +9,9 @@ URL:            http://maven.apache.org/plugins/maven-changelog-plugin/
 #svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin-2.2/
 #tar jcf maven-changelog-plugin-2.2.tar.bz2 maven-changelog-plugin-2.2/
 Source0:        %{name}-%{version}.tar.bz2
-Patch0:		pom.patch
-Patch1:		ChangeLog.java.patch
+Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
+Patch0:         pom.patch
+Patch1:         ChangeLog.java.patch
 
 BuildArch: noarch
 
@@ -31,8 +32,7 @@ BuildRequires: maven-scm
 BuildRequires: plexus-utils
 BuildRequires: junit
 BuildRequires: maven-plugin-testing-harness
-BuildRequires: plexus-container-default
-BuildRequires: netbeans-cvsclient
+BuildRequires: plexus-containers-container-default
 
 Requires:       maven
 Requires:       java
@@ -40,9 +40,6 @@ Requires:       jpackage-utils
 Requires:       plexus-utils
 Requires:       plexus-container-default
 
-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
-
 Obsoletes: maven2-plugin-changelog <= 0:2.0.8
 Provides: maven2-plugin-changelog = 1:%{version}-%{release}
 
@@ -64,6 +61,7 @@ API documentation for %{name}.
 %setup -q 
 %patch0 -p0
 %patch1 -p2
+cp -p %{SOURCE1} .
 
 %build
 mvn-rpmbuild \
@@ -75,32 +73,34 @@ mvn-rpmbuild \
 install -d -m 0755 %{buildroot}%{_javadir}
 install -m 644 target/%{name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
 
-%add_to_maven_depmap org.apache.maven.plugins %{name} %{version} JPP %{name}
 
 # 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}/
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
+%doc LICENSE-2.0.txt
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
+%doc LICENSE-2.0.txt
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Dec 11 2012 Michal Srb <msrb at redhat.com> - 2.2-11
+- Migrated to plexus-containers-container-default (Resolves: #878552)
+- Added license
+- Use add_maven_depmap instead of add_to_maven_depmap
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 5ebe46f..daaab01 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 50e799806d0f783c58f3856e68830fa8  maven-changelog-plugin-2.2.tar.bz2
+3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt


More information about the scm-commits mailing list