commit docbook-xsl-stylesheets for openSUSE:Factory

2017-11-02 Thread root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2017-11-02 10:23:03

Comparing /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets (Old)
 and  /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new (New)


Package is "docbook-xsl-stylesheets"

Thu Nov  2 10:23:03 2017 rev:49 rq:537031 version:1.79.2

Changes:

--- 
/work/SRC/openSUSE:Factory/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes
  2017-10-07 17:48:36.404734269 +0200
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2017-11-02 10:23:03.043045620 +0100
@@ -1,0 +2,6 @@
+Fri Oct 27 07:35:44 UTC 2017 - mplus...@suse.com
+
+- Restore working patch (bsc#1063066):
+  * Rebase docbook-xsl-stylesheets-non-recursive_string_subst.patch
+
+---



Other differences:
--
++ docbook-xsl-stylesheets-non-recursive_string_subst.patch ++
--- /var/tmp/diff_new_pack.kn66uF/_old  2017-11-02 10:23:04.027009756 +0100
+++ /var/tmp/diff_new_pack.kn66uF/_new  2017-11-02 10:23:04.027009756 +0100
@@ -3,23 +3,25 @@
  long strings with many matches will cause stack overflows.
 Author: Peter De Wachter 
 Bug-Debian: https://bugs.debian.org/750593
-Index: b/lib/lib.xsl
+
+Index: docbook-xsl-1.79.2/lib/lib.xsl
 ===
 a/lib/lib.xsl
-+++ b/lib/lib.xsl
-@@ -6,7 +6,10 @@
+--- docbook-xsl-1.79.2.orig/lib/lib.xsl
 docbook-xsl-1.79.2/lib/lib.xsl
+@@ -6,7 +6,11 @@
  
   This module implements DTD-independent functions
  
 -  
-->http://www.w3.org/1999/XSL/Transform; 
version="1.0">
-+  
-->http://www.w3.org/1999/XSL/Transform;
-+   xmlns:str="http://exslt.org/strings;
-+   exclude-result-prefixes="str"
-+   version="1.0">
++  -->
++http://www.w3.org/1999/XSL/Transform;
++xmlns:str="http://exslt.org/strings;
++exclude-result-prefixes="str"
++version="1.0">
  
  

-@@ -52,6 +55,9 @@
+@@ -52,6 +56,9 @@

  





commit docbook-xsl-stylesheets for openSUSE:Factory

2017-10-07 Thread root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2017-10-07 17:48:33

Comparing /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets (Old)
 and  /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new (New)


Package is "docbook-xsl-stylesheets"

Sat Oct  7 17:48:33 2017 rev:48 rq:530361 version:1.79.2

Changes:

--- 
/work/SRC/openSUSE:Factory/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes
  2017-09-04 12:18:57.394006571 +0200
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2017-10-07 17:48:36.404734269 +0200
@@ -1,0 +2,7 @@
+Sun Oct  1 14:45:19 UTC 2017 - aavind...@gmail.com
+
+- Update to version 1.79.2
+- Rebase docbook-xsl-stylesheets-non-recursive_string_subst.patch
+- callout-gen is removed
+
+---

Old:

  docbook-xsl-1.79.0.tar.bz2
  docbook-xsl-doc-1.79.0.tar.bz2

New:

  docbook-xsl-1.79.2.tar.bz2
  docbook-xsl-doc-1.79.2.tar.bz2



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.qynb0J/_old  2017-10-07 17:48:37.764674487 +0200
+++ /var/tmp/diff_new_pack.qynb0J/_new  2017-10-07 17:48:37.764674487 +0200
@@ -23,14 +23,14 @@
 %define xmlcatalog %{_bindir}/xmlcatalog
 %define dbstyle_catalog_entry  for-catalog-%{name}-%{realversion}.xml
 Name:   docbook-xsl-stylesheets
-Version:1.79.0
+Version:1.79.2
 Release:0
 Summary:XSL Stylesheets for DocBook 4
-License:MPL-1.1 and MIT
+License:MPL-1.1 AND MIT
 Group:  Productivity/Publishing/DocBook
-Url:http://sourceforge.net/projects/docbook/
-Source0:
http://sourceforge.net/projects/docbook/files/docbook-xsl/%{version}/docbook-xsl-%{realversion}.tar.bz2
-Source1:
http://sourceforge.net/projects/docbook/files/docbook-xsl-doc/%{version}/docbook-xsl-doc-%{realversion}.tar.bz2
+Url:http://docbook.sourceforge.net
+Source0:
https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F%{version}/docbook-xsl-%{version}.tar.bz2
+Source1:
https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F%{version}/docbook-xsl-doc-%{version}.tar.bz2
 Source10:   dbxslt-install.sh
 ## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-dbtoepub.patch Fixed dirname
 Patch0: %{name}-dbtoepub.patch
@@ -40,12 +40,11 @@
 BuildRequires:  sgml-skel >= 0.7
 BuildRequires:  unzip
 Requires:   docbook_4
-Requires:   xmlcharent
-Requires(pre):  %{_bindir}/xmlcatalog
 Requires:   sgml-skel >= 0.7
+Requires:   xmlcharent
 Requires(post): sgml-skel >= 0.7
 Requires(postun): sgml-skel >= 0.7
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+Requires(pre):  %{_bindir}/xmlcatalog
 # BuildRequires:  dos2unix
 BuildArch:  noarch
 #--
@@ -78,7 +77,6 @@
 
 * pdf2index:Create indices for FOP
 * db2epub:  Create EPUB2 output
-* callout-gen:  Create callout icons using ImageMagick
 
 This package may be obsolete in the future.
 
@@ -128,7 +126,6 @@
 update-xml-catalog
 
 %files
-%defattr(-, root, root)
 %config %{_sysconfdir}/xml/catalog.d/%{name}.xml
 %doc BUGS NEWS README RELEASE-NOTES.txt TODO
 %doc %{_docdir}/%{name}/
@@ -145,8 +142,6 @@
 %{dbstyle_dir}/%{realversion}/*
 
 %files scripts
-%defattr(-, root, root)
-%{_bindir}/callout-gen
 %{_bindir}/dbtoepub
 %{_bindir}/pdf2index
 

++ docbook-xsl-1.79.0.tar.bz2 -> docbook-xsl-1.79.2.tar.bz2 ++
/work/SRC/openSUSE:Factory/docbook-xsl-stylesheets/docbook-xsl-1.79.0.tar.bz2 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-1.79.2.tar.bz2
 differ: char 11, line 1

++ docbook-xsl-doc-1.79.0.tar.bz2 -> docbook-xsl-doc-1.79.2.tar.bz2 ++
 44885 lines of diff (skipped)

++ docbook-xsl-stylesheets-non-recursive_string_subst.patch ++
--- /var/tmp/diff_new_pack.qynb0J/_old  2017-10-07 17:48:38.604637563 +0200
+++ /var/tmp/diff_new_pack.qynb0J/_new  2017-10-07 17:48:38.608637388 +0200
@@ -3,23 +3,23 @@
  long strings with many matches will cause stack overflows.
 Author: Peter De Wachter 
 Bug-Debian: https://bugs.debian.org/750593
-Index: docbook-xsl-1.79.0/lib/lib.xsl
+Index: b/lib/lib.xsl
 ===
 docbook-xsl-1.79.0.orig/lib/lib.xsl
-+++ docbook-xsl-1.79.0/lib/lib.xsl
-@@ -10,7 +10,10 @@
+--- a/lib/lib.xsl
 b/lib/lib.xsl
+@@ -6,7 +6,10 @@
+ 
   This module implements DTD-independent functions
  
-   -->

commit docbook-xsl-stylesheets for openSUSE:Factory

2017-09-04 Thread root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2017-09-04 12:18:56

Comparing /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets (Old)
 and  /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new (New)


Package is "docbook-xsl-stylesheets"

Mon Sep  4 12:18:56 2017 rev:47 rq:519314 version:1.79.0

Changes:

--- 
/work/SRC/openSUSE:Factory/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes
  2017-02-20 13:11:19.300308671 +0100
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2017-09-04 12:18:57.394006571 +0200
@@ -1,0 +2,13 @@
+Sat Aug 26 12:07:41 UTC 2017 - thomas.schrai...@suse.com
+
+- Add docbook-xsl-stylesheets-non-recursive_string_subst.patch
+  Use str:replace from exslt.org to implement string.subst
+
+  string.subst implementation causes recursion issues when building
+  systemd documentation. This issue has been reported in
+  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765567 and
+  https://bugs.archlinux.org/task/54694 .
+
+  Taken from 
https://github.com/fishilico/xslt10-stylesheets/commit/a7df4fbbef3ab0f97d50aa47f2ccfa0630a2686e
+
+---

New:

  docbook-xsl-stylesheets-non-recursive_string_subst.patch



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.y0BEgw/_old  2017-09-04 12:18:58.521848018 +0200
+++ /var/tmp/diff_new_pack.y0BEgw/_new  2017-09-04 12:18:58.529846893 +0200
@@ -34,6 +34,8 @@
 Source10:   dbxslt-install.sh
 ## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-dbtoepub.patch Fixed dirname
 Patch0: %{name}-dbtoepub.patch
+## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-non-recursive_string_subst.patch 
Use EXSLT replace function to avoid recursive implementation of string.subst
+Patch1: %{name}-non-recursive_string_subst.patch
 BuildRequires:  fdupes
 BuildRequires:  sgml-skel >= 0.7
 BuildRequires:  unzip
@@ -83,6 +85,7 @@
 %prep
 %setup -q -n docbook-xsl-%{realversion} -b1
 %patch0 -p1
+%patch1 -p1
 
 cp %{SOURCE10} .
 

++ docbook-xsl-stylesheets-non-recursive_string_subst.patch ++
Description: use EXSLT "replace" function when available
 A recursive implementation  of string.subst is problematic,
 long strings with many matches will cause stack overflows.
Author: Peter De Wachter 
Bug-Debian: https://bugs.debian.org/750593
Index: docbook-xsl-1.79.0/lib/lib.xsl
===
--- docbook-xsl-1.79.0.orig/lib/lib.xsl
+++ docbook-xsl-1.79.0/lib/lib.xsl
@@ -10,7 +10,10 @@
  This module implements DTD-independent functions
 
   -->
-http://www.w3.org/1999/XSL/Transform; version="1.0">
+http://www.w3.org/1999/XSL/Transform;
+xmlns:str="http://exslt.org/strings;
+exclude-result-prefixes="str"
+version="1.0">
 
 
   
@@ -56,6 +59,9 @@
   
 
   
+
+  
+
 
   
 



commit docbook-xsl-stylesheets for openSUSE:Factory

2017-02-20 Thread root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2017-02-20 13:11:18

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
  2016-07-28 23:44:40.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2017-02-20 13:11:19.300308671 +0100
@@ -1,0 +2,5 @@
+Tue Feb  7 16:40:58 UTC 2017 - dims...@opensuse.org
+
+- Explicitly package %{_docdir}/%{name} to fix build with RPM 4.13.
+
+---



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.dEQyl7/_old  2017-02-20 13:11:20.348161175 +0100
+++ /var/tmp/diff_new_pack.dEQyl7/_new  2017-02-20 13:11:20.352160612 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package docbook-xsl-stylesheets
 #
-# Copyright (c) 2016 SUSE LINUX 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
@@ -128,6 +128,7 @@
 %defattr(-, root, root)
 %config %{_sysconfdir}/xml/catalog.d/%{name}.xml
 %doc BUGS NEWS README RELEASE-NOTES.txt TODO
+%doc %{_docdir}/%{name}/
 %dir %{_datadir}/xml/docbook/stylesheet
 %dir %{_datadir}/xml/docbook/stylesheet/nwalsh
 %dir %{dbstyle_dir}/%{realversion}




commit docbook-xsl-stylesheets for openSUSE:Factory

2016-07-28 Thread h_root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2016-07-28 23:44:38

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
  2016-01-08 15:39:42.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2016-07-28 23:44:40.0 +0200
@@ -1,0 +2,5 @@
+Tue Jul 19 11:44:56 UTC 2016 - fv...@suse.com
+
+- Use update-xml-catalog
+
+---



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.iVt5jN/_old  2016-07-28 23:44:41.0 +0200
+++ /var/tmp/diff_new_pack.iVt5jN/_new  2016-07-28 23:44:41.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package docbook-xsl-stylesheets
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -35,12 +35,14 @@
 ## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-dbtoepub.patch Fixed dirname
 Patch0: %{name}-dbtoepub.patch
 BuildRequires:  fdupes
-BuildRequires:  sgml-skel
+BuildRequires:  sgml-skel >= 0.7
 BuildRequires:  unzip
 Requires:   docbook_4
 Requires:   xmlcharent
 Requires(pre):  %{_bindir}/xmlcatalog
-Requires(pre):  sgml-skel
+Requires:   sgml-skel >= 0.7
+Requires(post): sgml-skel >= 0.7
+Requires(postun): sgml-skel >= 0.7
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # BuildRequires:  dos2unix
 BuildArch:  noarch
@@ -97,7 +99,7 @@
 chmod 755 extensions/xslt.py
 
 %install
-
+mkdir -p %{buildroot}%{_sysconfdir}/xml/catalog.d # Should already exist...
 sh ./dbxslt-install.sh --package-version="%{realversion}" 
--buildroot=%{buildroot}
 
 # fixing permission errors from sources
@@ -116,44 +118,15 @@
 
 %fdupes -s %{buildroot}
 
-#--
-
 %post
-#
-# XML Catalog entries
-#
-# remove existing entries first (if existing) - needed for
-# zypper in, since it does not call postun
-#
-# in case of an update, remove old
-if [ "2" = "$1" ]; then
-  %{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} --del %{name}
-fi
-# ... and (re)add it again
-%{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} \
-  --add %{_sysconfdir}/xml/%{dbstyle_catalog_entry}
-
-exit 0
-
-#--
+update-xml-catalog
 
 %postun
-#
-# delete catalog entry
-# only run if package is really uninstalled ($1 = 0) and not
-# in case of an update
-#
-if [ "0" = "$1" ]; then
-   %{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} --del %{name}
-fi
-
-exit 0
-
-#--
+update-xml-catalog
 
 %files
 %defattr(-, root, root)
-%config %{_sysconfdir}/xml/*.xml
+%config %{_sysconfdir}/xml/catalog.d/%{name}.xml
 %doc BUGS NEWS README RELEASE-NOTES.txt TODO
 %dir %{_datadir}/xml/docbook/stylesheet
 %dir %{_datadir}/xml/docbook/stylesheet/nwalsh

++ dbxslt-install.sh ++
--- /var/tmp/diff_new_pack.iVt5jN/_old  2016-07-28 23:44:41.0 +0200
+++ /var/tmp/diff_new_pack.iVt5jN/_new  2016-07-28 23:44:41.0 +0200
@@ -3,7 +3,7 @@
 # Installs the DocBook XSL Stylesheets on openSUSE systems
 #
 # Author: Thomas Schraitle
-# Copyright (C) 2013 t...@opensuse.org
+# Copyright (C) 2016 t...@opensuse.org
 #
 
 # set -x
@@ -21,10 +21,10 @@
 DATAROOTDIR=share
 DATADIR=$DATAROOTDIR
 DOCDIR=$DATAROOTDIR/doc/packages
-SYSCONFDIR=/etc
+SYSCONFDIR=etc
 XMLCONFDIR=$SYSCONFDIR/xml
 XMLDIR=$DATAROOTDIR/xml
-DBSTYLE_CATALOG=$PACKAGE.xml
+DBSTYLE_CATALOG=catalog.d/$PACKAGE.xml
 DBSTYLE_DIR=$XMLDIR/docbook/stylesheet/nwalsh
 ORIG_DBSTYLE_DIR=$PREFIX/$DBSTYLE_DIR
 
@@ -83,7 +83,6 @@
 xmldir=$XMLDIR
 xsltrootdir=$XSLTROOTDIR
 dbstyle_catalog=$DBSTYLE_CATALOG
-dbstyle_catalog_entry=${DBSTYLE_CATALOG_ENTRY}
 dbstyle_dir=$DBSTYLE_DIR
 EOF
 }
@@ -191,8 +190,6 @@
 XSLTROOTDIR=$PREFIX/$XSLTROOTDIR
 # XSLTDIR=$PREFIX/$XSLTDIR
 
-DBSTYLE_CATALOG=$PACKAGE.xml
-DBSTYLE_CATALOG_ENTRY=for-catalog-${PACKAGE}-${PACKAGE_VERSION}.xml
 DBSTYLE_DIR=$XMLDIR/docbook/stylesheet/nwalsh
 
 printvariables
@@ -219,15 +216,6 @@
cp ${DEBUG_SCRIPT:+-v} -a $DBXSLT_DIRS  $DBSTYLE_DIR/$PACKAGE_VERSION
 }
 
-
-function create_link() {
-   my_debug "\n\n=== Create link ==="
-
-   pushd 

commit docbook-xsl-stylesheets for openSUSE:Factory

2016-01-08 Thread h_root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2016-01-08 15:39:39

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
  2015-05-02 21:28:01.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2016-01-08 15:39:42.0 +0100
@@ -1,0 +2,16 @@
+Mon Dec 21 09:44:33 UTC 2015 - mplus...@suse.com
+
+- Update download urls
+
+---
+Sat Dec 12 18:35:36 UTC 2015 - p.drou...@gmail.com
+
+- Update to version 1.79.0, see 
+  http://snapshots.docbook.org/xsl/RELEASE-NOTES.html#V1.79.0
+  for details (Mostly bugfix release)
+- Remove obsolete patches
+  * docbook-xsl-stylesheets-epub3-base.dir.patch
+  * docbook-xsl-stylesheets-manpages-other-r9847.patch
+- Perform a spec-cleaner on the spec file
+
+---

Old:

  docbook-xsl-1.78.1.tar.bz2
  docbook-xsl-doc-1.78.1.tar.bz2
  docbook-xsl-stylesheets-epub3-base.dir.patch
  docbook-xsl-stylesheets-manpages-other-r9847.patch

New:

  docbook-xsl-1.79.0.tar.bz2
  docbook-xsl-doc-1.79.0.tar.bz2



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.BWzXlt/_old  2016-01-08 15:39:43.0 +0100
+++ /var/tmp/diff_new_pack.BWzXlt/_new  2016-01-08 15:39:43.0 +0100
@@ -16,45 +16,36 @@
 #
 
 
-%define realversion1.78.1
-
+%define realversion%{version}
 %define dbstyle_dir%{_datadir}/xml/docbook/stylesheet/nwalsh
 %define dbstyle_catalog%{name}.xml
 %define suse_catalog   %{_sysconfdir}/xml/suse-catalog.xml
 %define xmlcatalog %{_bindir}/xmlcatalog
 %define dbstyle_catalog_entry  for-catalog-%{name}-%{realversion}.xml
-
 Name:   docbook-xsl-stylesheets
+Version:1.79.0
+Release:0
 Summary:XSL Stylesheets for DocBook 4
 License:MPL-1.1 and MIT
 Group:  Productivity/Publishing/DocBook
+Url:http://sourceforge.net/projects/docbook/
+Source0:
http://sourceforge.net/projects/docbook/files/docbook-xsl/%{version}/docbook-xsl-%{realversion}.tar.bz2
+Source1:
http://sourceforge.net/projects/docbook/files/docbook-xsl-doc/%{version}/docbook-xsl-doc-%{realversion}.tar.bz2
+Source10:   dbxslt-install.sh
+## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-dbtoepub.patch Fixed dirname
+Patch0: %{name}-dbtoepub.patch
 BuildRequires:  fdupes
 BuildRequires:  sgml-skel
 BuildRequires:  unzip
-# BuildRequires:  dos2unix
-BuildArch:  noarch
 Requires:   docbook_4
 Requires:   xmlcharent
-PreReq: sgml-skel %{_bindir}/xmlcatalog
-Version:1.78.1+svn9743
-Release:0
-Source0:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{realversion}.tar.bz2
-Source1:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{realversion}.tar.bz2
-Source10:   dbxslt-install.sh
-
-## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-dbtoepub.patch Fixed dirname
-Patch0: %{name}-dbtoepub.patch
-
-## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-epub3-base.dir-r9742.patch Fix 
for base.dir parameter
-Patch10:%{name}-epub3-base.dir.patch
-
-## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-manpages-other-r9847.patch Fixed 
upstream bug #1313
-Patch11:%{name}-manpages-other-r9847.patch
-
+Requires(pre):  %{_bindir}/xmlcatalog
+Requires(pre):  sgml-skel
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-Url:http://sourceforge.net/projects/docbook/
-
+# BuildRequires:  dos2unix
+BuildArch:  noarch
 #--
+
 %description
 These are the XSL stylesheets for DocBook XML and "Simplified" DocBook
 DTDs. Use these stylesheets for documents based on DocBook 4 and
@@ -67,8 +58,8 @@
 rendering. For more information about XSL, see the XSL page at the W3C:
 http://www.w3.org/Style/XSL/
 
-
 # Package
+
 %packagescripts 
 # License:   MPL-1.1 and MIT 
 Summary:Script to create Indices for FOP
@@ -87,16 +78,12 @@
 
 This package may be obsolete in the future.
 
-#--
 %prep
 %setup -q -n docbook-xsl-%{realversion} -b1
 %patch0 -p1
-%patch10 -p0
-%patch11 -p0
 
-cp %{S:10} .
+cp %{SOURCE10} .
 

commit docbook-xsl-stylesheets for openSUSE:Factory

2015-05-02 Thread h_root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2015-05-02 21:28:00

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
  2015-02-27 10:56:37.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2015-05-02 21:28:01.0 +0200
@@ -1,0 +2,6 @@
+Wed Apr 29 09:38:13 UTC 2015 - t...@opensuse.org
+
+- Fixed bsc#928753 (added missing template directory)
+- Slightly corrected file list
+
+---



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.YcCH6z/_old  2015-05-02 21:28:01.0 +0200
+++ /var/tmp/diff_new_pack.YcCH6z/_new  2015-05-02 21:28:01.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package docbook-xsl-stylesheets
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -135,7 +135,7 @@
 #--
 %post
 #
-# XML Catalog entries for daps profiling
+# XML Catalog entries
 #
 # remove existing entries first (if existing) - needed for
 # zypper in, since it does not call postun
@@ -153,7 +153,7 @@
 #--
 %postun
 #
-# delete catalog entry for daps profiling
+# delete catalog entry
 # only run if package is really uninstalled ($1 = 0) and not
 # in case of an update
 #
@@ -166,7 +166,8 @@
 #--
 %files
 %defattr(-, root, root)
-
+%config %{_sysconfdir}/xml/*.xml
+%doc BUGS NEWS README RELEASE-NOTES.txt TODO
 %dir %{_datadir}/xml/docbook/stylesheet
 %dir %{_datadir}/xml/docbook/stylesheet/nwalsh
 %dir %{dbstyle_dir}/%{realversion}
@@ -176,10 +177,6 @@
 # %%exclude %%{dbstyle_dir}/svn-commit.tmp
 # %%exclude %%{dbstyle_dir}/%%{realversion}/*/*.xsl.orig
 
-%config %{_sysconfdir}/xml/*.xml
-
-%doc BUGS NEWS README RELEASE-NOTES.txt TODO
-
 %{dbstyle_dir}/current
 %{dbstyle_dir}/%{realversion}/*
 

++ dbxslt-install.sh ++
--- /var/tmp/diff_new_pack.YcCH6z/_old  2015-05-02 21:28:01.0 +0200
+++ /var/tmp/diff_new_pack.YcCH6z/_new  2015-05-02 21:28:01.0 +0200
@@ -89,14 +89,14 @@
 }
 
 #--
-# 
+#
 DEBUG_SCRIPT=
 DB4_XSLT_URL=http://docbook.sourceforge.net/release/xsl/;
 DB5_XSLT_URL=http://docbook.sourceforge.net/release/xsl-ns/;
 # Installation directories
 DBXSLT_DIRS=assembly common eclipse epub epub3 extensions fo images \
 highlighting html htmlhelp lib javahelp manpages profiling roundtrip slides \
-webhelp website xhtml xhtml-1_1 xhtml5
+template webhelp website xhtml xhtml-1_1 xhtml5
 DBXSLT_FILES=catalog.xml VERSION VERSION.xsl REVISION
 # Without INSTALL
 DBXSLT_DOCFILES=params AUTHORS BUGS COPYING NEWS.html NEWS.xml README 
REVISION TODO \
@@ -131,7 +131,7 @@
  DEBUG_SCRIPT=1
  shift
  ;;
-  # 
+  #
   --package-name)
  PACKAGE=$2
  shift 2
@@ -198,7 +198,7 @@
 printvariables
 
 #--
-# 
+#
 #
 function create_directory_structure() {
local i
@@ -211,11 +211,11 @@
 
 
 #--
-# 
+#
 #
 function install_dbxsltdirs() {
my_debug \n\n=== Install all DocBook XSL stylesheet directories ===
-   
+
cp ${DEBUG_SCRIPT:+-v} -a $DBXSLT_DIRS  $DBSTYLE_DIR/$PACKAGE_VERSION
 }
 
@@ -230,25 +230,25 @@
 
 function install_scripts() {
my_debug \n\n=== Install scripts ===
-   
+
install ${DEBUG_SCRIPT:+-v} -m755 fo/pdf2index   $BINDIR
install ${DEBUG_SCRIPT:+-v} -m755 epub/bin/dbtoepub  $BINDIR
install ${DEBUG_SCRIPT:+-v} -m755 slides/images/callouts/gen.sh 
$BINDIR/callout-gen
-   
+
 #   rm fo/pdf2index epub/bin/dbtoepub slides/images/callouts/gen.sh
 }
 
 function install_dbxsltfiles() {
my_debug \n\n=== Install other files ===
-   
+
cp ${DEBUG_SCRIPT:+-v} -a $DBXSLT_FILES $DBSTYLE_DIR/$PACKAGE_VERSION
 }
 
 function install_dbxsltdocfiles() {
my_debug \n\n=== Install documentation ===
my_debug Current dir: $PWD
-   
-   
+
+
for i in $DBXSLT_DOCFILES; do
  

commit docbook-xsl-stylesheets for openSUSE:Factory

2015-02-27 Thread h_root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2015-02-27 10:56:35

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
  2015-01-21 21:53:02.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2015-02-27 10:56:37.0 +0100
@@ -1,0 +2,5 @@
+Thu Feb 19 12:25:28 UTC 2015 - t...@opensuse.org
+
+- Slightly adapted %post and %postun section to fix bsc#918565
+
+---



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.RQWBzC/_old  2015-02-27 10:56:38.0 +0100
+++ /var/tmp/diff_new_pack.RQWBzC/_new  2015-02-27 10:56:38.0 +0100
@@ -140,9 +140,11 @@
 # remove existing entries first (if existing) - needed for
 # zypper in, since it does not call postun
 #
-# delete ...
-%{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} --del %{name}
-# ... and add it again
+# in case of an update, remove old
+if [ 2 = $1 ]; then
+  %{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} --del %{name}
+fi
+# ... and (re)add it again
 %{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} \
   --add %{_sysconfdir}/xml/%{dbstyle_catalog_entry}
 
@@ -155,10 +157,8 @@
 # only run if package is really uninstalled ($1 = 0) and not
 # in case of an update
 #
-if [ 0 = $1 ]; then 
-if [ -x %{_bindir}/edit-xml-catalog ] ; then
+if [ 0 = $1 ]; then
 %{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} --del 
%{name}
-fi
 fi
 
 exit 0

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit docbook-xsl-stylesheets for openSUSE:Factory

2015-01-21 Thread h_root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2015-01-21 21:53:00

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
  2014-02-15 17:16:29.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2015-01-21 21:53:02.0 +0100
@@ -1,0 +2,5 @@
+Mon Jan 12 09:53:49 UTC 2015 - fsunderme...@opensuse.org
+
+- Added missing images directory to install-script dbxslt-install.sh 
+
+---



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.m52tm5/_old  2015-01-21 21:53:03.0 +0100
+++ /var/tmp/diff_new_pack.m52tm5/_new  2015-01-21 21:53:03.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package docbook-xsl-stylesheets
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++ dbxslt-install.sh ++
--- /var/tmp/diff_new_pack.m52tm5/_old  2015-01-21 21:53:03.0 +0100
+++ /var/tmp/diff_new_pack.m52tm5/_new  2015-01-21 21:53:03.0 +0100
@@ -94,8 +94,8 @@
 DB4_XSLT_URL=http://docbook.sourceforge.net/release/xsl/;
 DB5_XSLT_URL=http://docbook.sourceforge.net/release/xsl-ns/;
 # Installation directories
-DBXSLT_DIRS=assembly common eclipse epub epub3 extensions fo highlighting \
-html htmlhelp lib javahelp manpages profiling roundtrip slides \
+DBXSLT_DIRS=assembly common eclipse epub epub3 extensions fo images \
+highlighting html htmlhelp lib javahelp manpages profiling roundtrip slides \
 webhelp website xhtml xhtml-1_1 xhtml5
 DBXSLT_FILES=catalog.xml VERSION VERSION.xsl REVISION
 # Without INSTALL
@@ -315,4 +315,4 @@
 create_dbxslt_addentries
 cleanup_buildroot
 
-# EOF
\ No newline at end of file
+# EOF

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit docbook-xsl-stylesheets for openSUSE:Factory

2014-02-15 Thread h_root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2014-02-15 17:16:28

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-12-19 13:32:02.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2014-02-15 17:16:29.0 +0100
@@ -1,0 +2,11 @@
+Thu Feb  6 13:30:10 UTC 2014 - t...@opensuse.org
+
+- Fixed bnc#842844 and added upstream patch from r9847 of docbook#1313
+  (File docbook-xsl-stylesheets-manpages-other-r9847.patch)
+
+---
+Thu Feb  6 12:03:53 UTC 2014 - k...@suse.com
+
+- .spec: syntax fix.
+
+---

New:

  docbook-xsl-stylesheets-manpages-other-r9847.patch



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.jbC95u/_old  2014-02-15 17:16:29.0 +0100
+++ /var/tmp/diff_new_pack.jbC95u/_new  2014-02-15 17:16:29.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package docbook-xsl-stylesheets
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -48,6 +48,9 @@
 ## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-epub3-base.dir-r9742.patch Fix 
for base.dir parameter
 Patch10:%{name}-epub3-base.dir.patch
 
+## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-manpages-other-r9847.patch Fixed 
upstream bug #1313
+Patch11:%{name}-manpages-other-r9847.patch
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Url:http://sourceforge.net/projects/docbook/
 
@@ -89,6 +92,7 @@
 %setup -q -n docbook-xsl-%{realversion} -b1
 %patch0 -p1
 %patch10 -p0
+%patch11 -p0
 
 cp %{S:10} .
 
@@ -170,6 +174,7 @@
 %exclude %{dbstyle_dir}/%{realversion}/slides/slidy/.htaccess
 %exclude %{dbstyle_dir}/%{realversion}/slides/slidy/*/.htaccess
 # %%exclude %%{dbstyle_dir}/svn-commit.tmp
+# %%exclude %%{dbstyle_dir}/%%{realversion}/*/*.xsl.orig
 
 %config %{_sysconfdir}/xml/*.xml
 

++ docbook-xsl-stylesheets-manpages-other-r9847.patch ++
--- manpages/other.xsl.orig 2014-02-05 16:55:12.0 +0100
+++ manpages/other.xsl  2014-02-05 16:58:04.0 +0100
@@ -596,12 +596,22 @@
   xsl:with-param name=message-epilog (soelim stub)/xsl:with-param
   xsl:with-param name=content
 xsl:value-of select='.so '/
-xsl:call-template name=make.adjusted.man.filename
-  xsl:with-param name=name select=$first.refname/
-  xsl:with-param name=section select=$section/
-  xsl:with-param name=lang select=$lang/
-/xsl:call-template
-xsl:text#10;/xsl:text
+   xsl:variable name=full.filename
+   xsl:call-template name=make.adjusted.man.filename
+   xsl:with-param name=name select=$first.refname/
+   xsl:with-param name=section select=$section/
+   xsl:with-param name=lang select=$lang/
+   /xsl:call-template
+   /xsl:variable
+   xsl:choose
+   xsl:when test=starts-with($full.filename, 
$man.output.base.dir)
+   xsl:value-of 
select=substring-after($full.filename,$man.output.base.dir)/
+   /xsl:when
+   xsl:otherwise
+   xsl:value-of select=$full.filename/
+   /xsl:otherwise
+   /xsl:choose
+   xsl:text#10;/xsl:text
   /xsl:with-param
 /xsl:call-template
   /xsl:if
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit docbook-xsl-stylesheets for openSUSE:Factory

2013-12-19 Thread h_root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2013-12-19 13:32:01

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-10-01 08:10:49.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2013-12-19 13:32:02.0 +0100
@@ -1,0 +2,7 @@
+Mon Dec  9 13:49:49 UTC 2013 - t...@opensuse.org
+
+- Added missing patch description to follow Patch Guidlines 
+  (see http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines)
+- Added upstream patch (r9732-r9743 for base.dir parameter in EPUB3)
+
+---

New:

  docbook-xsl-stylesheets-epub3-base.dir.patch



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.ozD6Fa/_old  2013-12-19 13:32:03.0 +0100
+++ /var/tmp/diff_new_pack.ozD6Fa/_new  2013-12-19 13:32:03.0 +0100
@@ -16,11 +16,13 @@
 #
 
 
+%define realversion1.78.1
+
 %define dbstyle_dir%{_datadir}/xml/docbook/stylesheet/nwalsh
 %define dbstyle_catalog%{name}.xml
 %define suse_catalog   %{_sysconfdir}/xml/suse-catalog.xml
 %define xmlcatalog %{_bindir}/xmlcatalog
-%define dbstyle_catalog_entry for-catalog-%{name}-%{version}.xml
+%define dbstyle_catalog_entry  for-catalog-%{name}-%{realversion}.xml
 
 Name:   docbook-xsl-stylesheets
 Summary:XSL Stylesheets for DocBook 4
@@ -34,12 +36,18 @@
 Requires:   docbook_4
 Requires:   xmlcharent
 PreReq: sgml-skel %{_bindir}/xmlcatalog
-Version:1.78.1
+Version:1.78.1+svn9743
 Release:0
-Source0:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{version}.tar.bz2
-Source1:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{version}.tar.bz2
+Source0:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{realversion}.tar.bz2
+Source1:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{realversion}.tar.bz2
 Source10:   dbxslt-install.sh
+
+## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-dbtoepub.patch Fixed dirname
 Patch0: %{name}-dbtoepub.patch
+
+## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-epub3-base.dir-r9742.patch Fix 
for base.dir parameter
+Patch10:%{name}-epub3-base.dir.patch
+
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Url:http://sourceforge.net/projects/docbook/
 
@@ -78,8 +86,10 @@
 
 #--
 %prep
-%setup -q -n docbook-xsl-%{version} -b1
+%setup -q -n docbook-xsl-%{realversion} -b1
 %patch0 -p1
+%patch10 -p0
+
 cp %{S:10} .
 
 #--
@@ -100,7 +110,7 @@
 #--
 %install
 
-sh ./dbxslt-install.sh --package-version=%{version} --buildroot=%{buildroot}
+sh ./dbxslt-install.sh --package-version=%{realversion} 
--buildroot=%{buildroot}
 
 # fixing permission errors from sources
 
@@ -109,7 +119,7 @@
 #
 if ! echo %{S:0} | grep -q snapshot; then
pushd %{buildroot}%{dbstyle_dir} /dev/null
-ln -sf %{version} current
+ln -sf %{realversion} current
popd /dev/null
 fi
 
@@ -155,10 +165,10 @@
 
 %dir %{_datadir}/xml/docbook/stylesheet
 %dir %{_datadir}/xml/docbook/stylesheet/nwalsh
-%dir %{dbstyle_dir}/%{version}
+%dir %{dbstyle_dir}/%{realversion}
 
-%exclude %{dbstyle_dir}/%{version}/slides/slidy/.htaccess
-%exclude %{dbstyle_dir}/%{version}/slides/slidy/*/.htaccess
+%exclude %{dbstyle_dir}/%{realversion}/slides/slidy/.htaccess
+%exclude %{dbstyle_dir}/%{realversion}/slides/slidy/*/.htaccess
 # %%exclude %%{dbstyle_dir}/svn-commit.tmp
 
 %config %{_sysconfdir}/xml/*.xml
@@ -166,7 +176,7 @@
 %doc BUGS NEWS README RELEASE-NOTES.txt TODO
 
 %{dbstyle_dir}/current
-%{dbstyle_dir}/%{version}/*
+%{dbstyle_dir}/%{realversion}/*
 
 %files scripts
 %defattr(-, root, root)

++ docbook-xsl-stylesheets-epub3-base.dir.patch ++
Index: epub3/epub3-element-mods.xsl
===
--- epub3/epub3-element-mods.xsl(revision 9732)
+++ epub3/epub3-element-mods.xsl(revision 9831)
@@ -49,7 +49,33 @@
 /xsl:param
 xsl:param name=generate.manifest select=0/
 xsl:param name=manifest.in.base.dir select=1/
-xsl:param name=base.dir 

commit docbook-xsl-stylesheets for openSUSE:Factory

2013-10-01 Thread h_root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2013-10-01 08:10:47

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-07-11 13:27:43.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2013-10-01 08:10:49.0 +0200
@@ -1,0 +2,5 @@
+Mon Sep 23 13:51:41 UTC 2013 - t...@opensuse.org
+
+- Moved installation procedure into dbxslt-install.sh Shell script
+
+---

New:

  dbxslt-install.sh



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.ovAQmj/_old  2013-10-01 08:11:01.0 +0200
+++ /var/tmp/diff_new_pack.ovAQmj/_new  2013-10-01 08:11:01.0 +0200
@@ -29,6 +29,7 @@
 BuildRequires:  fdupes
 BuildRequires:  sgml-skel
 BuildRequires:  unzip
+# BuildRequires:  dos2unix
 BuildArch:  noarch
 Requires:   docbook_4
 Requires:   xmlcharent
@@ -37,6 +38,7 @@
 Release:0
 Source0:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{version}.tar.bz2
 Source1:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{version}.tar.bz2
+Source10:   dbxslt-install.sh
 Patch0: %{name}-dbtoepub.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Url:http://sourceforge.net/projects/docbook/
@@ -78,69 +80,29 @@
 %prep
 %setup -q -n docbook-xsl-%{version} -b1
 %patch0 -p1
+cp %{S:10} .
 
 #--
 %build
-
 #
-# Creating catalog entries
 #
+find slides -regex 
.*\.\(xml\|htc\|\|hu\|js\|svg\|css\|html\.*\|txt\|rnc\|xhtml\) \
+   -exec sed -i 's/\r//' {} \;
+
+# Fix wrong end-of-line encoding
+sed -i 's/\r//' params/*
 
 #
-# /etc/xml/docbook-xsl-stylesheets.xml
-#
-%{xmlcatalog} --noout --create %{dbstyle_catalog}
-%{xmlcatalog} --noout --add rewriteSystem \
- http://docbook.sourceforge.net/release/xsl/%{version}; \
- file://%{dbstyle_dir}/%{version} %{dbstyle_catalog}
-%{xmlcatalog} --noout --add rewriteURI \
- http://docbook.sourceforge.net/release/xsl/%{version}; \
- file://%{dbstyle_dir}/%{version} %{dbstyle_catalog}
-%{xmlcatalog} --noout --add rewriteSystem \
- http://docbook.sourceforge.net/release/xsl/current; \
- file://%{dbstyle_dir}/%{version} %{dbstyle_catalog}
-%{xmlcatalog} --noout --add rewriteURI \
- http://docbook.sourceforge.net/release/xsl/current; \
- file://%{dbstyle_dir}/%{version} %{dbstyle_catalog}
-
-#
-# temporary file that is added to /etc/xml/suse-catalog.xml
-# during post
-#
-%{xmlcatalog} --noout --create %{dbstyle_catalog_entry}
-%{xmlcatalog} --noout --add delegateSystem \
-  http://docbook.sourceforge.net/release/xsl/; \
-  file:///etc/xml/%{dbstyle_catalog} %{dbstyle_catalog_entry}
-%__sed -i -e '/catalog/a\ group id=%{name}' \
-   -e '/\/catalog/i\ /group' %{dbstyle_catalog_entry}
+find -type f -exec chmod 644 {} \;
+find -type d -exec chmod 755 {} \;
+chmod 755 extensions/xslt.py
 
 #--
 %install
 
-# Create directories
-%__mkdir_p -m755 %{buildroot}%{_bindir}
-%__mkdir_p -m755 %{buildroot}%{dbstyle_dir}/%{version}
-%__mkdir_p -m755 %{buildroot}%{_defaultdocdir}/%{name}/html
-%__mkdir_p -m755 %{buildroot}%{_sysconfdir}/xml
-
-# 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}
-
-# all the rest is located in subdirectories, exclude some subdirectories with
-# stuff not needed
-for DIR in $(find -maxdepth 1 -mindepth 1 -type d \( -name tools -o -name 
doc -o -name docsrc -o -name tests \) -prune -o -type d -print ); do
-%__tar c $DIR | (cd %{buildroot}%{dbstyle_dir}/%{version}; %__tar xp);
-done
+sh ./dbxslt-install.sh --package-version=%{version} --buildroot=%{buildroot}
+
 # fixing permission errors from sources
-find %{buildroot}%{dbstyle_dir}/%{version} -type f -exec %__chmod 644 {} \;
-find %{buildroot}%{dbstyle_dir}/%{version} -type d -exec %__chmod 755 {} \;
-%__chmod 755 %{buildroot}%{dbstyle_dir}/%{version}/extensions/xslt.py
 
 # create current link
 # but not for snapshots
@@ -151,13 +113,7 @@
 popd /dev/null
 fi
 
-# install the 

commit docbook-xsl-stylesheets for openSUSE:Factory

2013-07-11 Thread h_root
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.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2013-07-11 13:27:43.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.K5e91N/_new  2013-07-11 13:27:44.0 +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
+%packagescripts 
+# 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



commit docbook-xsl-stylesheets for openSUSE:Factory

2013-03-22 Thread h_root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2013-03-22 11:01:31

Comparing /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets (Old)
 and  /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new (New)


Package is docbook-xsl-stylesheets, Maintainer is k...@suse.com

Changes:

--- 
/work/SRC/openSUSE:Factory/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes
  2013-03-08 13:01:29.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2013-03-22 11:01:33.0 +0100
@@ -1,0 +2,7 @@
+Mon Mar 18 09:42:59 UTC 2013 - t...@opensuse.org
+
+- Update to 1.78.1, see 
http://snapshots.docbook.org/xsl/RELEASE-NOTES.html#V1.78.1
+  for details
+- Added %exclude in SPEC file for .htaccess files
+
+---

Old:

  docbook-xsl-1.78.0.tar.bz2
  docbook-xsl-doc-1.78.0.tar.bz2

New:

  docbook-xsl-1.78.1.tar.bz2
  docbook-xsl-doc-1.78.1.tar.bz2



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.QuZG4F/_old  2013-03-22 11:01:36.0 +0100
+++ /var/tmp/diff_new_pack.QuZG4F/_new  2013-03-22 11:01:36.0 +0100
@@ -15,7 +15,6 @@
 # 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
@@ -33,7 +32,7 @@
 Requires:   docbook_4
 Requires:   xmlcharent
 PreReq: sgml-skel %{_bindir}/xmlcatalog
-Version:1.78.0
+Version:1.78.1
 Release:0
 Source0:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{version}.tar.bz2
 Source1:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{version}.tar.bz2
@@ -180,6 +179,9 @@
 %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
+
 %config %{_sysconfdir}/xml/*.xml
 
 %doc BUGS NEWS README RELEASE-NOTES.txt TODO

++ docbook-xsl-1.78.0.tar.bz2 - docbook-xsl-1.78.1.tar.bz2 ++
 10834 lines of diff (skipped)

++ docbook-xsl-doc-1.78.0.tar.bz2 - docbook-xsl-doc-1.78.1.tar.bz2 ++
 19932 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit docbook-xsl-stylesheets for openSUSE:Factory

2013-03-08 Thread h_root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2013-03-08 13:01:27

Comparing /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets (Old)
 and  /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new (New)


Package is docbook-xsl-stylesheets, Maintainer is k...@suse.com

Changes:

--- 
/work/SRC/openSUSE:Factory/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes
  2012-06-13 13:10:37.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2013-03-08 13:01:29.0 +0100
@@ -1,0 +2,6 @@
+Thu Jan 17 19:41:11 UTC 2013 - p.drou...@gmail.com
+
+- Updated to 1.78.0, see 
http://snapshots.docbook.org/xsl/RELEASE-NOTES.html#V1.78.0
+  for details (Mostly bugfix release) 
+
+---

Old:

  docbook-xsl-1.77.1.tar.bz2
  docbook-xsl-doc-1.77.1.tar.bz2

New:

  docbook-xsl-1.78.0.tar.bz2
  docbook-xsl-doc-1.78.0.tar.bz2



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.yVVEzJ/_old  2013-03-08 13:01:34.0 +0100
+++ /var/tmp/diff_new_pack.yVVEzJ/_new  2013-03-08 13:01:34.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package docbook-xsl-stylesheets
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,8 +15,12 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define pack_vers 1.77.1
-%define regcat /usr/bin/sgml-register-catalog
+
+%define dbstyle_dir%{_datadir}/xml/docbook/stylesheet/nwalsh
+%define dbstyle_catalog%{name}.xml
+%define suse_catalog   %{_sysconfdir}/xml/suse-catalog.xml
+%define xmlcatalog %{_bindir}/xmlcatalog
+%define dbstyle_catalog_entry for-catalog-%{name}-%{version}.xml
 
 Name:   docbook-xsl-stylesheets
 Summary:XSL Stylesheets for DocBook 4
@@ -26,16 +30,18 @@
 BuildRequires:  sgml-skel
 BuildRequires:  unzip
 BuildArch:  noarch
-Requires:   xmlcharent docbook_4
-PreReq: sgml-skel %{regcat} /usr/bin/xmlcatalog
-Version:1.77.1
+Requires:   docbook_4
+Requires:   xmlcharent
+PreReq: sgml-skel %{_bindir}/xmlcatalog
+Version:1.78.0
 Release:0
-Source0:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{pack_vers}.tar.bz2
+Source0:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{version}.tar.bz2
 Source1:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{version}.tar.bz2
 Patch0: %{name}-dbtoepub.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Url:http://sourceforge.net/projects/docbook/
 
+#--
 %description
 These are the XSL stylesheets for DocBook XML and Simplified DocBook
 DTDs. Use these stylesheets for documents based on DocBook 4 and
@@ -48,187 +54,138 @@
 rendering. For more information about XSL, see the XSL page at the W3C:
 http://www.w3.org/Style/XSL/
 
-%define INSTALL install -m755 -s
-%define INSTALL_DIR install -d -m755
-%define INSTALL_DATA install -m644
-%define INSTALL_SCRIPT install -m755
-%define sgml_dir %{_datadir}/sgml
-%define sgml_var_dir /var/lib/sgml
-%define sgml_mod_dir %{sgml_dir}/docbook
-%define sgml_mod_dtd_dir %{sgml_mod_dir}/dtd
-%define sgml_mod_custom_dir %{sgml_mod_dir}/custom
-%define sgml_mod_style_dir %{sgml_mod_dir}/stylesheet
-%define xml_dir %{_datadir}/xml
-%define xml_mod_dir %{xml_dir}/docbook
-%define xml_mod_dtd_dir %{xml_mod_dir}/dtd
-%define xml_mod_custom_dir %{xml_mod_dir}/custom
-%define xml_mod_style_dir %{xml_mod_dir}/stylesheet
-%define xml_mod_style_prod_dir %{xml_mod_style_dir}/nwalsh
-%define sgml_config_dir /var/lib/sgml
-%define sgml_sysconf_dir %{_sysconfdir}/sgml
-%define xml_config_dir /var/lib/xml
-%define xml_sysconf_dir %{_sysconfdir}/xml
 
+#--
 %prep
-# %%setup -q -n docbook-xsl-%%{pack_vers} -b 10
-%setup -q -n docbook-xsl-%{pack_vers} -b 1
+%setup -q -n docbook-xsl-%{version} -b1
 %patch0 -p1
 
-# mv epub/bin/dbtoepub epub/bin/dbtoepub.tmp
-sed -i 's=@@EPUBDIR@@=%{xml_mod_style_prod_dir}/current//epub/bin='  
epub/bin/dbtoepub
-
-# We don't need these scripts:
-rm -rf install.sh tools/bin/docbook-xsl-update
+#--
+%build
 
-find 

commit docbook-xsl-stylesheets for openSUSE:Factory

2012-06-13 Thread h_root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2012-06-13 13:10:35

Comparing /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets (Old)
 and  /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new (New)


Package is docbook-xsl-stylesheets, Maintainer is k...@suse.com

Changes:

--- 
/work/SRC/openSUSE:Factory/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes
  2012-02-16 16:12:34.0 +0100
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2012-06-13 13:10:37.0 +0200
@@ -1,0 +2,21 @@
+Mon Jun 11 13:13:30 UTC 2012 - t...@opensuse.org
+
+- Fixed SPEC file:
+  * added missing db2epub in /epub/bin/
+  * create symbolic links (-s) with fdupes
+
+---
+Tue Jun  5 09:57:35 UTC 2012 - t...@opensuse.org
+
+- Updated to 1.77.1, see 
http://snapshots.docbook.org/xsl/RELEASE-NOTES.html#V1.77.1
+  for details (Mostly bugfix release) 
+- Fixed spec file to copy VERSION.xsl instead of VERSION
+
+---
+Fri May 25 08:53:52 UTC 2012 - t...@opensuse.org
+
+- Updated to 1.77.0, see 
http://snapshots.docbook.org/xsl/RELEASE-NOTES.html#V1.77.0
+  for details
+  (Merged from Factory)
+
+---

Old:

  docbook-xsl-1.76.1.tar.bz2
  docbook-xsl-doc-1.76.1.tar.bz2

New:

  docbook-xsl-1.77.1.tar.bz2
  docbook-xsl-doc-1.77.1.tar.bz2



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.7tnQRU/_old  2012-06-13 13:10:39.0 +0200
+++ /var/tmp/diff_new_pack.7tnQRU/_new  2012-06-13 13:10:39.0 +0200
@@ -15,7 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define pack_vers 1.76.1
+%define pack_vers 1.77.1
 %define regcat /usr/bin/sgml-register-catalog
 
 Name:   docbook-xsl-stylesheets
@@ -28,7 +28,7 @@
 BuildArch:  noarch
 Requires:   xmlcharent docbook_4
 PreReq: sgml-skel %{regcat} /usr/bin/xmlcatalog
-Version:1.76.1
+Version:1.77.1
 Release:0
 Source0:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{pack_vers}.tar.bz2
 Source1:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{version}.tar.bz2
@@ -134,18 +134,18 @@
 
 %install
 # FIXME: Danger!?
-export NO_BRP_CHECK_BYTECODE_VERSION=true
+# export NO_BRP_CHECK_BYTECODE_VERSION=true
 
 # Install scripts
 %{INSTALL_DIR} %{buildroot}%{_bindir}
 %{INSTALL_SCRIPT} fo/pdf2index   %{buildroot}%{_bindir}
 %{INSTALL_SCRIPT} epub/bin/dbtoepub  %{buildroot}%{_bindir}
-rm fo/pdf2index  epub/bin/dbtoepub
+rm fo/pdf2index 
 
 doc_dir=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name}
 %{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/%{version}
 cp -a [[:lower:]]* $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/%{version}
-cp -a VERSION $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/%{version}
+cp -a VERSION.xsl $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/%{version}
 find $RPM_BUILD_ROOT%{xml_mod_style_prod_dir} -type f -name '*.orig' -exec rm 
-f {} \;
 rm -f $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/%{version}/for-catalog*
 : %{name}_list
@@ -190,7 +190,6 @@
 %{INSTALL_DIR} $cat_dir
 %{INSTALL_DATA} %{FOR_ROOT_CAT} %{name}.xml $cat_dir
 # cleanup
-%fdupes $RPM_BUILD_ROOT
 rm -f %{buildroot}%{xml_mod_style_prod_dir}/%{version}/%{name}.xml
 cp $cat_dir/%{FOR_ROOT_CAT} \
   %{buildroot}%{xml_mod_style_prod_dir}/%{version}/%{name}.xml
@@ -200,6 +199,9 @@
 # %%{buildroot}%%{xml_mod_style_prod_dir}/%%{version}/epub/bin/lib/docbook.rb
 # 
%%{buildroot}%%{xml_mod_style_prod_dir}/%%{version}/epub/bin/spec/spec_helper.rb
 
+%fdupes -s $RPM_BUILD_ROOT
+
+
 %post
 # remove empty dir if present (from ghost)
 # also remove dangling symlink

++ docbook-xsl-1.76.1.tar.bz2 - docbook-xsl-1.77.1.tar.bz2 ++
 169285 lines of diff (skipped)

++ docbook-xsl-doc-1.76.1.tar.bz2 - docbook-xsl-doc-1.77.1.tar.bz2 ++
 28399 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit docbook-xsl-stylesheets for openSUSE:Factory

2012-02-16 Thread h_root
Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory checked in at 2012-02-16 16:12:32

Comparing /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets (Old)
 and  /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new (New)


Package is docbook-xsl-stylesheets, Maintainer is k...@suse.com

Changes:

--- 
/work/SRC/openSUSE:Factory/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes
  2011-09-23 01:55:41.0 +0200
+++ 
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
 2012-02-16 16:12:34.0 +0100
@@ -1,0 +2,5 @@
+Thu Jan 12 11:30:33 UTC 2012 - co...@suse.com
+
+- change license to be in spdx.org format
+
+---



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.lPSrdd/_old  2012-02-16 16:12:35.0 +0100
+++ /var/tmp/diff_new_pack.lPSrdd/_new  2012-02-16 16:12:35.0 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package docbook-xsl-stylesheets
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,20 +15,21 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 %define pack_vers 1.76.1
 %define regcat /usr/bin/sgml-register-catalog
 
 Name:   docbook-xsl-stylesheets
 Summary:XSL Stylesheets for DocBook 4
-BuildRequires:  fdupes sgml-skel unzip
-License:MPL and X11
+License:MPL-1.1 and MIT
 Group:  Productivity/Publishing/DocBook
+BuildRequires:  fdupes
+BuildRequires:  sgml-skel
+BuildRequires:  unzip
 BuildArch:  noarch
 Requires:   xmlcharent docbook_4
 PreReq: sgml-skel %{regcat} /usr/bin/xmlcatalog
 Version:1.76.1
-Release:1
+Release:0
 Source0:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{pack_vers}.tar.bz2
 Source1:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{version}.tar.bz2
 Patch0: %{name}-dbtoepub.patch

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit docbook-xsl-stylesheets for openSUSE:Factory

2011-09-21 Thread h_root

Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory
checked in at Wed Sep 21 17:00:39 CEST 2011.




--- docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2011-09-18 
19:33:43.0 +0200
+++ 
/mounts/work_src_done/STABLE/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes
2011-09-21 12:32:56.0 +0200
@@ -1,0 +2,6 @@
+Wed Sep 21 10:32:26 UTC 2011 - co...@suse.com
+
+- remove ruby requires, there is nothing in here using ruby and
+  ruby needs this package indirectly - creating a build cycle
+
+---

calling whatdependson for head-i586




Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.Y3VR55/_old  2011-09-21 17:00:33.0 +0200
+++ /var/tmp/diff_new_pack.Y3VR55/_new  2011-09-21 17:00:33.0 +0200
@@ -22,12 +22,10 @@
 Name:   docbook-xsl-stylesheets
 Summary:XSL Stylesheets for DocBook 4
 BuildRequires:  fdupes sgml-skel unzip
-BuildRequires:  ruby
 License:MPL and X11
 Group:  Productivity/Publishing/DocBook
 BuildArch:  noarch
 Requires:   xmlcharent docbook_4
-Requires:   ruby
 PreReq: sgml-skel %{regcat} /usr/bin/xmlcatalog
 Version:1.76.1
 Release:1






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit docbook-xsl-stylesheets for openSUSE:Factory

2011-09-19 Thread h_root

Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory
checked in at Mon Sep 19 16:44:50 CEST 2011.




--- docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2011-04-12 
13:32:29.0 +0200
+++ 
/mounts/work_src_done/STABLE/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes
2011-09-18 19:33:43.0 +0200
@@ -1,0 +2,6 @@
+Sun Sep 18 17:17:12 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+  (cf. packaging guidelines)
+
+---

calling whatdependson for head-i586




Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.HCclRI/_old  2011-09-19 16:44:46.0 +0200
+++ /var/tmp/diff_new_pack.HCclRI/_new  2011-09-19 16:44:46.0 +0200
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 %define pack_vers 1.76.1
 %define regcat /usr/bin/sgml-register-catalog
@@ -26,7 +25,6 @@
 BuildRequires:  ruby
 License:MPL and X11
 Group:  Productivity/Publishing/DocBook
-AutoReqProv:on
 BuildArch:  noarch
 Requires:   xmlcharent docbook_4
 Requires:   ruby
@@ -51,13 +49,6 @@
 rendering. For more information about XSL, see the XSL page at the W3C:
 http://www.w3.org/Style/XSL/
 
-
-
-Authors:
-
-Norman Walsh n...@nwalsh.com
-Michael Smith sm...@xml-doc.org
-
 %define INSTALL install -m755 -s
 %define INSTALL_DIR install -d -m755
 %define INSTALL_DATA install -m644
@@ -228,9 +219,6 @@
 --del %{name}-%{version}
 fi
 
-%clean
-rm -fr $RPM_BUILD_ROOT
-
 %files -f %{name}_list
 %defattr(-, root, root)
 %config %{_sysconfdir}/xml/%{name}.xml






Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org



commit docbook-xsl-stylesheets for openSUSE:Factory

2011-04-22 Thread h_root

Hello community,

here is the log from the commit of package docbook-xsl-stylesheets for 
openSUSE:Factory
checked in at Fri Apr 22 22:49:55 CEST 2011.




--- docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2009-12-24 
12:02:50.0 +0100
+++ 
/mounts/work_src_done/STABLE/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes
2011-04-12 13:32:29.0 +0200
@@ -1,0 +2,15 @@
+Tue Apr 12 06:30:39 UTC 2011 - t...@suse.de
+
+- Update to 1.76.1; for news, see
+  http://lists.oasis-open.org/archives/docbook-apps/201011/msg7.html
+- Moved pdf2index and dbtoepub to /usr/bin
+- Cleaned up Spec file to avoid rpmlint warnings
+- Removed now obsolete chunktoc-fix.patch
+
+---
+Wed Apr 14 12:28:37 CEST 2010 - mma...@suse.cz
+
+- chunktoc.xsl: Added missing namespace declarations. Closes
+  bug #2890069.
+
+---

calling whatdependson for head-i586


Old:

  docbook-xsl-1.75.2.tar.bz2
  docbook-xsl-doc-1.75.2.tar.bz2

New:

  docbook-xsl-1.76.1.tar.bz2
  docbook-xsl-doc-1.76.1.tar.bz2
  docbook-xsl-stylesheets-dbtoepub.patch



Other differences:
--
++ docbook-xsl-stylesheets.spec ++
--- /var/tmp/diff_new_pack.0A0b0T/_old  2011-04-22 22:48:35.0 +0200
+++ /var/tmp/diff_new_pack.0A0b0T/_new  2011-04-22 22:48:35.0 +0200
@@ -1,7 +1,7 @@
 #
-# spec file for package docbook-xsl-stylesheets (Version 1.75.2)
+# spec file for package docbook-xsl-stylesheets
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,23 +17,25 @@
 
 # norootforbuild
 
+%define pack_vers 1.76.1
+%define regcat /usr/bin/sgml-register-catalog
 
 Name:   docbook-xsl-stylesheets
+Summary:XSL Stylesheets for DocBook 4
 BuildRequires:  fdupes sgml-skel unzip
+BuildRequires:  ruby
 License:MPL and X11
 Group:  Productivity/Publishing/DocBook
 AutoReqProv:on
 BuildArch:  noarch
 Requires:   xmlcharent docbook_4
-%define regcat /usr/bin/sgml-register-catalog
+Requires:   ruby
 PreReq: sgml-skel %{regcat} /usr/bin/xmlcatalog
-Summary:XSL Stylesheets for DocBook 4
-Version:1.75.2
-Release:3
-Source0:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{version}.tar.bz2
+Version:1.76.1
+Release:1
+Source0:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{pack_vers}.tar.bz2
 Source1:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{version}.tar.bz2
-# %define pack_vers snapshot
-%define pack_vers %{version}
+Patch0: %{name}-dbtoepub.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 Url:http://sourceforge.net/projects/docbook/
 
@@ -59,7 +61,7 @@
 %define INSTALL install -m755 -s
 %define INSTALL_DIR install -d -m755
 %define INSTALL_DATA install -m644
-%define INSTALL_SCRIPT install -m755 -o root -g root
+%define INSTALL_SCRIPT install -m755
 %define sgml_dir %{_datadir}/sgml
 %define sgml_var_dir /var/lib/sgml
 %define sgml_mod_dir %{sgml_dir}/docbook
@@ -78,16 +80,19 @@
 %define xml_sysconf_dir %{_sysconfdir}/xml
 
 %prep
-# %setup -q -n docbook-xsl-%{pack_vers} -b 10
+# %%setup -q -n docbook-xsl-%%{pack_vers} -b 10
 %setup -q -n docbook-xsl-%{pack_vers} -b 1
-### snap
-#unzip -a %{S:100}
-#cp -a docbook-xsl-snapshot/* .
-### snap end
-# cp -p %{SOURCE1} README.SuSE
-# cp %{S:2} fo
+%patch0 -p1
+
+# mv epub/bin/dbtoepub epub/bin/dbtoepub.tmp
+sed -i 's=@@EPUBDIR@@=%{xml_mod_style_prod_dir}/current//epub/bin='  
epub/bin/dbtoepub
+
+# We don't need these scripts:
+rm -rf install.sh tools/bin/docbook-xsl-update
+
+find -type f  -exec chmod -x {} \;
 chmod -R a+rX,g-w,o-w .
-chmod -x images/*.{svg,png,gif,tif} images/callouts/*.{svg,png,gif}
+chmod -x images/*.{svg,png,gif,tif} images/callouts/*.{svg,png,gif} 
extensions/docbook.py
 # Start cleanup (to avoid warnings for rpmlint
 [ -f ./extensions/saxon65/dist/saxon65.jar ]  rm -rf 
./extensions/saxon65/dist/saxon65.jar
 [ -f ./extensions/xalan27/dist/xalan27.jar ]  rm -rf 
./extensions/xalan27/dist/xalan27.jar
@@ -105,8 +110,8 @@
 %build
 xmlcatbin=/usr/bin/xmlcatalog
 CATALOG=%{name}.xml
-# file:///usr/share/sgml/docbook/ = %{sgml_mod_dir} map it to
-# %{xml_mod_style_prod_dir}/%{version}
+# file:///usr/share/sgml/docbook/ = %%{sgml_mod_dir} map it to
+# %%{xml_mod_style_prod_dir}/%%{version}
 $xmlcatbin --noout --create $CATALOG
 /usr/bin/xmlcatalog --noout --add rewriteSystem \
  http://docbook.sourceforge.net/release/xsl/%{version}; \
@@ -129,7 +134,7 @@
   file:///$CATALOG