[packages/syslog-ng] fix paths in manual pages

glen glen at pld-linux.org
Mon Sep 30 21:05:36 CEST 2013


commit cd31ca9ba2103963305e678ce9575603c556285f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Sep 30 22:04:23 2013 +0300

    fix paths in manual pages

 man-paths.patch | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 syslog-ng.spec  |  8 ++++++-
 2 files changed, 74 insertions(+), 1 deletion(-)
---
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 1c953d3..4d25db3 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -42,11 +42,13 @@ Patch0:		%{name}-datadir.patch
 Patch1:		cap_syslog-vserver-workaround.patch
 Patch2:		%{name}-nolibs.patch
 Patch3:		%{name}-systemd.patch
+Patch4:		man-paths.patch
 URL:		http://www.balabit.com/products/syslog_ng/
 BuildRequires:	GeoIP-devel >= 1.5.1
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	bison >= 2.4
+BuildRequires:	docbook-style-xsl
 BuildRequires:	eventlog-devel >= 0.2.12
 %{?with_tests:BuildRequires:	findutils}
 BuildRequires:	flex
@@ -107,6 +109,8 @@ Conflicts:	rsyslog
 Conflicts:	syslog
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define	xsl_stylesheets_dir /usr/share/sgml/docbook/xsl-stylesheets
+
 # syslog-ng has really crazy linking rules (see their bugzilla).
 # Some rules, according to syslog-ng devs, are like this:
 # - libsyslog-ng.so has undefined symbols for third party libraries
@@ -271,6 +275,7 @@ Pliki nagłówkowe do tworzenia modułów dla sysloga-ng.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 cp -p %{SOURCE4} doc
 cp -p %{SOURCE5} contrib/syslog-ng.conf.simple
 
@@ -324,7 +329,8 @@ done
 	--enable-mixed-linking
 %endif
 
-%{__make}
+%{__make} \
+	XSL_STYLESHEET=%{xsl_stylesheets_dir}/manpages/docbook.xsl
 
 %if %{with tests}
 LD_LIBRARY_PATH=$(find $PWD -name '*.so*' -printf "%h:")
diff --git a/man-paths.patch b/man-paths.patch
new file mode 100644
index 0000000..703a6c3
--- /dev/null
+++ b/man-paths.patch
@@ -0,0 +1,67 @@
+--- syslog-ng-3.4.3/doc/man.bak/loggen.1.xml	2013-08-13 12:24:20.000000000 +0300
++++ syslog-ng-3.4.3/doc/man/loggen.1.xml	2013-09-30 21:42:33.729604012 +0300
+@@ -264,7 +264,7 @@
+     <refsect1>
+       <title>Files</title>
+       <para>
+-        <filename moreinfo="none">/opt/syslog-ng/bin/loggen</filename>
++        <filename moreinfo="none">/usr/bin/loggen</filename>
+       </para>
+     </refsect1>
+     <refsect1>
+--- syslog-ng-3.4.3/doc/man.bak/pdbtool.1.xml	2013-08-13 12:24:20.000000000 +0300
++++ syslog-ng-3.4.3/doc/man/pdbtool.1.xml	2013-09-30 21:42:33.729604012 +0300
+@@ -302,10 +302,10 @@
+     <refsect1>
+       <title>Files</title>
+       <para>
+-        <filename moreinfo="none">/opt/syslog-ng/bin/pdbtool</filename>
++        <filename moreinfo="none">/usr/bin/pdbtool</filename>
+       </para>
+       <para>
+-        <filename moreinfo="none">/opt/syslog-ng/etc/syslog-ng/syslog-ng.conf</filename>
++        <filename moreinfo="none">/etc/syslog-ng/syslog-ng.conf</filename>
+       </para>
+     </refsect1>
+     <refsect1>
+--- syslog-ng-3.4.3/doc/man.bak/syslog-ng-ctl.1.xml	2013-08-13 12:24:20.000000000 +0300
++++ syslog-ng-3.4.3/doc/man/syslog-ng-ctl.1.xml	2013-09-30 21:42:33.729604012 +0300
+@@ -120,7 +120,7 @@
+     <refsect1>
+       <title>Files</title>
+       <para>
+-        <filename moreinfo="none">/opt/syslog-ng/sbin/syslog-ng-ctl</filename>
++        <filename moreinfo="none">/sbin/syslog-ng-ctl</filename>
+       </para>
+     </refsect1>
+     <refsect1>
+--- syslog-ng-3.4.3/doc/man.bak/syslog-ng.8.xml	2013-08-13 12:24:20.000000000 +0300
++++ syslog-ng-3.4.3/doc/man/syslog-ng.8.xml	2013-09-30 21:42:33.729604012 +0300
+@@ -236,10 +236,10 @@
+     <refsect1>
+       <title>Files</title>
+       <para>
+-        <filename moreinfo="none">/opt/syslog-ng/</filename>
++        <filename moreinfo="none">/usr/share/syslog-ng</filename>
+       </para>
+       <para>
+-        <filename moreinfo="none">/opt/syslog-ng/etc/syslog-ng.conf</filename>
++        <filename moreinfo="none">/etc/syslog-ng.conf</filename>
+       </para>
+     </refsect1>
+     <refsect1>
+--- syslog-ng-3.4.3/doc/man.bak/syslog-ng.conf.5.xml	2013-08-13 12:24:20.000000000 +0300
++++ syslog-ng-3.4.3/doc/man/syslog-ng.conf.5.xml	2013-09-30 21:42:33.729604012 +0300
+@@ -408,10 +408,10 @@
+     <refsect1>
+       <title>Files</title>
+       <para>
+-        <filename moreinfo="none">/opt/syslog-ng/</filename>
++        <filename moreinfo="none">/usr/share/syslog-ng/</filename>
+       </para>
+       <para>
+-        <filename moreinfo="none">/opt/syslog-ng/etc/syslog-ng.conf</filename>
++        <filename moreinfo="none">/etc/syslog-ng/syslog-ng.conf</filename>
+       </para>
+     </refsect1>
+     <refsect1>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/syslog-ng.git/commitdiff/cd31ca9ba2103963305e678ce9575603c556285f



More information about the pld-cvs-commit mailing list