Merge commit 'd275e0f2b7db817a08236733e0c11041e1000589'

Conflicts: batik.spec
2014-03-06 10:34:28 +01:00 · 2014-03-06 10:34:28 +01:00 · 1d8da75640
commit 1d8da75640
parent 94a45483cc d275e0f2b7
2 changed files with 5 additions and 2 deletions
--- a/batik.spec
+++ b/batik.spec
@ -1,6 +1,6 @@
 Name:           batik
 Version:        1.8
-Release:        0.13.svn1230816%{?dist}
+Release:        0.14.svn1230816%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0 and W3C
 URL:            http://xml.apache.org/batik/
@ -308,6 +308,9 @@ chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/charts/convert.sh


 %changelog
+* Wed Mar 05 2014 Roland Grunberg <rgrunber@redhat.com> - 1.8-0.14.svn1230816
+- Remove provenance=W3C attribute from Import-Package. (rhbz #1073110)
+
 * Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.8-0.13.svn1230816
 - Use Requires: java-headless rebuild (#1067528)

--- a/2
+++ b/2
@ -1,2 +1,2 @@
 22b0950a3981da350816d19f39b29158  batik-repack-1.8.zip
-a1c9c666cbf529958cc567f44bd76abb  batik-1.7-orbit-manifests.tar.gz
+fdbb12c86065228a7f887adb4964c74e  batik-1.7-orbit-manifests.tar.gz