From 349cf2373bc4ed844799d0f519d952d3789173e9 Mon Sep 17 00:00:00 2001
From: Marek Goldmann <goldmann@fedoraproject.org>
Date: Oct 18 2012 09:32:21 +0000
Subject: - Upstream release 1.5.3

- Change build system to Maven
- Cleanups

---

diff --git a/.gitignore b/.gitignore
index 86e8ac9..1075ae2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /xml-security-notest.patch
 /xmlsec-1.4.5.pom
 /xml-security-component-info.xml
+/xml-security-src-1_5_3.zip
diff --git a/sources b/sources
index e06f678..0df3229 100644
--- a/sources
+++ b/sources
@@ -1,6 +1 @@
-a5d45bf2eb369fcc323519733beea25c  xml-security-src-1_4_5.zip
-0d9983d38ba639be3080aae24e7a1260  xml-security-build_xml.patch
-02135082e40706eb78e8ee70e9cfaf2a  xml-security-disable-test-fail.patch
-2be9cf306456e0a603895901d42a56b7  xml-security-notest.patch
-2f3bbc467862598e41d4b42e7bd18267  xmlsec-1.4.5.pom
-3ac150f51762419881b85862d386debd  xml-security-component-info.xml
+7a13bb434bd492bdfceced269e365f08  xml-security-src-1_5_3.zip
diff --git a/xml-security.spec b/xml-security.spec
index 151d15f..019b534 100644
--- a/xml-security.spec
+++ b/xml-security.spec
@@ -31,34 +31,42 @@
 %global oname xmlsec
 
 Name:           xml-security
-Version:        1.4.5
-Release:        4%{?dist}
+Version:        1.5.3
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Implementation of W3C security standards for XML
 License:        ASL 2.0
 URL:            http://santuario.apache.org/
 Group:          Development/Libraries
-Source0:        http://archive.apache.org/dist/santuario/java-library/xml-security-src-1_4_5.zip
-Source1:        xml-security-component-info.xml
-Source2:        http://repo1.maven.org/maven2/org/apache/santuario/xmlsec/1.4.5/xmlsec-1.4.5.pom
-Patch0:         xml-security-build_xml.patch
-Patch1:         xml-security-disable-test-fail.patch
-Patch2:         xml-security-notest.patch
-
-Requires:       java >= 0:1.5.0
+Source0:        http://archive.apache.org/dist/santuario/java-library/1_5_3/xml-security-src-1_5_3.zip
+
+Requires:       java
 Requires:       apache-commons-logging
 Requires:       log4j
-Requires:       xalan-j2 >= 0:2.7
-Requires:       xerces-j2 >= 0:2.7
-
-BuildRequires:  jpackage-utils >= 0:1.7.3
-BuildRequires:  java-devel >= 0:1.5.0
-BuildRequires:  ant
-BuildRequires:  ant-junit
+Requires:       xalan-j2
+Requires:       xerces-j2
+Requires:       xml-commons-apis
+Requires:       bouncycastle
+
+BuildRequires:  jpackage-utils
+BuildRequires:  java-devel
+BuildRequires:  maven
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-release-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-surefire-plugin
+BuildRequires:  maven-surefire-provider-junit4
+BuildRequires:  junit
 BuildRequires:  apache-commons-logging
 BuildRequires:  log4j
-BuildRequires:  xalan-j2 >= 0:2.7
-BuildRequires:  xerces-j2 >= 0:2.7
+BuildRequires:  xalan-j2
+BuildRequires:  xerces-j2
+BuildRequires:  xml-commons-apis
+BuildRequires:  bouncycastle
+
 BuildArch:      noarch
 
 %description
@@ -84,46 +92,28 @@ Group:          Documentation
 Samples for %{name}.
 
 %prep
-%setup -q -n xml-security-1_4_5
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-
-find . -name \*.jar -type f -exec rm -f {} \;
-
-mkdir -p libs/endorsed
-pushd libs
-ln -s $(build-classpath commons-logging)
-ln -s $(build-classpath commons-logging-api)
-ln -s $(build-classpath junit)
-ln -s $(build-classpath log4j)
-ln -s $(build-classpath xalan-j2)
-ln -s $(build-classpath xalan-j2-serializer)
-ln -s $(build-classpath xerces-j2)
-ln -s $(build-classpath xml-commons-jaxp-1.3-apis)
-popd
+%setup -q -n xml-security-1_5_3
+
+sed -i "s|bcprov-jdk15on|bcprov-jdk16|" pom.xml
 
 %build
-ant -Djava.endorsed.dirs=libs build.src build.jar build.docs
-# FIXME: (dwalluck) AES key size above 128 will fail with default Sun JCE provider policy
-# ant -Djava.endorsed.dirs=libs -Dlib.xalan.3=libs/xml-commons-jaxp-1.3-apis.jar test
+mvn-rpmbuild package javadoc:aggregate
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 build/%{oname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 target/%{oname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{oname}.jar
-install -m 644 build/xmlsecSamples-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-samples.jar
-ln -s %{name}-samples.jar $RPM_BUILD_ROOT%{_javadir}/xmlsecSamples.jar
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/docs/html/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{oname}.pom
-%add_maven_depmap JPP-%{oname}.pom %{oname}.jar -a "org.apache.santuario:xmlsec"
+install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_maven_depmap
 
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr src_samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -pr samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %files
 %doc LICENSE
@@ -137,11 +127,14 @@ cp -pr src_samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %files demo
 %doc LICENSE
-%{_javadir}/%{name}-samples.jar
-%{_javadir}/xmlsecSamples.jar
 %{_datadir}/%{name}
 
 %changelog
+* Thu Oct 18 2012 Marek Goldmann <mgoldman@redhat.com> - 0:1.5.3-1
+- Upstream release 1.5.3
+- Change build system to Maven
+- Cleanups
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild