[mojo-parent] Update to latest upstream.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Dec 7 09:32:35 UTC 2011
commit 3ae08b1681786de4d8a3893aedb8116f73daea21
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date: Wed Dec 7 11:32:18 2011 +0200
Update to latest upstream.
.gitignore | 1 +
mojo-parent.spec | 34 ++++++++++++++--------------------
sources | 2 +-
3 files changed, 16 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 34ee9af..d1b3041 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/mojo-parent-24-source-release.zip
/mojo-parent-28-source-release.zip
+mojo-parent-29-source-release.zip
diff --git a/mojo-parent.spec b/mojo-parent.spec
index 6101402..90ee411 100644
--- a/mojo-parent.spec
+++ b/mojo-parent.spec
@@ -1,23 +1,25 @@
Name: mojo-parent
-Version: 28
-Release: 2%{?dist}
+Version: 29
+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
+Source0: http://repo1.maven.org/maven2/org/codehaus/mojo/%{name}/%{version}/%{name}-%{version}-source-release.zip
BuildArch: noarch
BuildRequires: jpackage-utils
+BuildRequires: codehaus-parent
+BuildRequires: maven
+BuildRequires: maven-enforcer-plugin
+BuildRequires: maven-plugin-cobertura
Requires: plexus-containers-component-javadoc
Requires: maven-plugin-plugin
Requires: junit
-
+Requires: codehaus-parent
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
%description
Codehaus MOJO parent project pom file
@@ -25,8 +27,8 @@ Codehaus MOJO parent project pom file
%prep
%setup -q
-# remove parent definition for now
-sed -i '/<parent>/,/<\/parent>/{d}' pom.xml
+%build
+mvn-rpmbuild install
%install
# poms
@@ -34,24 +36,16 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.codehaus.mojo %{name} %{version} JPP %{name}
-
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
+%add_maven_depmap JPP-%{name}.pom
%files
-%defattr(-,root,root,-)
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
-
-
%changelog
+* Wed Dec 7 2011 Alexander Kurtakov <akurtako at redhat.com> 29-1
+- Update to latest upstream.
+
* Tue Mar 8 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 28-2
- Remove parent from pom.xml (no codehaus-parent in Fedora now)
diff --git a/sources b/sources
index 2a1cfff..f712134 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-70a2bc7cf9f2c58e4e7328ee6f1e611d mojo-parent-28-source-release.zip
+b31e6bb50702beca00f381faa43c190d mojo-parent-29-source-release.zip
More information about the scm-commits
mailing list