commit 704b87e4462de087cda2560f3b6f882d2a4cc618
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Jul 5 13:43:38 2011 +0300
Update to new upstream release (1.1).
- Fix FTBFS.
- Adapt to current guidelines.
.gitignore | 1 +
maven-timestamp-plugin.spec | 44 +++++++++++++++---------------------------
sources | 2 +-
3 files changed, 18 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 502cd7e..bb4618d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
maven-timestamp-plugin-1.0.tar.xz
+/maven-timestamp-plugin-1.1.tar.xz
diff --git a/maven-timestamp-plugin.spec b/maven-timestamp-plugin.spec
index 3288b37..8f8558a 100644
--- a/maven-timestamp-plugin.spec
+++ b/maven-timestamp-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-timestamp-plugin
-Version: 1.0
-Release: 6%{?dist}
+Version: 1.1
+Release: 1%{?dist}
Summary: Provides formatted timestamps for maven builds
Group: Development/Libraries
@@ -8,12 +8,9 @@ License: ASL 2.0
URL:
http://code.google.com/p/maven-timestamp-plugin
### upstream only provides binaries or source without build scripts
# tar creation instructions
-# svn export
http://maven-timestamp-plugin.googlecode.com/svn/tags/maven-timestamp-plu...
maven-timestamp-plugin
-# tar cf maven-timestamp-plugin-1.0.tar maven-timestamp-plugin
-# xz maven-timestamp-plugin-1.0.tar
-Source0: maven-timestamp-plugin-1.0.tar.xz
-# remove previous timestamp plugin version from build
-Patch0: 001_build_without_timestamps.patch
+# svn export
http://maven-timestamp-plugin.googlecode.com/svn/tags/maven-timestamp-plu...
maven-timestamp-plugin
+# tar caf maven-timestamp-plugin-1.1.tar.xz maven-timestamp-plugin
+Source0: maven-timestamp-plugin-1.1.tar.xz
BuildArch: noarch
BuildRequires: java-devel
@@ -30,13 +27,11 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-timestamp-plugin
Requires: java
Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
%description
There are a few ways to get a timestamp in your maven build. Unfortunately
most of them make you jump through giant hoops. This maven plugin makes it
@@ -57,7 +52,6 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n %{name}
-%patch0 -p 1
cat > README << EOT
%{name}-%{version}
@@ -66,15 +60,13 @@ EOT
%build
-mvn-local install javadoc:javadoc
-
+mvn-rpmbuild install javadoc:javadoc
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_javadir}
# jar
-install -Dp -m 644 target/%{name}-%{version}.jar \
+install -Dp -m 644 target/%{name}-%{version}-SNAPSHOT.jar \
$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# javadoc
@@ -82,31 +74,27 @@ 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
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
-
-%add_to_maven_depmap com.keyboardsamurais.maven %{name} %{version} JPP %{name}
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
%files
-%defattr(-,root,root,-)
%doc README
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%{_javadir}/*
%files javadoc
-%defattr(-,root,root,-)
%{_javadocdir}/%{name}
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
%changelog
+* Tue Jul 5 2011 Alexander Kurtakov <akurtako(a)redhat.com> 1.1-1
+- Update to new upstream release (1.1).
+- Fix FTBFS.
+- Adapt to current guidelines.
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.0-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 788e743..a69bc3b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c7316be3a7a04d5d08c54246673749b maven-timestamp-plugin-1.0.tar.xz
+bab8eb074d84983e5588a047a7c8b6e7 maven-timestamp-plugin-1.1.tar.xz