commit 7f620305e4d2da928ceef2e1cafc4765daf9c705
Author: gil <puntogil(a)libero.it>
Date: Thu Feb 5 14:20:57 2015 +0100
introduce license macro
hazelcast.spec | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
---
diff --git a/hazelcast.spec b/hazelcast.spec
index e279676..7abe1ee 100644
--- a/hazelcast.spec
+++ b/hazelcast.spec
@@ -1,13 +1,11 @@
Name: hazelcast
Version: 3.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Hazelcast CE In-Memory DataGrid
License: ASL 2.0
URL:
http://www.hazelcast.com/
Source0:
https://github.com/hazelcast/hazelcast/archive/v%{version}.tar.gz
-BuildRequires: java-devel
-
%if %{fedora} >= 21
BuildRequires: mvn(log4j:log4j:1.2.17)
%else
@@ -207,13 +205,13 @@ rm -rf hazelcast*/src/test/java/*
sed -i
"s|<log4j.version>1.2.12</log4j.version>|<log4j.version>1.2.17</log4j.version>|"
pom.xml
%endif
-%build
-
-
#%%mvn_package ":%%{name}-all" %%{name}
%mvn_package ":%{name}-root" %{name}
%mvn_package ":%{name}-hibernate*" %{name}-hibernate
%mvn_package ":%{name}-jca" %{name}-ra
+
+%build
+
# takes too much time and @ random fails
# e.g.
# [INFO] hazelcast ......................................... SUCCESS [49:00.842s]
@@ -228,32 +226,36 @@ sed -i
"s|<log4j.version>1.2.12</log4j.version>|<log4j.version>1.2.17</log4j.ver
%files -f .mfiles-%{name}
%dir %{_javadir}/%{name}
-%doc license.txt notice.txt README.md
+%doc README.md
+%license license.txt notice.txt
%files client -f .mfiles-%{name}-client
-%doc license.txt notice.txt
+%license license.txt notice.txt
%files cloud -f .mfiles-%{name}-cloud
-%doc license.txt notice.txt
+%license license.txt notice.txt
%files hibernate -f .mfiles-%{name}-hibernate
-%doc license.txt notice.txt
+%license license.txt notice.txt
%files ra -f .mfiles-%{name}-ra
-%doc license.txt notice.txt
+%license license.txt notice.txt
%if 0
%files spring -f .mfiles-%{name}-spring
-%doc license.txt notice.txt
+%license license.txt notice.txt
%endif
%files wm -f .mfiles-%{name}-wm
-%doc license.txt notice.txt
+%license license.txt notice.txt
%files javadoc -f .mfiles-javadoc
-%doc license.txt notice.txt
+%license license.txt notice.txt
%changelog
+* Tue Jan 20 2015 gil cattaneo <puntogil(a)libero.it> 3.2.2-2
+- introduce license macro
+
* Wed Jun 11 2014 gil cattaneo <puntogil(a)libero.it> 3.2.2-1
- update to 3.2.2
@@ -267,4 +269,4 @@ sed -i
"s|<log4j.version>1.2.12</log4j.version>|<log4j.version>1.2.17</log4j.ver
- update to 2.6.2
* Wed Jun 05 2013 gil cattaneo <puntogil(a)libero.it> 2.6-1
-- initial rpm
\ No newline at end of file
+- initial rpm