diff --git a/.gitignore b/.gitignore index 4e33dd5..99c97c2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /xml-security-src-1_5_3.zip /xml-security-src-1_5_5.zip /xml-security-src-1_5_7.zip +/xml-security-src-1_5_8.zip diff --git a/sources b/sources index 1576d10..90cdaa2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -00d503a0d8d9cc52de6031951328e688 xml-security-src-1_5_7.zip +3abb4706eaf0361ed0e04cedeb29ed54 xml-security-src-1_5_8.zip diff --git a/xml-security.spec b/xml-security.spec index b4ccde8..20d7a93 100644 --- a/xml-security.spec +++ b/xml-security.spec @@ -32,7 +32,7 @@ %global _version %(echo %{version} | tr . _ ) Name: xml-security -Version: 1.5.7 +Version: 1.5.8 Release: 1%{?dist} Epoch: 0 Summary: Implementation of W3C security standards for XML @@ -45,7 +45,6 @@ Patch0: %{name}-1.5.7-removed-tests.patch BuildRequires: maven-local BuildRequires: maven-shared BuildRequires: maven-release-plugin -BuildRequires: maven-surefire-provider-junit BuildRequires: mvn(commons-logging:commons-logging) BuildRequires: mvn(junit:junit) BuildRequires: mvn(log4j:log4j:1.2.17) @@ -91,9 +90,10 @@ rm -r src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java \ src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java \ src/test/java/org/apache/xml/security/test/encryption/XMLEncryption11Test.java +%mvn_file :%{oname} %{name} %{oname} + %build -%mvn_file :%{oname} %{name} %{oname} %mvn_build %install @@ -103,16 +103,20 @@ install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name} cp -pr samples/* $RPM_BUILD_ROOT%{_datadir}/%{name} %files -f .mfiles -%doc LICENSE NOTICE +%license LICENSE NOTICE %files javadoc -f .mfiles-javadoc -%doc LICENSE NOTICE +%license LICENSE NOTICE %files demo -%doc LICENSE NOTICE +%license LICENSE NOTICE %{_datadir}/%{name} %changelog +* Sat Feb 14 2015 gil cattaneo 0:1.5.8-1 +- update to 1.5.8 +- introduce license macro + * Tue Oct 28 2014 gil cattaneo 0:1.5.7-1 - update to 1.5.7 (rhbz#1045257,1157992. security fix for CVE-2013-4517)