OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Jun-2008 19:54:00
Branch: HEAD Handle: 2008061218535800
Modified files:
openpkg-src/rsyslog rsyslog.patch rsyslog.spec
Log:
resurrect the paths in the patch file and prevent us from too easily
destucting the patch the next time
Summary:
Revision Changes Path
1.13 +8 -8 openpkg-src/rsyslog/rsyslog.patch
1.29 +4 -2 openpkg-src/rsyslog/rsyslog.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rsyslog.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 rsyslog.patch
--- openpkg-src/rsyslog/rsyslog.patch 11 Jun 2008 20:21:36 -0000 1.12
+++ openpkg-src/rsyslog/rsyslog.patch 12 Jun 2008 17:53:58 -0000 1.13
@@ -1,7 +1,7 @@
Index: config.h.in
---- config.h.in.orig 2008-06-11 17:05:02 +0200
-+++ config.h.in 2008-06-11 22:19:10 +0200
-@@ -258,7 +258,9 @@
+--- config.h.in.orig 2008-04-15 14:29:08 +0200
++++ config.h.in 2008-04-15 21:05:35 +0200
+@@ -261,7 +261,9 @@
#undef NO_MINUS_C_MINUS_O
/* Indicator for a BSD OS */
@@ -12,18 +12,18 @@
/* Name of package */
#undef PACKAGE
Index: tools/syslogd.c
---- tools/syslogd.c.orig 2008-06-10 08:16:53 +0200
-+++ tools/syslogd.c 2008-06-11 22:19:10 +0200
-@@ -202,36 +202,20 @@
+--- tools/syslogd.c.orig 2008-04-15 14:24:00 +0200
++++ tools/syslogd.c 2008-04-15 21:07:54 +0200
+@@ -207,36 +207,20 @@
#ifndef _PATH_LOGCONF
#define _PATH_LOGCONF "/etc/rsyslog.conf"
-+#define _PATH_LOGCONF "/openpkg-dev/etc/rsyslog/rsyslog.conf"
++#define _PATH_LOGCONF "@l_prefix@/etc/rsyslog/rsyslog.conf"
#endif
#ifndef _PATH_MODDIR
-#define _PATH_MODDIR "/lib/rsyslog/"
-+#define _PATH_MODDIR "/openpkg-dev/lib/rsyslog/"
++#define _PATH_MODDIR "@l_prefix@/lib/rsyslog/"
#endif
+#define _PATH_VARRUN "@l_prefix/var/rsyslog/run/"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rsyslog.spec
============================================================================
$ cvs diff -u -r1.28 -r1.29 rsyslog.spec
--- openpkg-src/rsyslog/rsyslog.spec 11 Jun 2008 20:21:36 -0000 1.28
+++ openpkg-src/rsyslog/rsyslog.spec 12 Jun 2008 17:53:58 -0000 1.29
@@ -32,7 +32,7 @@
Group: Logfile
License: GPL
Version: 3.19.7
-Release: 20080611
+Release: 20080612
# package options
%option with_kerberos no
@@ -85,10 +85,12 @@
%prep
%setup -q
- %{l_sed} <%{PATCH0} %{l_value -s -a} | %{l_patch} -p0 -b
+ %patch -p0
%build
# configure program
+ %{l_shtool} subst %{l_value -s -a} \
+ tools/syslogd.c
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
CPPFLAGS="%{l_cppflags}" \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
