[jdbi] introduce license macro

gil gil at fedoraproject.org
Fri Feb 6 16:32:40 UTC 2015


commit 9cdf9332fa02f2909b27f22c9ca010b2d86d0c20
Author: gil <puntogil at libero.it>
Date:   Fri Feb 6 17:32:26 2015 +0100

    introduce license macro

 jdbi.spec |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/jdbi.spec b/jdbi.spec
index 8e259c7..d7d2899 100644
--- a/jdbi.spec
+++ b/jdbi.spec
@@ -1,17 +1,14 @@
 Name:          jdbi
 Version:       2.49
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       A SQL convenience library for Java
 License:       ASL 2.0
 URL:           http://jdbi.org/
 Source0:       https://github.com/brianm/jdbi/archive/%{name}-%{version}.tar.gz
 
-BuildRequires: java-devel
-
 BuildRequires: mvn(cglib:cglib)
 BuildRequires: mvn(com.fasterxml:classmate)
-#BuildRequires: mvn(log4j:log4j)
-BuildRequires: log4j12
+BuildRequires: mvn(log4j:log4j:1.2.17)
 BuildRequires: mvn(org.antlr:antlr-runtime)
 BuildRequires: mvn(org.antlr:stringtemplate)
 BuildRequires: mvn(org.slf4j:slf4j-api)
@@ -22,7 +19,6 @@ BuildRequires: mvn(org.springframework:spring-tx)
 
 BuildRequires: antlr3-tool
 BuildRequires: maven-local
-BuildRequires: maven-surefire-provider-junit
 #BuildRequires: mvn(org.antlr:antlr3-maven-plugin)
 
 # test deps
@@ -39,7 +35,7 @@ BuildRequires: mvn(org.springframework:spring-mock)
 # replace with BuildRequires: mvn(org.springframework:spring-test)
 BuildRequires: mvn(postgresql:postgresql)
 %endif
-Requires:      log4j12
+
 BuildArch:     noarch
 
 %description
@@ -73,6 +69,7 @@ find . -name "*.jar" -type f -delete
 %pom_remove_plugin :maven-assembly-plugin
 
 %pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId='cglib']/pom:artifactId" cglib
+%pom_xpath_set "pom:project/pom:dependencies/pom:dependency[pom:groupId='log4j']/pom:version" 1.2.17
 
 # disable embedded antlr3-runtime, cglib, and classmate copy
 %pom_remove_plugin :maven-shade-plugin
@@ -93,22 +90,27 @@ sed -i "s|org.junit.internal.matchers.StringContains|org.hamcrest.core.StringCon
 
 %pom_remove_dep org.springframework:spring-mock
 
+%mvn_file : %{name}
+
 %build
 
 # unavailable test deps
-%mvn_file : %{name}
 %mvn_build -f
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc CHANGES_PLANNED_FOR_3_0 CONTRIBUTORS LICENSE NOTICE README RELEASE_NOTES
+%doc CHANGES_PLANNED_FOR_3_0 CONTRIBUTORS README RELEASE_NOTES
+%license LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %changelog
+* Fri Feb 06 2015 gil cattaneo <puntogil at libero.it> 2.49-4
+- introduce license macro
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.49-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -119,4 +121,4 @@ sed -i "s|org.junit.internal.matchers.StringContains|org.hamcrest.core.StringCon
 - update to 2.49
 
 * Fri Sep 28 2012 gil cattaneo <puntogil at libero.it> 2.39.1-1
-- initial rpm
\ No newline at end of file
+- initial rpm


More information about the scm-commits mailing list