Hello community, here is the log from the commit of package dita-ot for openSUSE:Factory checked in at 2017-05-22 10:48:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dita-ot (Old) and /work/SRC/openSUSE:Factory/.dita-ot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dita-ot" Mon May 22 10:48:48 2017 rev:20 rq:497118 version:1.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dita-ot/dita-ot.changes 2012-03-29 07:45:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dita-ot.new/dita-ot.changes 2017-05-22 10:49:17.753587043 +0200 @@ -1,0 +2,6 @@ +Sat May 20 19:18:09 UTC 2017 - [email protected] + +- Format the spec-file +- Remove obsolete buildrequires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dita-ot.spec ++++++ --- /var/tmp/diff_new_pack.JH2Wwq/_old 2017-05-22 10:49:18.545475429 +0200 +++ /var/tmp/diff_new_pack.JH2Wwq/_new 2017-05-22 10:49:18.545475429 +0200 @@ -1,7 +1,7 @@ # # spec file for package dita-ot # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,30 +16,37 @@ # - Name: dita-ot -BuildRequires: ant-apache-regexp ant-trax dita fop java2-devel-packages xalan-j2 xml-commons-apis xml-commons-resolver xorg-x11-libs -BuildRequires: fdupes -Url: http://dita-ot.sourceforge.net/ -Group: Productivity/Publishing/XML -License: CPL-1.0 or Apache-2.0 -Summary: DITA Open Toolkit Version: 1.5.1 -Release: 1 +Release: 0 +Summary: DITA Open Toolkit +License: CPL-1.0 or Apache-2.0 +Group: Productivity/Publishing/XML +Url: http://dita-ot.sourceforge.net/ Source0: http://mesh.dl.sourceforge.net/sourceforge/dita-ot/DITA-OT%{version}_M7_src.tar.bz2 #PATCH-FIX_OPENSUSE: the update-doc task ends up on java.lang.NullPointerException for unknow reason # so as a workaround, let skip it Patch0: dita-ot-disable-doc.patch +BuildRequires: ant-apache-regexp +BuildRequires: ant-trax +BuildRequires: dita +BuildRequires: fdupes +BuildRequires: fop +BuildRequires: java-devel +BuildRequires: xalan-j2 +BuildRequires: xml-commons-apis +BuildRequires: xml-commons-resolver +BuildRequires: xorg-x11-libs +Requires: ant +Requires: dita +Requires: fop +Requires: javapackages-tools BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Requires: jpackage-utils >= 1.5 -Requires: fop ant dita %description Stylesheets for processing DITA documents. - - %define xml_dir %{_datadir}/xml %define xml_pack_dir %{xml_dir}/dita @@ -49,8 +56,6 @@ %build export ANT_OPTS="-Xmx256M" -#export ANT_OPTS="${ANT_OPTS} -Djavax.xml.transform.TransformerFactory=org.apache.xalan.transformer.TransformerImpl" -#export CLASSPATH=/usr/share/fop-0.20.5/build/fop.jar:/usr/share/fop/lib/batik.jar:/usr/share/fop/lib/avalon-framework-cvs-20020806.jar:$(build-classpath xalan-j2 xalan-j2-serializer) CLASSPATH="$CLASSPATH:$(build-classpath xerces-j2 xalan-j2 xalan-j2-serializer xml-commons-resolver ant/ant-apache-regexp)" ant -v -d -buildfile buildPackage.xml ant all @@ -59,17 +64,17 @@ %install # prevent suse-filelist-forbiden find DITA-OT%{version}/ -name '*.orig' | xargs rm -rf -install -d $RPM_BUILD_ROOT/usr/share/dita-ot -cp -a DITA-OT%{version}/* $RPM_BUILD_ROOT/usr/share/dita-ot -pushd $RPM_BUILD_ROOT/usr/share/dita-ot +install -d %{buildroot}%{_datadir}/dita-ot +cp -a DITA-OT%{version}/* %{buildroot}%{_datadir}/dita-ot +pushd %{buildroot}%{_datadir}/dita-ot for f in $(find . -name '*.xml' -o -name '*.xsl'); do tr -d '\15' <$f >$f.tmp && mv $f.tmp $f done # rm -fr dtd # ln -s /usr/share/xml/dita/schema/dtd/1.0 dtd -install -d $RPM_BUILD_ROOT/usr/share/xml/dita/stylesheet/sf.net -mv xsl $RPM_BUILD_ROOT/usr/share/xml/dita/stylesheet/sf.net/%{version} -ln -s /usr/share/xml/dita/stylesheet/sf.net/%{version} xsl +install -d %{buildroot}%{_datadir}/xml/dita/stylesheet/sf.net +mv xsl %{buildroot}%{_datadir}/xml/dita/stylesheet/sf.net/%{version} +ln -s %{_datadir}/xml/dita/stylesheet/sf.net/%{version} xsl popd %fdupes -s %{buildroot} # %post @@ -96,7 +101,7 @@ %files %defattr(-, root, root) # %doc README -/usr/share/dita-ot +%{_datadir}/dita-ot %{xml_dir}/dita/stylesheet %changelog
