commit e702ff8bbea571586f70983cec913e39128ae36a
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon Dec 13 13:00:24 2010 +0200
- Adapt to current guidelines.
maven-timestamp-plugin.spec | 45 +++++++++++++++++-------------------------
1 files changed, 18 insertions(+), 27 deletions(-)
---
diff --git a/maven-timestamp-plugin.spec b/maven-timestamp-plugin.spec
index 6ee5bad..db1187a 100644
--- a/maven-timestamp-plugin.spec
+++ b/maven-timestamp-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-timestamp-plugin
Version: 1.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Provides formatted timestamps for maven builds
Group: Development/Libraries
@@ -15,20 +15,20 @@ Source0: maven-timestamp-plugin-1.0.tar.xz
# this one removes previous timestamp plugin version from build
Patch0: 001_build_without_timestamps.patch
BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: maven2
-BuildRequires: maven2-plugin-jar
-BuildRequires: maven2-plugin-javadoc
-BuildRequires: maven2-plugin-source
-BuildRequires: maven2-plugin-compiler
-BuildRequires: maven2-plugin-install
-BuildRequires: maven2-plugin-plugin
-BuildRequires: maven2-plugin-resources
-BuildRequires: maven2-plugin-site
-BuildRequires: maven2-plugin-surefire
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-source-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-site-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit4
Requires: java
Requires: jpackage-utils
@@ -49,7 +49,6 @@ Summary: Javadocs for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
-BuildArch: noarch
%description javadoc
This package contains the API documentation for %{name}.
@@ -80,14 +79,11 @@ mkdir -p $RPM_BUILD_ROOT%{_javadir}
# jar
install -Dp -m 644 target/%{name}-%{version}.jar \
- $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && ln -sf %{name}-%{version}.jar %{name}.jar)
+ $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp target/site/apidocs/ \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-(cd $RPM_BUILD_ROOT%{_javadocdir} && ln -sf %{name}-%{version} %{name})
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/ $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
@@ -97,23 +93,16 @@ $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
%add_to_maven_depmap com.keyboardsamurais.maven %{name} %{version} JPP %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
%defattr(-,root,root,-)
%doc README
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%{_javadir}/*
-
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}
-
%post
%update_maven_depmap
@@ -121,8 +110,10 @@ rm -rf $RPM_BUILD_ROOT
%postun
%update_maven_depmap
-
%changelog
+* Mon Dec 13 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1.0-4
+- Adapt to current guidelines.
+
* Fri Apr 30 2010 Guido Grazioli <guido.grazioli(a)gmail.com> - 1.0-3
- Fix javadoc subpackage Requires
Show replies by date