[jasypt] introduce license macro

gil gil at fedoraproject.org
Fri Feb 6 14:26:47 UTC 2015


commit c6c802d924f0d62e58ddf4536b3060b711de1157
Author: gil <puntogil at libero.it>
Date:   Fri Feb 6 15:26:29 2015 +0100

    introduce license macro

 jasypt.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/jasypt.spec b/jasypt.spec
index 1370cae..64fa041 100644
--- a/jasypt.spec
+++ b/jasypt.spec
@@ -1,6 +1,6 @@
 Name:          jasypt
 Version:       1.9.0
-Release:       8%{?dist}
+Release:       9%{?dist}
 Summary:       Java Simplified Encryption
 License:       ASL 2.0
 Url:           http://www.jasypt.org/
@@ -14,8 +14,6 @@ Patch0:        %{name}-%{version}-use-system-commons-codec.patch
 Patch1:        %{name}-%{version}-StandardStringDigester.patch
 Patch2:        %{name}-%{version}-StandardPBEStringEncryptor.patch
 
-BuildRequires: java-devel
-
 # test deps
 BuildRequires: apache-commons-lang
 BuildRequires: apache-commons-logging
@@ -29,7 +27,6 @@ BuildRequires: tomcat-servlet-3.0-api
 BuildRequires: maven-local
 BuildRequires: maven-assembly-plugin
 BuildRequires: maven-source-plugin
-BuildRequires: maven-surefire-provider-junit
 
 BuildArch:     noarch
 
@@ -72,20 +69,26 @@ This package contains javadoc for %{name}.
 %pom_remove_dep javax.servlet:servlet-api
 %pom_add_dep org.apache.tomcat:tomcat-servlet-api::provided
 
-%build
 %mvn_file :%{name} %{name}
+
+%build
+
 %mvn_build
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc *.txt
+%doc ChangeLog.txt README.txt RELEASING.txt USAGE.txt
+%license LICENSE.txt NOTICE.txt
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 
 %changelog
+* Fri Feb 06 2015 gil cattaneo <puntogil at libero.it> 1.9.0-9
+- introduce license macro
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -110,4 +113,4 @@ This package contains javadoc for %{name}.
 - fixed apache-commons-codec gId
 
 * Fri May 18 2012 gil cattaneo <puntogil at libero.it> 1.9.0-1
-- initial rpm
\ No newline at end of file
+- initial rpm


More information about the scm-commits mailing list