Hello community, here is the log from the commit of package subversion-doc for openSUSE:Factory checked in at 2011-12-21 15:41:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/subversion-doc (Old) and /work/SRC/openSUSE:Factory/.subversion-doc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "subversion-doc", Maintainer is "dmuel...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/subversion-doc/subversion-doc.changes 2011-09-23 12:47:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.subversion-doc.new/subversion-doc.changes 2011-12-21 15:41:46.000000000 +0100 @@ -1,0 +2,14 @@ +Tue Dec 13 18:02:19 CET 2011 - dmuel...@suse.de + +- small cleanups + +------------------------------------------------------------------- +Tue Dec 6 22:38:07 UTC 2011 - andreas.stie...@gmx.de + +- update to /branches/1.7 r4229 +- adjust to changed source tree structure +- use revision from version for subtitle, + subversion-doc.svn.version.patch no longer required +- use distribution's docbook-xsl package + +------------------------------------------------------------------- Old: ---- docbook-xsl-1.72.0.tar.bz2 subversion-doc.svn.version.patch subversion-doc.svnbook-trunk.tar.bz2 New: ---- subversion-doc-1.7.r4229.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion-doc.spec ++++++ --- /var/tmp/diff_new_pack.QIH0SB/_old 2011-12-21 15:41:47.000000000 +0100 +++ /var/tmp/diff_new_pack.QIH0SB/_new 2011-12-21 15:41:47.000000000 +0100 @@ -15,53 +15,43 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: subversion-doc -BuildRequires: docbook-xsl-stylesheets docbook2x libxslt -Version: 1.6.svn3904 -Release: 1 +BuildRequires: docbook-xsl-stylesheets +BuildRequires: libxslt +Version: 1.7.r4229 +Release: 0 BuildArch: noarch # -%define docbook_xsl_version 1.72.0 -# %define apache_sysconfdir /etc/apache2 # Summary: Documentation files for Subversion -BuildRoot: %{_tmppath}/%{name}-%{version}-build -License: CC-BY 2.0 +License: CC-BY-2.0 Group: Development/Tools/Version Control +# from http://svnbook.red-bean.com/en/1.7/svn.copyright.html +BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://svnbook.red-bean.com/ -Source0: subversion-doc.svnbook-trunk.tar.bz2 -Source1: http://prdownloads.sourceforge.net/docbook/docbook-xsl-%{docbook_xsl_version}.tar.bz2 -Source2: subversion.doc.conf -Patch0: subversion-doc.svn.version.patch -# +Source0: %{name}-%{version}.tar.bz2 +Source1: subversion.doc.conf %description This package contains the subversion book (see http://svnbook.red-bean.com/) and a configuration file to make this book accessible via apache2. - - %prep -%setup -q -T -c -a 0 -a 1 -%patch0 -p0 +%setup -q +ln -sv /usr/share/xml/docbook/stylesheet/nwalsh/current/ tools/xsl %build -mv -v docbook-xsl-%{docbook_xsl_version} svnbook-trunk/src/tools//xsl -cd svnbook-trunk/src/en/ -make all-html SVNVERSION=/bin/false +cd en +SVNVERSION=`echo "%{version}" | sed -r "s/[0-9]+\.[0-9]+\.(r[0-9]+)/\1/"` +sed -i "s/&svn\.version;/${SVNVERSION}/g" book/book.xml +%__make book-html SVNVERSION=/bin/false %install -rm -rf $RPM_BUILD_ROOT -mkdir $RPM_BUILD_ROOT -cd svnbook-trunk/src/en/ -make install-book-html SVNVERSION=/bin/false INSTALL_DIR=$RPM_BUILD_ROOT%{_defaultdocdir}/subversion/html -mkdir -p $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d -cp -av %{S:2} $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/subversion.doc.conf +cd en +%__make install-html SVNVERSION=/bin/false INSTALL_DIR=$RPM_BUILD_ROOT%{_defaultdocdir}/subversion/html +install -m 644 -D %{S:1} $RPM_BUILD_ROOT/%{apache_sysconfdir}/conf.d/subversion.doc.conf find $RPM_BUILD_ROOT -type d -print0 | xargs -0 chmod 755 find $RPM_BUILD_ROOT -type f -print0 | xargs -0 chmod 644 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
