update to 1.5.5

xml-security.spec

@@ -41,10 +41,24 @@ Source0:        http://archive.apache.org/dist/santuario/java-library/1_5_5/xml-
 # Certain tests fail with new JUnit
 Patch0:         %{name}-removed-tests.patch
 
+Requires:       java
+Requires:       apache-commons-logging
+Requires:       log4j
+Requires:       xalan-j2
+Requires:       xerces-j2
+Requires:       xml-commons-apis
+Requires:       bouncycastle
+
+BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
-BuildRequires:  maven-local
-BuildRequires:  maven-shared
+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
@@ -65,12 +79,15 @@ W3C standards :
 
 %package javadoc
 Summary:        Javadoc for %{name}
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
 
 %description javadoc
 Javadoc for %{name}.
 
 %package demo
 Summary:        Samples for %{name}
+Group:          Documentation
 
 %description demo
 Samples for %{name}.
@@ -83,19 +100,33 @@ sed -i "s|bcprov-jdk15on|bcprov-jdk16|" pom.xml
 
 %build
 
-%mvn_file :%{oname} %{name} %{oname} 
-%mvn_build
+mvn-rpmbuild package javadoc:aggregate
 
 %install
-%mvn_install
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -m 644 target/%{oname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{oname}.jar
+
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_maven_depmap
 
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -pr samples/* $RPM_BUILD_ROOT%{_datadir}/%{name}
 
-%files -f .mfiles
+%files
+%{_javadir}/%{name}.jar
+%{_javadir}/%{oname}.jar
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 %doc LICENSE NOTICE
 
-%files javadoc -f .mfiles-javadoc
+%files javadoc
+%{_javadocdir}/%{name}
 %doc LICENSE NOTICE
 
 %files demo