diff --git a/apache-ivy.changes b/apache-ivy.changes index 795c744..548ccf0 100644 --- a/apache-ivy.changes +++ b/apache-ivy.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 18 09:46:01 UTC 2015 - tchvatal@suse.com + +- Fix build with new javapackages-tools + ------------------------------------------------------------------- Tue Jul 8 11:01:30 UTC 2014 - tchvatal@suse.com diff --git a/apache-ivy.spec b/apache-ivy.spec index 88a4bdd..7a1c44e 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -1,7 +1,7 @@ # # spec file for package apache-ivy # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -58,7 +58,7 @@ JavaDoc documentation for %{name} %setup -q # Fix messed-up encodings -for F in RELEASE_NOTES README LICENSE NOTICE CHANGES.txt +for F in README LICENSE NOTICE do sed 's/\r//' $F |iconv -f iso8859-1 -t utf8 >$F.utf8 touch -r $F $F.utf8 @@ -119,7 +119,7 @@ install %{SOURCE1} %{buildroot}%{_mandir}/man1/ivy.1 %attr(755,root,root) %{_bindir}/* %attr(644,root,root) %{_mandir}/man1/* %{_mavenpomdir}/JPP-ivy.pom -%{_mavendepmapfragdir}/%{name} +%{_datadir}/maven-metadata/%{name}.xml %files javadoc %defattr(-,root,root,-)