[springframework-batch] introduce license macro

gil gil at fedoraproject.org
Wed Feb 11 20:52:23 UTC 2015


commit 58c007dae40c52030b06605c896b55a327bc5b99
Author: gil <puntogil at libero.it>
Date:   Wed Feb 11 21:52:02 2015 +0100

    introduce license macro

 springframework-batch.spec |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/springframework-batch.spec b/springframework-batch.spec
index b8514b7..3e89180 100644
--- a/springframework-batch.spec
+++ b/springframework-batch.spec
@@ -4,7 +4,7 @@
 %global with_vpp 0
 Name:          springframework-batch
 Version:       2.1.9
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Tools for enterprise batch or bulk processing
 License:       ASL 2.0
 URL:           http://www.springsource.org/spring-batch
@@ -20,11 +20,7 @@ BuildRequires: mvn(com.thoughtworks.xstream:xstream)
 BuildRequires: mvn(commons-collections:commons-collections)
 BuildRequires: mvn(commons-dbcp:commons-dbcp)
 BuildRequires: mvn(commons-io:commons-io)
-%if %{?fedora} > 19
 BuildRequires: mvn(hsqldb:hsqldb:1)
-%else
-BuildRequires: mvn(hsqldb:hsqldb)
-%endif
 BuildRequires: mvn(javax.mail:mail)
 #BuildRequires: geronimo-jpa
 BuildRequires: mvn(javax.persistence:persistence-api)
@@ -37,6 +33,7 @@ BuildRequires: mvn(org.eclipse.gemini.blueprint:gemini-blueprint-core)
 BuildRequires: mvn(org.apache.felix:org.osgi.core)
 BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jms_1.1_spec)
 BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec)
+BuildRequires: mvn(org.apache.geronimo.specs:specs:pom:)
 BuildRequires: mvn(org.codehaus.jackson:jackson-mapper-asl)
 BuildRequires: mvn(org.codehaus.jettison:jettison)
 BuildRequires: mvn(org.codehaus.woodstox:woodstox-core-asl)
@@ -294,12 +291,16 @@ sed -i "s|<version>1.2.14</version>|<version>1.2.17</version>|" spring-batch-par
 
 %files -f .mfiles
 %dir %{_javadir}/%{name}
-%doc README.md license.txt notice.txt
+%doc README.md
+%license license.txt notice.txt
 
 %files javadoc -f .mfiles-javadoc
-%doc license.txt notice.txt
+%license license.txt notice.txt
 
 %changelog
+* Wed Feb 11 2015 gil cattaneo <puntogil at libero.it> 2.1.9-3
+- introduce license macro
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list