[batik/f18] Fix license tag
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Fri Aug 24 10:40:19 UTC 2012
commit df8e468ec988b565a0402121259316a8d0b6050e
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Fri Aug 24 12:39:13 2012 +0200
Fix license tag
- Install LICENSE and NOTICE with javadoc package
- Remove RPM bug workaround
- Update to current packaging guidelines
batik.spec | 61 ++++++++++++-----------------------------------------------
1 files changed, 13 insertions(+), 48 deletions(-)
---
diff --git a/batik.spec b/batik.spec
index d317efa..feb1f9f 100644
--- a/batik.spec
+++ b/batik.spec
@@ -1,8 +1,8 @@
Name: batik
Version: 1.8
-Release: 0.3.svn1230816%{?dist}
+Release: 0.4.svn1230816%{?dist}
Summary: Scalable Vector Graphics for Java
-License: ASL 2.0
+License: ASL 2.0 and W3C
URL: http://xml.apache.org/batik/
Group: Applications/Multimedia
#Source0: http://apache.crihan.fr/dist/xmlgraphics/batik/batik-src-%%{version}.zip
@@ -61,15 +61,12 @@ BuildRequires: java-javadoc >= 1:1.6.0
BuildRequires: rhino-javadoc
Requires: java >= 1:1.6.0
+Requires: jpackage-utils
#full support for tiff
Requires: jai-imageio-core
Requires: rhino >= 1.5
Requires: xalan-j2
Requires: xml-commons-apis >= 1.3.04
-Requires: jpackage-utils
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
%description
@@ -135,6 +132,7 @@ Batik SVG slideshow.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
+Requires: jpackage-utils
%description javadoc
Javadoc for %{name}.
@@ -300,50 +298,10 @@ cp -pr contrib resources samples test-resources test-sources \
chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/rasterizertask/build.sh
chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/charts/convert.sh
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%post squiggle
-%update_maven_depmap
-
-%postun squiggle
-%update_maven_depmap
-
-%post svgpp
-%update_maven_depmap
-
-%postun svgpp
-%update_maven_depmap
-
-%post ttf2svg
-%update_maven_depmap
-
-%postun ttf2svg
-%update_maven_depmap
-
-%post rasterizer
-%update_maven_depmap
-
-%postun rasterizer
-%update_maven_depmap
-
-%post slideshow
-%update_maven_depmap
-
-%postun slideshow
-%update_maven_depmap
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
%files
-%doc KEYS LICENSE MAINTAIN NOTICE README
+%doc LICENSE NOTICE
+%doc KEYS MAINTAIN README
%{_mavenpomdir}/JPP.%{name}-*pom
%{_mavendepmapfragdir}/%{name}
%{_javadir}/%{name}-all.jar
@@ -380,6 +338,7 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%attr(0755,root,root) %{_bindir}/slideshow
%files javadoc
+%doc LICENSE NOTICE
%{_javadocdir}/%{name}
%files demo
@@ -387,6 +346,12 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
+* Fri Aug 24 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.8-0.4.svn1230816
+- Fix license tag
+- Install LICENSE and NOTICE with javadoc package
+- Remove RPM bug workaround
+- Update to current packaging guidelines
+
* Thu Jul 19 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.8-0.3.svn1230816
- Add BR: zip
More information about the scm-commits
mailing list