[mojo-parent] Update to latest upstream

Stanislav Ochotnicky sochotni at fedoraproject.org
Mon Mar 7 16:29:15 UTC 2011


commit 66d83b07e80775cc6ea756b8e961e4c0b9ec7ce3
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Mar 7 17:27:37 2011 +0100

    Update to latest upstream

 .gitignore       |    1 +
 mojo-parent.spec |   16 +++++-----------
 sources          |    2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f329da..34ee9af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /mojo-parent-24-source-release.zip
+/mojo-parent-28-source-release.zip
diff --git a/mojo-parent.spec b/mojo-parent.spec
index e6fde15..420e04f 100644
--- a/mojo-parent.spec
+++ b/mojo-parent.spec
@@ -1,13 +1,12 @@
 Name:           mojo-parent
-Version:        24
-Release:        6%{?dist}
+Version:        28
+Release:        1%{?dist}
 Summary:        Codehaus MOJO parent project pom file
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://mojo.codehaus.org/
 Source0:        https://nexus.codehaus.org/content/repositories/releases/org/codehaus/mojo/%{name}/%{version}/%{name}-%{version}-source-release.zip
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils
@@ -26,12 +25,7 @@ Codehaus MOJO parent project pom file
 %prep
 %setup -q
 
-# see http://jira.codehaus.org/browse/MOJO-1561
-sed -i 's:<artifactId>plexus-javadoc</artifactId>:<artifactId>plexus-component-javadoc</artifactId>:' pom.xml
-
 %install
-rm -rf %{buildroot}
-
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
@@ -40,9 +34,6 @@ install -pm 644 pom.xml \
 %add_to_maven_depmap org.codehaus.mojo %{name} %{version} JPP %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 %update_maven_depmap
 
@@ -58,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar  7 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 28-1
+- Update to latest upstream
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 24-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 846c878..2a1cfff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5074553f2dc773baa69b45037626b168  mojo-parent-24-source-release.zip
+70a2bc7cf9f2c58e4e7328ee6f1e611d  mojo-parent-28-source-release.zip


More information about the scm-commits mailing list