[openid4java] introduce license macro
gil
gil at fedoraproject.org
Wed Feb 11 15:02:19 UTC 2015
commit fc8cc7418d600c2009b8bfe8799c7da62bf5d517
Author: gil <puntogil at libero.it>
Date: Wed Feb 11 16:02:04 2015 +0100
introduce license macro
openid4java.spec | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/openid4java.spec b/openid4java.spec
index b26081a..87494d7 100644
--- a/openid4java.spec
+++ b/openid4java.spec
@@ -3,7 +3,7 @@
Name: openid4java
Version: 0.9.8
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: This library allows you to OpenID-enable your Java web-app
License: ASL 2.0
URL: http://code.google.com/p/openid4java/
@@ -11,8 +11,6 @@ Source0: http://openid4java.googlecode.com/files/openid4java-%{fullversion
# build fix for ehcache-core >= 2.x
Patch0: %{name}-0.9.6.662-ehcache-core.patch
-BuildRequires: java-devel
-
BuildRequires: mvn(com.google.inject:guice)
BuildRequires: mvn(commons-codec:commons-codec)
BuildRequires: mvn(commons-logging:commons-logging)
@@ -126,11 +124,12 @@ rm -r test/src/org/openid4java/consumer/EhcacheNonceVerifierTest.java
%pom_add_dep xml-apis:xml-apis::test
%pom_xpath_set "pom:dependencyManagement/pom:dependencies/pom:dependency[pom:artifactId='log4j']/pom:version" "1.2.17"
-%build
-
%mvn_file :%{name} %{name}
%mvn_file :%{name} %{name}-nodeps
%mvn_alias :%{name} "org.openid4java:openid4java-nodeps"
+
+%build
+
# @ random tests fails
# e.g. Failed tests: testNonceCleanup(org.openid4java.consumer.JdbcNonceVerifierTest): expected:<0> but was:<3>
%mvn_build
@@ -141,12 +140,16 @@ rm -rf target/site/apidocs/javadoc.sh
%mvn_install
%files -f .mfiles
-%doc CHANGELOG LICENSE MAINTAINERS README TODO VERSION
+%doc CHANGELOG MAINTAINERS README TODO VERSION
+%license LICENSE
%files javadoc -f .mfiles-javadoc
-%doc LICENSE
+%license LICENSE
%changelog
+* Wed Feb 11 2015 gil cattaneo <puntogil at libero.it> 0.9.8-6
+- introduce license macro
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
@@ -167,4 +170,4 @@ rm -rf target/site/apidocs/javadoc.sh
- update to 0.9.7.720
* Fri Nov 16 2012 gil cattaneo <puntogil at libero.it> 0.9.6-1
-- initial rpm
\ No newline at end of file
+- initial rpm
More information about the scm-commits
mailing list