Hello community, here is the log from the commit of package docbook-xsl-stylesheets for openSUSE:Factory checked in at 2013-07-11 13:27:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets (Old) and /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docbook-xsl-stylesheets" Changes: -------- --- /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2013-03-22 11:01:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes 2013-07-11 13:27:43.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Jun 28 09:12:59 UTC 2013 - t...@opensuse.org + +- Corrected conflict with docbook5-xsl-stylesheets: + Created subpackage with pdf2index (which raised this conflict) + and moved other scripts too (db2epub, callout-gen). + This makes it easier to install both variantes of the + stylesheets + +------------------------------------------------------------------- +Fri May 31 16:03:17 UTC 2013 - vark...@suse.com + +- Fix spec to avoid conflict with docbook5-xsl-stylesheets + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.K5e91N/_old 2013-07-11 13:27:44.000000000 +0200 +++ /var/tmp/diff_new_pack.K5e91N/_new 2013-07-11 13:27:44.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define dbstyle_dir %{_datadir}/xml/docbook/stylesheet/nwalsh %define dbstyle_catalog %{name}.xml %define suse_catalog %{_sysconfdir}/xml/suse-catalog.xml @@ -54,6 +55,25 @@ http://www.w3.org/Style/XSL/ +# Package +%package scripts +# License: MPL-1.1 and MIT +Summary: Script to create Indices for FOP +Group: Productivity/Publishing/XML +Requires: ImageMagick +Requires: perl +Requires: ruby + +%description scripts + +Contains several scripts: + +* pdf2index: Create indices for FOP +* db2epub: Create EPUB2 output +* callout-gen: Create callout icons using ImageMagick + +This package may be obsolete in the future. + #-------------------------------------------------------------------------- %prep %setup -q -n docbook-xsl-%{version} -b1 @@ -106,6 +126,8 @@ # Install scripts %__install -m755 fo/pdf2index %{buildroot}%{_bindir} %__install -m755 epub/bin/dbtoepub %{buildroot}%{_bindir} +%__install -m755 slides/images/callouts/gen.sh %{buildroot}%{_bindir}/callout-gen +rm slides/images/callouts/gen.sh # VERSION.xsl %__install -m644 VERSION.xsl %{buildroot}%{dbstyle_dir}/%{version} @@ -179,15 +201,18 @@ %dir %{_datadir}/xml/docbook/stylesheet/nwalsh %dir %{dbstyle_dir}/%{version} -%exclude %{_datadir}/xml/docbook/stylesheet/nwalsh/%{version}/slides/slidy/.htaccess -%exclude %{_datadir}/xml/docbook/stylesheet/nwalsh/%{version}/slides/slidy/*/.htaccess +%exclude %{dbstyle_dir}/%{version}/slides/slidy/.htaccess +%exclude %{dbstyle_dir}/%{version}/slides/slidy/*/.htaccess %config %{_sysconfdir}/xml/*.xml %doc BUGS NEWS README RELEASE-NOTES.txt TODO -%{_bindir}/* %{dbstyle_dir}/current %{dbstyle_dir}/%{version}/* +%files scripts +%defattr(-, root, root) +%{_bindir}/* + %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org