Fix FTBFS rhbz #993143

xml-commons-resolver.spec

@@ -1,6 +1,6 @@
 Name:           xml-commons-resolver
 Version:        1.2
-Release:        13%{?dist}
+Release:        14%{?dist}
 Epoch:          0
 Summary:        Resolver subproject of xml-commons
 License:        ASL 2.0
@@ -17,8 +17,6 @@ Source8:        %{name}-xread.1
 
 Requires:       xml-commons-apis
 Requires:       jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  ant
 BuildRequires:  jpackage-utils
@@ -53,8 +51,6 @@ sed -i -e 's|org.apache.xml.resolver.Catalog|org.apache.xml.resolver.apps.resolv
 ant -f resolver.xml jar javadocs
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # inject OSGi manifests
 mkdir -p META-INF
 cp -p %{SOURCE4} META-INF/MANIFEST.MF
@@ -62,11 +58,9 @@ touch META-INF/MANIFEST.MF
 zip -u build/resolver.jar META-INF/MANIFEST.MF
 
 # Jars
-install -pD -T build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xml-resolver-%{version}.jar
+install -p -m 644 build/resolver.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
+ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/xml-resolver.jar
-# Jar versioning
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 
 # Javadocs
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -85,20 +79,11 @@ install -p -m 644 %{SOURCE7} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xparse.1
 install -p -m 644 %{SOURCE8} ${RPM_BUILD_ROOT}%{_mandir}/man1/xml-xread.1
 
 # Pom
-install -pD -T -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-xml-resolver.pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
-%add_to_maven_depmap xml-resolver xml-resolver %{version} JPP xml-resolver
+install -p -m 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
 
 %files
-%defattr(-,root,root,-)
 %doc KEYS LICENSE.resolver.txt
 %{_mavendepmapfragdir}/*
 %{_mavenpomdir}/*
@@ -107,11 +92,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{_bindir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 %doc LICENSE.resolver.txt
 
 %changelog
+* Thu Aug 15 2013 Mat Booth <fedora@matbooth.co.uk> - 0:1.2-14
+- Fix FTBFS rhbz #993143
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild