commit c8dbe79fc79637118d02ef2d8e53505e18ef2824
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Thu Aug 16 13:11:13 2012 +0200
Install ASL 2.0 license
- Remove rpm bug workaround
buildnumber-maven-plugin.spec | 18 ++++++++++--------
sources | 1 +
2 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/buildnumber-maven-plugin.spec b/buildnumber-maven-plugin.spec
index 63e6bf5..05d067f 100644
--- a/buildnumber-maven-plugin.spec
+++ b/buildnumber-maven-plugin.spec
@@ -1,16 +1,17 @@
Name: buildnumber-maven-plugin
Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Build Number Maven Plugin
Group: Development/Libraries
-License: MIT
+License: MIT and ASL 2.0
URL: http://svn.codehaus.org/mojo/tags/buildnumber-maven-plugin-1.1
# svn export http://svn.codehaus.org/mojo/tags/buildnumber-maven-plugin-1.1 buildnumber-maven-plugin
# tar caf buildnumber-maven-plugin-1.1.tar.xz buildnumber-maven-plugin
Source0: buildnumber-maven-plugin-1.1.tar.xz
Source1: %{name}-depmap.xml
+Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildArch: noarch
@@ -84,6 +85,7 @@ API documentation for %{name}.
%prep
%setup -q -n %{name}
+cp -p %{SOURCE2} .
%pom_remove_dep com.google.code.maven-scm-provider-svnjava:maven-scm-provider-svnjava
%pom_remove_dep org.tmatesoft.svnkit:svnkit
@@ -114,22 +116,22 @@ install -pm 644 pom.xml \
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%files
-%doc LICENSE.txt
+%doc LICENSE.txt LICENSE-2.0.txt
%{_javadir}/%{name}.jar
%{_mavenpomdir}/JPP-%{name}.pom
%{_mavendepmapfragdir}/%{name}
%files javadoc
-%doc LICENSE.txt
+%doc LICENSE.txt LICENSE-2.0.txt
%{_javadocdir}/%{name}
%changelog
+* Thu Aug 16 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1-2
+- Install ASL 2.0 license
+- Remove rpm bug workaround
+
* Wed Jul 25 2012 Tomas Radej <tradej at redhat.com> - 1.1-1
- Updated to latest upstream version
- Replaced patches with pom macros
diff --git a/sources b/sources
index 148075e..bb18cf3 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
df943f77ebce98a2afc9ce7f0b2f44fa buildnumber-maven-plugin-1.1.tar.xz
+3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt