commit d6a0019a74db7aa0f4ab1555a53288cd52bc1d67
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue May 17 11:39:58 2011 +0300
Update to upstream 1.14.
Adapt to current guidelines.
.gitignore | 1 +
plexus-interpolation.spec | 66 +++++++++++++++++---------------------------
sources | 2 +-
3 files changed, 28 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8ec88e..caa6ae5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
plexus-interpolation-1.13.tar.bz2
+/plexus-interpolation-1.14.tar.xz
diff --git a/plexus-interpolation.spec b/plexus-interpolation.spec
index a48082f..e0612c6 100644
--- a/plexus-interpolation.spec
+++ b/plexus-interpolation.spec
@@ -1,27 +1,26 @@
Name: plexus-interpolation
-Version: 1.13
-Release: 3%{?dist}
+Version: 1.14
+Release: 1%{?dist}
Summary: Plexus Interpolation API
Group: Development/Libraries
License: ASL 2.0 and ASL 1.1 and MIT
URL:
http://plexus.codehaus.org/plexus-components/plexus-interpolation
-#svn export
http://svn.codehaus.org/plexus/plexus-components/tags/plexus-interpolatio...
-#tar cjf plexus-interpolation-1.13.tar.bz2 plexus-interpolation-1.13/
-Source0: %{name}-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#svn export
http://svn.codehaus.org/plexus/plexus-components/tags/plexus-interpolatio...
+#tar caf plexus-interpolation-1.14.tar.xz plexus-interpolation-1.14/
+Source0: %{name}-%{version}.tar.xz
BuildArch: noarch
BuildRequires: java-devel
BuildRequires: junit
-BuildRequires: maven2
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-shared-reporting-impl
BuildRequires: maven-doxia-sitetools
@@ -36,47 +35,32 @@ related projects.
%package javadoc
Group: Documentation
Summary: Javadoc for %{name}
+Requires: jpackage-utils
%description javadoc
API documentation for %{name}.
-
%prep
%setup -q
-mkdir external_repo
-ln -s %{_javadir} external_repo/JPP
-
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
- -e \
- -Dmaven2.jpp.mode=true \
- -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
- install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}/plexus
-install -m 644 target/%{name}-%{version}.jar
%{buildroot}%{_javadir}/plexus/interpolation-%{version}.jar
-
-(cd %{buildroot}%{_javadir}/plexus && for jar in *-%{version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 target/%{name}-%{version}.jar
%{buildroot}%{_javadir}/plexus/interpolation.jar
%add_to_maven_depmap org.codehaus.plexus plexus-interpolation %{version} JPP/plexus
interpolation
# poms
-install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
+install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml \
- %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}.pom
+ %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom
# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%post
%update_maven_depmap
@@ -84,21 +68,21 @@ rm -rf target/site/api*
%postun
%update_maven_depmap
-%clean
-%{__rm} -rf %{buildroot}
-
%files
%defattr(-,root,root,-)
%{_javadir}/plexus/*.jar
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%changelog
+* Tue May 17 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.14-1
+- Update to upstream 1.14 version.
+- Adapt to current guidelines.
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.13-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -107,3 +91,5 @@ rm -rf target/site/api*
* Tue Dec 22 2009 Alexander Kurtakov <akurtako(a)redhat.com> 1.13-1
- Initial package.
+
+
diff --git a/sources b/sources
index 0395a10..d46f443 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f47ea8c8a53a0be53c55f5a16e8615ff plexus-interpolation-1.13.tar.bz2
+1fe62ca9b8976f72c99049fee885b10d plexus-interpolation-1.14.tar.xz