![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package batik checked in at Fri Feb 15 01:07:04 CET 2008. -------- --- batik/batik.changes 2007-08-29 14:54:32.000000000 +0200 +++ /mounts/work_src_done/NOARCH/batik/batik.changes 2008-01-29 15:14:15.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Jan 29 15:13:23 CET 2008 - toms@suse.de + +- Added additional source and created subpackage -javadoc + +------------------------------------------------------------------- +Mon Jan 28 08:33:41 CET 2008 - toms@suse.de + +- Reorganised installation directory: Installed all jar files under + %{_javadir} and created link from %{_datadir}/%{name} +- Corrected *sh.in files + +------------------------------------------------------------------- Old: ---- batik-1.7.tar.bz2 rasterizer.sh slideshow.sh squiggle.sh svgpp.sh ttf2svg.sh New: ---- batik-1.7-src.tar.bz2 batik-docs-1.7.tar.bz2 rasterizer.sh.in slideshow.sh.in squiggle.sh.in svgpp.sh.in ttf2svg.sh.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ batik.spec ++++++ --- /var/tmp/diff_new_pack.B20658/_old 2008-02-15 01:06:24.000000000 +0100 +++ /var/tmp/diff_new_pack.B20658/_new 2008-02-15 01:06:24.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package batik (Version 1.7) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -9,30 +9,33 @@ # + Name: batik License: The Apache Software License Group: Productivity/Graphics/Convertors Summary: Java based toolkit for viewing, generating or manipulating SVG graphics -Requires: jre1.3.x -#Version: svn482585 +#Requires: jre1.3.x Version: 1.7 -Release: 10 -URL: http://xmlgraphics.apache.org/batik -Source0: http://apache.mirroring.de/xml/batik/%{name}-%{version}.tar.bz2 +Release: 80 +Url: http://xmlgraphics.apache.org/batik +Source0: %{name}-%{version}-src.tar.bz2 +Source1: %{name}-docs-%{version}.tar.bz2 # Source1: http://apache.mirroring.de/xml/batik/%{name}-src-%{version}.zip -Source10: squiggle.sh -Source11: slideshow.sh -Source12: svgpp.sh -Source13: ttf2svg.sh -Source14: rasterizer.sh +Source10: squiggle.sh.in +Source11: slideshow.sh.in +Source12: svgpp.sh.in +Source13: ttf2svg.sh.in +Source14: rasterizer.sh.in BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArchitectures: noarch -%if %suse_version < 1020 -BuildRequires: ant ant-trax java-1_5_0-sun-devel java2-devel-packages unzip xerces-j2 xml-commons-apis xml-commons-resolver -%else -BuildRequires: ant ant-trax java-1_4_2-gcj-compat-devel unzip xerces-j2 xml-commons-apis xml-commons-resolver +Requires: xerces-j2 xalan-j2 xerces-j2-xml-apis +BuildArch: noarch +BuildRequires: ant ant-trax java-1_4_2-ibm-devel unzip xalan-j2 xerces-j2 xml-commons-apis xml-commons-resolver +#%if %suse_version < 1020 +#BuildRequires: ant ant-trax java-1_5_0-sun-devel java2-devel-packages unzip xerces-j2 xml-commons-apis xerces-j2 xalan-j2 xml-commons-resolver +#%else +#BuildRequires: ant ant-trax java-1_5_0-sun-devel unzip xerces-j2 xml-commons-apis xml-commons-resolver xerces-j2 xalan-j2 # ant-junit -%endif +#%endif %description Batik is a Java based toolkit for applications which handle images in @@ -53,34 +56,76 @@ -------- The Apache XML Project +%package javadoc +Group: Productivity/Graphics/Convertors +Summary: Javadoc Documentation for Batik +License: The Apache Software License + +%description javadoc +Javadoc documenation for batik + + + +Authors: +-------- + The Apache XML Project + %prep %setup -q -n %{name}-%{version} -#for i in %{S:10} %{S:11} %{S:12} %{S:13} %{S:14}; do -#x=$(basename $i "-sh") +for i in %{S:10} %{S:11} %{S:12} %{S:13} %{S:14}; do +#x=$(basename $i ".in") #x=$(echo $x| tr "-" ".") -#x=${i##*/} -#x=${x%%-sh} -#cat $i | sed s=@BATIK_HOME@=%{_datadir}/%{name}= > ${x}.tmp -#done +x=${i##*/} +x=${x%%.in} +cat $i | sed s=@BATIK_HOME@=%{_datadir}/%{name}= > ${x} +done +# Extract Javadoc +tar xjf %{S:1} %build # export JAVA_HOME=/usr/lib/jvm/java -# export CLASSPATH=$_CP:$(build-classpath glibj junit xml-commons-resolver) -# export ANT_OPTS=-Xmx512m +#export CLASSPATH=$_CP:$(build-classpath glibj junit xml-commons-resolver) +export ANT_OPTS=-Xmx512m +ant jars +# ant javadoc # ant clean # ant package +# Extract Javadoc +tar xjf %{S:1} %install +%define BATIK_HOME %{_datadir}/%{name} +%define builddir %{name}-%{version} rm -rf $RPM_BUILD_ROOT -install -m 755 -d $RPM_BUILD_ROOT%{_datadir}/%{name} -install -m 755 -d $RPM_BUILD_ROOT%{_prefix}/bin/ -cp -a lib *.jar $RPM_BUILD_ROOT%{_datadir}/%{name} -for i in %{S:10} %{S:11} %{S:12} %{S:13} %{S:14}; do -x=${i##*/} -#x=${x%%*-sh} -cat $i | sed s=@BATIK_HOME@=%{_datadir}/%{name}= > ${x}.tmp -install -m 755 ${x}.tmp $RPM_BUILD_ROOT%{_prefix}/bin/$x +install -m 755 -d $RPM_BUILD_ROOT%{_javadir}/%{name}/lib \ + -d $RPM_BUILD_ROOT%{_prefix}/bin/ \ + -d $RPM_BUILD_ROOT%{BATIK_HOME}/lib \ + -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +install -m 644 %{builddir}/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name} +install -m 644 %{builddir}/lib/js.jar \ + %{builddir}/lib/batik*.jar \ + %{builddir}/lib/pdf-transcoder.jar \ + %{builddir}/lib/xml-*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/lib/ +#install -m 644 lib/xml-apis-ext.jar $RPM_BUILD_ROOT%{_javadir} +# %{S:10} %{S:11} %{S:12} %{S:13} %{S:14} +for i in *.sh; do + install -m 755 $i $RPM_BUILD_ROOT%{_prefix}/bin/$x +done +JAR_LIBS=$(cd %{builddir}/lib; ls [a-wyz]*.jar) +JARS=$(cd %{builddir}; ls *.jar) +pushd . +cd $RPM_BUILD_ROOT%{BATIK_HOME} +for i in $JARS; do + ln -s ../java/%{name}/$i . +done +cd lib/ +for i in $JAR_LIBS; do + ln -s ../../java/%{name}/lib/$i . done +# ln -s ../../java/xml-commons-apis.jar . +popd +# Install Javadoc subpackage +cp -a docs/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ %clean rm -rf $RPM_BUILD_ROOT @@ -88,25 +133,38 @@ %files %defattr(-, root, root) # README.SuSE -%doc README LICENSE NOTICE docs +%doc README LICENSE NOTICE +%doc CHANGES MAINTAIN KEYS NOTICE +# %doc docs %{_prefix}/bin/* +%{_javadir}/%{name}/ +# %{_javadir}/%{name} %{_datadir}/%{name} -#%{_datadir}/%{name}-%{version}/ + +%files javadoc +%defattr(-, root, root) +%{_javadocdir}/%{name}-%{version} %changelog -* Wed Aug 29 2007 - toms@suse.de +* Tue Jan 29 2008 toms@suse.de +- Added additional source and created subpackage -javadoc +* Mon Jan 28 2008 toms@suse.de +- Reorganised installation directory: Installed all jar files under + %%{_javadir} and created link from %%{_datadir}/%%{name} +- Corrected *sh.in files +* Wed Aug 29 2007 toms@suse.de - Removed samples/tests/spec/scripting/textcontent/missing-glpyh.svg due to license issues -* Tue Aug 21 2007 - toms@suse.de +* Tue Aug 21 2007 toms@suse.de - Updated to version 1.7 Removed samples/fonts directory -* Wed May 23 2007 - toms@suse.de +* Wed May 23 2007 toms@suse.de - Corrected sh files (missing #), improved SPEC file -* Fri Mar 30 2007 - toms@suse.de +* Fri Mar 30 2007 toms@suse.de - Removed samples subdirectory -* Fri Mar 30 2007 - toms@suse.de +* Fri Mar 30 2007 toms@suse.de - Added unzip to BuildRequires -* Thu Mar 29 2007 - toms@suse.de +* Thu Mar 29 2007 toms@suse.de - Corrected *-sh files -* Thu Mar 29 2007 - toms@suse.de +* Thu Mar 29 2007 toms@suse.de - First inital version of 1.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de