docbook-style-xsl-1.79.2-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11579 ec354946-7b23-47d6-9f5a-488ba84defc7

d/docbook-style-xsl/docbook-style-xsl-vl.spec

@@ -1,17 +1,17 @@
 Name: docbook-style-xsl
-Version: 1.78.1
+Version: 1.79.2
 Release: 1%{?_dist_release}
 Group: Applications/Text
 
 Summary: Norman Walsh's XSL stylesheets for DocBook XML.
 Summary(ja): DocBook XML用 XSLスタイルシート
 
-License: Copyright only
-URL: http://docbook.sourceforge.net/projects/xsl/
+License: DMIT
+URL: https://github.com/docbook/xslt10-stylesheets
 
-Source0: http://downloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.bz2
+Source0: https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F%{version}/docbook-xsl-nons-%{version}.tar.bz2
 Source1: %{name}.Makefile
-Source2: http://downloads.sourceforge.net/docbook/docbook-xsl-doc-%{version}.tar.bz2
+Source2: https://github.com/docbook/xslt10-stylesheets/releases/download/release%2F%{version}/docbook-xsl-doc-%{version}.tar.bz2
 
 # Avoid proportional-column-width for passivetex (bug #176766).
 Patch1: docbook-xsl-pagesetup.patch
@@ -25,7 +25,8 @@ Patch4: docbook-xsl-non-constant-expressions.patch
 Patch5: docbook-xsl-list-item-body.patch
 #workaround missing mandir section problem (#727251)
 Patch6: docbook-xsl-mandir.patch
-
+#Non-recursive string.subst that doesn't kill smb.conf.5 generation
+Patch7: docbook-style-xsl-non-recursive-string-subst.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
@@ -53,7 +54,9 @@ other formats, such as HTML, FO, and XHMTL.  They are highly customizable.
 
 
 %prep
-%setup -q -n docbook-xsl-%{version}
+%setup -c -T -n docbook-xsl-%{version}
+tar jxf %{SOURCE0}
+mv docbook-xsl-nons-%{version}/* .
 pushd ..
 tar jxf %{SOURCE2}
 popd
@@ -63,6 +66,7 @@ popd
 %patch4 -p1 -b .nonconstant
 %patch5 -p1 -b .listitembody
 %patch6 -p1 -b .mandir
+%patch7 -p2 -b .non-recursive-subst
 
 cp %{SOURCE1} Makefile
 
@@ -99,18 +103,25 @@ rm -rf $DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets/extensions/*
 %post
 CATALOG=%{_sysconfdir}/xml/catalog
 %{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
- "http://docbook.sourceforge.net/release/xsl/%{version}" \
+ "http://cdn.docbook.org/release/xsl-nons/%{version}" \
+ "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
+%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
+ "http://cdn.docbook.org/release/xsl-nons/%{version}" \
+ "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
+%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
+ "http://cdn.docbook.org/release/xsl-nons/current/" \
  "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
 %{_bindir}/xmlcatalog --noout --add "rewriteURI" \
- "http://docbook.sourceforge.net/release/xsl/%{version}" \
+ "http://cdn.docbook.org/release/xsl-nons/current/" \
  "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
+#keep the old one sourceforge URIs at least temporarily
 %{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
  "http://docbook.sourceforge.net/release/xsl/current" \
  "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
 %{_bindir}/xmlcatalog --noout --add "rewriteURI" \
  "http://docbook.sourceforge.net/release/xsl/current" \
  "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
-
+ 
 %postun
 # remove entries only on removal of package
 if [ "$1" = 0 ]; then
@@ -119,7 +130,6 @@ if [ "$1" = 0 ]; then
    "file://%{_datadir}/sgml/docbook/xsl-stylesheets-%{version}" $CATALOG
 fi
 
-
 %files
 %defattr (-,root,root)
 %doc BUGS README TODO doc
@@ -128,6 +138,11 @@ fi
 
 
 %changelog
+* Thu Mar 08 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.79.2-1
+- new upstream release.
+- updated Patch1 and 6.
+- imported Patch7 from rawhide.
+
 * Sun Nov 16 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.78.1-1
 - new upstream release
 - update Patch2 from fedora