diff --git a/batik.spec b/batik.spec index eb470bc..a12e317 100644 --- a/batik.spec +++ b/batik.spec @@ -1,10 +1,9 @@ Name: batik Version: 1.8 -Release: 0.9.svn1230816%{?dist} +Release: 0.10.svn1230816%{?dist} Summary: Scalable Vector Graphics for Java 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 Source0: %{name}-repack-%{version}.zip Source1: %{name}.squiggle.script @@ -34,12 +33,11 @@ Patch1: %{name}-policy.patch # remove dependency on bundled rhino from pom Patch2: %{name}-script-remove-js.patch # SMIL in Fedora has been merged into xml-commons-apis-ext like it has -# been upstream. It's easier to take the OSGi manifests from Orbit +# been upstream. It's easier to take the OSGi manifests from Orbit # directly and patch this one. # # FIXME: move to 1.7 manifest from Eclipse Orbit project Patch3: %{name}-1.6-nosmilInDOMSVGManifest.patch -Requires: rhino >= 1.5 BuildArch: noarch @@ -76,7 +74,7 @@ purposes, such as viewing, generation or manipulation. Summary: Batik SVG browser Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -Requires: jpackage-utils >= 1.5, xerces-j2 >= 2.3 +Requires: xerces-j2 >= 2.3 %description squiggle The Squiggle SVG Browser lets you view SVG file, zoom, pan and rotate @@ -86,7 +84,7 @@ in the content and select text items in the image and much more. Summary: Batik SVG pretty printer Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -Requires: jpackage-utils >= 1.5, xerces-j2 >= 2.3 +Requires: xerces-j2 >= 2.3 %description svgpp The SVG Pretty Printer lets developers "pretty-up" their SVG files and @@ -97,7 +95,6 @@ also be used to modify the DOCTYPE declaration on SVG files. Summary: Batik SVG font converter Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -Requires: jpackage-utils >= 1.5 %description ttf2svg The SVG Font Converter lets developers convert character ranges from @@ -109,7 +106,7 @@ rendered exactly the same on all systems. Summary: Batik SVG rasterizer Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -Requires: jpackage-utils >= 1.5, xerces-j2 >= 2.3 +Requires: xerces-j2 >= 2.3 %description rasterizer The SVG Rasterizer is a utility that can convert SVG files to a raster @@ -122,22 +119,19 @@ to be added easily. Summary: Batik SVG slideshow Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -Requires: jpackage-utils >= 1.5, xerces-j2 >= 2.3 +Requires: xerces-j2 >= 2.3 %description slideshow Batik SVG slideshow. %package javadoc Summary: Javadoc for %{name} -Group: Documentation -Requires: jpackage-utils %description javadoc Javadoc for %{name}. %package demo Summary: Demo for %{name} -Group: Documentation Requires: %{name} = %{version}-%{release} %description demo @@ -255,10 +249,7 @@ cp -p %{name}-%{inner_version}/batik-rasterizer.jar \ install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir} for module in rasterizer slideshow squiggle svgpp ttf2svg; do install -pm 644 %{name}-$module.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}-$module.pom - %add_to_maven_depmap org.apache.xmlgraphics %{name}-$module %{version} JPP %{name}-$module - # compatibility depmap - %add_to_maven_depmap batik %{name}-$module %{version} JPP %{name}-$module - mv $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name} $RPM_BUILD_ROOT%{_mavendepmapfragdir}/%{name}-$module + %add_maven_depmap JPP-%{name}-$module.pom %{name}-$module.jar -a "%{name}:%{name}-$module" -f $module done # main pom files and maven depmaps @@ -266,9 +257,7 @@ for module in anim awt-util bridge codec css dom ext extension gui-util \ gvt parser script svg-dom svggen swing transcoder util xml; do install -pm 644 %{name}-$module.pom $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP.%{name}-%{name}-$module.pom - %add_to_maven_depmap org.apache.xmlgraphics %{name}-$module %{version} JPP/%{name} %{name}-$module - # compatibility depmap - %add_to_maven_depmap batik %{name}-$module %{version} JPP/%{name} %{name}-$module + %add_maven_depmap JPP.%{name}-%{name}-$module.pom %{name}/%{name}-$module.jar -a "%{name}:%{name}-$module" done @@ -297,42 +286,25 @@ chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/rasterizertask/build.sh chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/charts/convert.sh -%files +%files -f .mfiles %doc LICENSE NOTICE %doc KEYS MAINTAIN README -%{_mavenpomdir}/JPP.%{name}-*pom -%{_mavendepmapfragdir}/%{name} %{_javadir}/%{name}-all.jar -%{_javadir}/batik +%dir %{_javadir}/batik -%files squiggle -%{_javadir}/%{name}-squiggle.jar -%{_mavendepmapfragdir}/%{name}-squiggle -%{_mavenpomdir}/JPP-%{name}-squiggle.pom +%files squiggle -f .mfiles-squiggle %attr(0755,root,root) %{_bindir}/squiggle -%files svgpp -%{_javadir}/%{name}-svgpp.jar -%{_mavendepmapfragdir}/%{name}-svgpp -%{_mavenpomdir}/JPP-%{name}-svgpp.pom +%files svgpp -f .mfiles-svgpp %attr(0755,root,root) %{_bindir}/svgpp -%files ttf2svg -%{_javadir}/%{name}-ttf2svg.jar -%{_mavendepmapfragdir}/%{name}-ttf2svg -%{_mavenpomdir}/JPP-%{name}-ttf2svg.pom +%files ttf2svg -f .mfiles-ttf2svg %attr(0755,root,root) %{_bindir}/ttf2svg -%files rasterizer -%{_javadir}/%{name}-rasterizer.jar -%{_mavendepmapfragdir}/%{name}-rasterizer -%{_mavenpomdir}/JPP-%{name}-rasterizer.pom +%files rasterizer -f .mfiles-rasterizer %attr(0755,root,root) %{_bindir}/rasterizer -%files slideshow -%{_javadir}/%{name}-slideshow.jar -%{_mavendepmapfragdir}/%{name}-slideshow -%{_mavenpomdir}/JPP-%{name}-slideshow.pom +%files slideshow -f .mfiles-slideshow %attr(0755,root,root) %{_bindir}/slideshow %files javadoc @@ -344,6 +316,9 @@ chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/charts/convert.sh %changelog +* Thu Aug 08 2013 Stanislav Ochotnicky - 1.8-0.10.svn1230816 +- Update to latest packaging guidelines + * Sat Aug 03 2013 Fedora Release Engineering - 1.8-0.9.svn1230816 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild