Hello community, here is the log from the commit of package docbook5-xsl-stylesheets for openSUSE:Factory checked in at 2012-09-20 14:58:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docbook5-xsl-stylesheets (Old) and /work/SRC/openSUSE:Factory/.docbook5-xsl-stylesheets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docbook5-xsl-stylesheets", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/docbook5-xsl-stylesheets/docbook5-xsl-stylesheets.changes 2011-09-23 01:55:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.docbook5-xsl-stylesheets.new/docbook5-xsl-stylesheets.changes 2012-09-20 14:58:17.000000000 +0200 @@ -1,0 +2,23 @@ +Tue Sep 18 06:51:36 UTC 2012 - [email protected] + +- license update: SUSE-Docbook-XSL and Apache-2.0 and MIT and EPL-1.0 and + MPL-1.1 and BSD-3-Clause and HPND and Zlib and LGPL-2.1+ + Package aggregates all of the above licenses. Added SUSE-Docbook-XSL + instead of MIT as the COPYING file is not ^pure^ MIT but contains two + additional clauses + +------------------------------------------------------------------- +Fri Sep 14 11:38:34 UTC 2012 - [email protected] + +- Fixed bnc#780451: used docbook_5 instead of docbook_4; fixed typo + in summary + +------------------------------------------------------------------- +Thu Jun 14 12:12:32 UTC 2012 - [email protected] + +- Updated to 1.77.1, see http://snapshots.docbook.org/xsl/RELEASE-NOTES.html#V1.77.1 + for details (Mostly bugfix release) +- Made spec file consistent with docbook-xsl-stylesheet package + (it's mostly the same) + +------------------------------------------------------------------- Old: ---- docbook-xsl-ns-1.76.1.tar.bz2 New: ---- docbook-xsl-ns-1.77.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook5-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.RPTYhD/_old 2012-09-20 14:58:18.000000000 +0200 +++ /var/tmp/diff_new_pack.RPTYhD/_new 2012-09-20 14:58:18.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package docbook5-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 @@ -16,35 +16,30 @@ # -%define regcat /usr/bin/sgml-register-catalog -%define pack_vers %{version} +%define dbstyle_dir %{_datadir}/xml/docbook/stylesheet/nwalsh5 +%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: docbook5-xsl-stylesheets -BuildRequires: bzip2 sgml-skel unzip -Url: http://www.docbook.org -License: SUSE-Public-Domain +Summary: XSL Stylesheets for DocBook 5 +License: SUSE-Docbook-XSL and Apache-2.0 and MIT and EPL-1.0 and MPL-1.1 and BSD-3-Clause and HPND and Zlib and LGPL-2.1+ Group: Productivity/Publishing/DocBook -BuildArch: noarch BuildRequires: fdupes -Requires: xmlcharent docbook_5 awk coreutils -Provides: docbkxsl -PreReq: %{regcat} /usr/bin/xmlcatalog -Summary: XSL Stylesheets for DocBook 5 -Version: 1.76.1 -Release: 1 +BuildRequires: sgml-skel +BuildRequires: unzip +BuildArch: noarch +Requires: docbook_5 +Requires: xmlcharent +PreReq: sgml-skel %{_bindir}/xmlcatalog +Version: 1.77.1 +Release: 0 Source0: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-ns-%{version}.tar.bz2 Source1: %{name}-rpmlintrc -### snap -#Source100: docbook-xsl-snapshot.zip -### snap end -#Source0: http://docbook.sourceforge.net/snapshot/docbook-xsl-snapshot.tar.bz2 -#Source10: http://docbook.sourceforge.net/snapshot/docbook-xsl-doc-snapshot.tar.bz2 -#Patch: manpages-block-sp.patch -#Patch1: manpages-block-sp-2.patch -# %define pack_vers snapshot -#Source1: %{name}-README.SuSE -# Patch: docbkxsl.dif +# Patch0: %%{name}-dbtoepub.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +Url: http://sourceforge.net/projects/docbook/ %description These are the XSL stylesheets for DocBook. Generally, the stylesheets @@ -54,184 +49,138 @@ stylesheet language for both print and online rendering. For more information about XSL, see the XSL page at theW3C. -%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 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}/nwalsh5 -%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-ns-%{version} -# Make some small modifications: -#find . -name .gitignore | xargs %{__rm} - -find -name "*.py" | xargs %{__chmod} 0755 -find -name "*.rb" | xargs %{__chmod} 0755 -[ -f epub/bin/dbtoepub ] && %{__chmod} 0755 epub/bin/dbtoepub -[ -f epub/bin/lib/docbook.rb ] && %{__chmod} 0755 epub/bin/lib/docbook.rb -%{__chmod} -R a+rX,g-w,o-w . -%{__chmod} -x images/*.{svg,png,gif,tif} images/callouts/*.{svg,png,gif} -# 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 -#x=$(find {lib,html,fo,lib,website,slides/fo,slides/html,roundtrip,manpages}/.[a-zA-Z0-9]* -maxdepth 1 -type f ) -#if [ "$x" != '' ]; then -## rm $x; -# for i in $x; do -# if [ -f $i ]; then -# rm $i -# fi -# done -#fi -# End Cleanup +# %%patch0 -p1 +#-------------------------------------------------------------------------- %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} -$xmlcatbin --noout --create $CATALOG -/usr/bin/xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl-ns/%{version}"; \ - "file://%{xml_mod_style_prod_dir}/%{version}" $CATALOG -/usr/bin/xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl-ns/%{version}"; \ - "file://%{xml_mod_style_prod_dir}/%{version}" $CATALOG -/usr/bin/xmlcatalog --noout --add "rewriteSystem" \ - "http://docbook.sourceforge.net/release/xsl-ns/current"; \ - "file://%{xml_mod_style_prod_dir}/%{version}" $CATALOG -/usr/bin/xmlcatalog --noout --add "rewriteURI" \ - "http://docbook.sourceforge.net/release/xsl-ns/current"; \ - "file://%{xml_mod_style_prod_dir}/%{version}" $CATALOG -%define FOR_ROOT_CAT for-catalog-%{name}-%{version}.xml -CATALOG=etc/xml/$CATALOG -%{__rm} -f %{FOR_ROOT_CAT}.tmp -$xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp -$xmlcatbin --noout --add "delegateSystem" \ - "http://docbook.sourceforge.net/release/xsl-ns/"; \ - "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp -# $xmlcatbin --noout --add "delegatePublic" \ -# "-//OASIS//xxx" \ -# "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp -# Create tag -sed '/<catalog/a\ - <group id="%{name}-%{version}"> -/<\/catalog/i\ - </group>' \ - %{FOR_ROOT_CAT}.tmp > %{FOR_ROOT_CAT} +# +# Creating catalog entries +# + +# +# /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} + +#-------------------------------------------------------------------------- %install -mkdir -p %buildroot -# export NO_BRP_CHECK_BYTECODE_VERSION=true -#export RPM_BUILD_ROOT -#if [ ! "x" = "x$RPM_BUILD_ROOT" ]; then -# %{__rm} -fr $RPM_BUILD_ROOT -# %{__mkdir} %{buildroot} -#fi -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} -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 -{ - pushd $RPM_BUILD_ROOT%{xml_mod_style_prod_dir} >/dev/null -# do not create the current link for snapshots -# if ! echo %{S:0} | grep -q snapshot; then + +# 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} + +# 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 +# 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 +# +if ! echo %{S:0} | grep -q snapshot; then + pushd %{buildroot}%{dbstyle_dir} >/dev/null ln -sf %{version} current - echo %{xml_mod_style_prod_dir}/current -# fi popd >/dev/null -} >%{name}_list -%{INSTALL_DIR} $doc_dir -# documentation -for f in README BUGS TODO WhatsNew RELEASE-NOTES.html; do - # On snapshots, WhatsNew is missing - [ -f $f ] && %{INSTALL_DATA} $f $doc_dir/$f -done -#cp -p README.SuSE $doc_dir/README.SuSE +fi + +# install the catalog files # -{ - LANG=C \ - find %{buildroot}%{xml_mod_style_prod_dir}/%{version} \ - -type d \ - -not -path '%{buildroot}%{xml_mod_style_prod_dir}/%{version}/latex*' \ - | sed 's|%{buildroot}|%dir |' - LANG=C \ - find %{buildroot}%{xml_mod_style_prod_dir}/%{version} \ - -type f \ - -not -path '%{buildroot}%{xml_mod_style_prod_dir}/%{version}/latex*' \ - | sed 's|%{buildroot}||' -} >> %{_builddir}/%{buildsubdir}/%{name}_list -# pushd %{buildroot}%{xml_mod_style_prod_dir} -# rm -f docbook-xsl -# ln -sf docbook-xsl-stylesheets-%{version} docbook-xsl-ns -# rm -f xsl-stylesheets -# ln -sf docbook-xsl-stylesheets-%{version} xsl-ns-stylesheets -# rm -f %{name} -# ln -sf docbook-xsl-stylesheets-%{version} %{name} -# popd -cat_dir=%{buildroot}/etc/xml -%{INSTALL_DIR} $cat_dir -%{INSTALL_DATA} %{FOR_ROOT_CAT} %{name}.xml $cat_dir -%fdupes -s %buildroot - -%pre -# in case of an update check for old dirs (affected systems <= SL 9.0) -old="docbook-xsl*" -pushd %{sgml_dir}/docbook >/dev/null -{ - for f in $old; do - [ -d $f ] && echo $f || : - [ -L $f ] && echo $f || : - done -} >> /var/adm/SuSEconfig/run-sgmldir-links +%__install -m644 %{dbstyle_catalog} %{buildroot}%{_sysconfdir}/xml +%__install -m644 %{dbstyle_catalog_entry} %{buildroot}%{_sysconfdir}/xml + +# the docs come last +# +# %%__tar c -C doc . | (cd %%{buildroot}%%{_defaultdocdir}/%%{name}/html; %%__tar xp); + +%fdupes -s %{buildroot} +#-------------------------------------------------------------------------- %post -# remove empty dir if present (from ghost) -# also remove dangling symlink -D=usr/share/sgml -rmdir $D/docbkxsl >/dev/null 2>&1 || : -test -L $D/docbkxsl -a ! -e $D/docbkxsl && %{__rm} -f $D/docbkxsl -if [ -x /usr/bin/edit-xml-catalog ] ; then - edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --add /etc/xml/%{FOR_ROOT_CAT} -fi +# +# XML Catalog entries for daps profiling +# +# 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 +%{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} \ + --add %{_sysconfdir}/xml/%{dbstyle_catalog_entry} +exit 0 + +#-------------------------------------------------------------------------- %postun -# remove entries only on removal of file -if [ ! -f %{xml_sysconf_dir}/%{FOR_ROOT_CAT} -a -x /usr/bin/edit-xml-catalog ] ; then - edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{name}-%{version} +# +# delete catalog entry for daps profiling +# 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 + %{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} --del %{name} + fi fi -%files -f %{name}_list +exit 0 + +#-------------------------------------------------------------------------- +%files %defattr(-, root, root) -# compatibility link; will go away with SuSE Linux >= 8.x -%config %{_sysconfdir}/xml/%{name}.xml -%config %{_sysconfdir}/xml/%{FOR_ROOT_CAT} -%{_defaultdocdir}/%{name} -# %dir %{xml_dir} -#%dir %{xml_mod_dir} -%dir %{xml_mod_style_dir} -%dir %{xml_mod_style_prod_dir} -# it is now in the list: -# %{xml_mod_style_prod_dir}/current + +%dir %{_datadir}/xml/docbook/stylesheet +%dir %{dbstyle_dir} +%dir %{dbstyle_dir}/%{version} + +%config %{_sysconfdir}/xml/*.xml + +%doc BUGS NEWS README RELEASE-NOTES.txt TODO + +%{_bindir}/* +%{dbstyle_dir}/current +%{dbstyle_dir}/%{version}/* %changelog ++++++ docbook-xsl-ns-1.76.1.tar.bz2 -> docbook-xsl-ns-1.77.1.tar.bz2 ++++++ ++++ 169039 lines of diff (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
