From 5c41b575efbf0dd9de5e53932cd11c3588c8baf3 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 7 Dec 2011 11:32:18 +0200 Subject: [PATCH] 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>/{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 29-1 +- Update to latest upstream. + * Tue Mar 8 2011 Stanislav Ochotnicky - 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