- add commons-logging and commons-io to Requires and fop script

- removed uneeded xalan-j2, xmlcommons and xerces from dependencies

OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=17

xmlgraphics-fop.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 25 07:44:09 UTC 2012 - mvyskocil@suse.com
+
+- add commons-logging and commons-io to Requires and fop script 
+- removed uneeded xalan-j2, xmlcommons and xerces from dependencies
+
 -------------------------------------------------------------------
 Wed Oct 24 14:04:38 UTC 2012 - mvyskocil@suse.com
 

xmlgraphics-fop.script

@@ -24,7 +24,7 @@ fi
 
 # Rest of the configuration
 MAIN_CLASS=org.apache.fop.cli.Main
-BASE_JARS="xmlgraphics-fop xmlgraphics-commons batik-all xml-commons-jaxp-1.3-apis excalibur/avalon-framework-impl excalibur/avalon-framework-api xerces-j2 xalan-j2 xalan-j2-serializer"
+BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-logging commons-io excalibur/avalon-framework-impl excalibur/avalon-framework-api batik-all"
 
 # Set parameters
 set_jvm

xmlgraphics-fop.spec

@@ -45,14 +45,12 @@ Patch1:         xmlgraphics-fop-cli.patch
 Url:            http://xmlgraphics.apache.org/fop/
 Requires(post):    jpackage-utils >= 1.7.4
 Requires(postun):  jpackage-utils >= 1.7.4
+Requires:       commons-io >= 2.4
+Requires:       commons-logging
 Requires:       excalibur-avalon-framework-api
 Requires:       excalibur-avalon-framework-impl
-Requires:       excalibur-avalon-logkit
-Requires:       java >= 1.5.0
+Requires:       java >= 1.6.0
 Requires:       jpackage-utils >= 1.7.4
-Requires:       xalan-j2
-Requires:       xerces-j2
-Requires:       xml-commons-jaxp-1.3-apis
 Requires:       xmlgraphics-batik
 Requires:       xmlgraphics-commons >= 1.5
 BuildRequires:  ant >= 1.6.5
@@ -61,9 +59,8 @@ BuildRequires:  ant-trax
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  excalibur-avalon-framework-api
 BuildRequires:  excalibur-avalon-framework-impl
-BuildRequires:  excalibur-avalon-logkit
 BuildRequires:  gpg2
-BuildRequires:  java-devel >= 1.5.0
+BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  java-javadoc
 BuildRequires:  jpackage-utils >= 1.7.4
 BuildRequires:  junit
@@ -71,9 +68,6 @@ BuildRequires:  libxslt
 BuildRequires:  qdox >= 1.12
 BuildRequires:  servlet_api
 BuildRequires:  unzip
-BuildRequires:  xalan-j2
-BuildRequires:  xerces-j2
-BuildRequires:  xml-commons-jaxp-1.3-apis
 BuildRequires:  xmlgraphics-batik
 BuildRequires:  xmlgraphics-batik-javadoc
 BuildRequires:  xmlgraphics-commons >= 1.5
@@ -135,9 +129,6 @@ ln -s $(build-classpath xmlgraphics-batik/script)
 ln -s $(build-classpath xmlgraphics-batik/transcoder)
 ln -s $(build-classpath xmlgraphics-batik/util)
 ln -s $(build-classpath xmlgraphics-batik/xml)
-ln -s $(build-classpath xalan-j2)
-ln -s $(build-classpath xalan-j2-serializer)
-ln -s $(build-classpath xerces-j2)
 ln -s $(build-classpath xmlgraphics-commons)
 ln -s $(build-classpath xmlunit)
 ln -s $(build-classpath qdox)
@@ -164,51 +155,49 @@ done
 
 %install
 # jars
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-install -m 644 build/%{bname}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+mkdir -p %{buildroot}%{_javadir}
+install -m 644 build/%{bname}.jar %{buildroot}%{_javadir}/%{name}.jar
 %add_to_maven_depmap org.apache.xmlgraphics %{bname} %{version} JPP %{name}
 
 # pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -pm 644 build/maven/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+install -d -m 755 %{buildroot}%{_datadir}/maven2/poms
+install -pm 644 build/maven/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
 
 # script
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-cp -p %{SOURCE1}  $RPM_BUILD_ROOT%{_bindir}/%{name}
-cp -p %{SOURCE3}  $RPM_BUILD_ROOT%{_bindir}/%{name}-fontmetrics
-cp -p %{SOURCE4}  $RPM_BUILD_ROOT%{_bindir}/%{name}-fontlist
+mkdir -p %{buildroot}%{_bindir}
+cp -p %{SOURCE1}  %{buildroot}%{_bindir}/%{name}
+cp -p %{SOURCE3}  %{buildroot}%{_bindir}/%{name}-fontmetrics
+cp -p %{SOURCE4}  %{buildroot}%{_bindir}/%{name}-fontlist
 # compat symlink
 ln -s %{name}             %{buildroot}%{_bindir}/%{bname}
 ln -s %{name}-fontmetrics %{buildroot}%{_bindir}/%{bname}-fontmetrics
 ln -s %{name}-fontlist    %{buildroot}%{_bindir}/%{bname}-fontlist
 
 # data
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr hyph $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr conf $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -pr hyph %{buildroot}%{_datadir}/%{name}
+cp -pr conf %{buildroot}%{_datadir}/%{name}
 
 # javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
 
 # Manpages
-mkdir -p $RPM_BUILD_ROOT%_mandir/man1
+mkdir -p %{buildroot}%_mandir/man1
 for m in *.1; do
   gzip $m
 done
-cp -vi *.1.gz $RPM_BUILD_ROOT%_mandir/man1
+cp -vi *.1.gz %{buildroot}%_mandir/man1
 
 # Remove prefix xmlgraphics to make also the linked manpage version available
-pushd $RPM_BUILD_ROOT%_mandir/man1
+pushd %{buildroot}%_mandir/man1
 for m in *.1.gz; do
   ln -s $m ${m#*-}
 done
 popd 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 %update_maven_depmap
@@ -227,7 +216,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{_bindir}/%{bname}-fontmetrics
 %attr(0755,root,root) %{_bindir}/%{name}-fontlist
 %attr(0755,root,root) %{_bindir}/%{bname}-fontlist
-%{_javadir}/%{name}*.jar
+%{_javadir}/%{name}.jar
 %{_datadir}/%{name}
 %{_datadir}/maven2/*
 %config %{_mavendepmapfragdir}/*
@@ -235,7 +224,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog