commit fb09da77bc9436fa527766e3fce4df2ebfcb0443
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 3 10:32:28 2015 +0100
introduce license macro
glassfish-ha-api.spec | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/glassfish-ha-api.spec b/glassfish-ha-api.spec
index e45c426..5c96d65 100644
--- a/glassfish-ha-api.spec
+++ b/glassfish-ha-api.spec
@@ -1,6 +1,6 @@
Name: glassfish-ha-api
Version: 3.1.9
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: High Availability APIs and SPI
License: CDDL or GPLv2 with exceptions
URL:
http://glassfish.java.net/
@@ -11,11 +11,8 @@ Source0: %{name}-%{version}-src-svn.tar.gz
# glassfish-ha-api package don't include the license file
Source1: glassfish-LICENSE.txt
-BuildRequires: java-devel
BuildRequires: jvnet-parent
-
BuildRequires: glassfish-hk2-api
-
# test dep
BuildRequires: junit
@@ -66,21 +63,25 @@ sed -i
"s|<artifactId>hk2</artifactId>|<artifactId>hk2-api</artifactId>|"
pom.xm
cp -p %{SOURCE1} LICENSE.txt
sed -i 's/\r//' LICENSE.txt
+%mvn_file :ha-api %{name}
+
%build
-%mvn_file :ha-api %{name}
%mvn_build
%install
%mvn_install
%files -f .mfiles
-%doc LICENSE.txt
+%license LICENSE.txt
%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%license LICENSE.txt
%changelog
+* Tue Feb 03 2015 gil cattaneo <puntogil(a)libero.it> 3.1.9-5
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
3.1.9-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -92,4 +93,4 @@ sed -i 's/\r//' LICENSE.txt
- minor changes to adapt to current guideline
* Tue Oct 02 2012 gil cattaneo <puntogil(a)libero.it> 3.1.9-1
-- initial rpm
\ No newline at end of file
+- initial rpm