rpms/aide/devel aide-0.13.1-manuals.patch, NONE, 1.1 aide.spec, 1.17, 1.18

Michael Schwendt (mschwendt) fedora-extras-commits at redhat.com
Fri Jan 5 22:30:26 UTC 2007


Author: mschwendt

Update of /cvs/extras/rpms/aide/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4747

Modified Files:
	aide.spec 
Added Files:
	aide-0.13.1-manuals.patch 
Log Message:
used a patch instead of sed or perl

aide-0.13.1-manuals.patch:

--- NEW FILE aide-0.13.1-manuals.patch ---
diff -Nur aide-0.13.1-orig/doc/aide.1.in aide-0.13.1/doc/aide.1.in
--- aide-0.13.1-orig/doc/aide.1.in	2006-11-30 20:38:16.000000000 +0100
+++ aide-0.13.1/doc/aide.1.in	2007-01-05 23:28:44.000000000 +0100
@@ -73,11 +73,11 @@
 SIGTERM. Use SIGKILL to terminate.
 .PP
 .SH FILES
-.B @sysconfdir@/aide.conf
+.B /etc/aide.conf
 Default aide configuration file.
-.B @sysconfdir@/aide.db
+.B /var/lib/aide/aide.db.gz
 Default aide database.
-.B @sysconfdir@/aide.db.new
+.B /var/lib/aide/aide.db.new.gz
 Default aide output database.
 .SH SEE ALSO
 .BR aide.conf (5)


Index: aide.spec
===================================================================
RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- aide.spec	5 Jan 2007 22:19:33 -0000	1.17
+++ aide.spec	5 Jan 2007 22:29:56 -0000	1.18
@@ -15,6 +15,7 @@
 Source1: aide.conf
 Source2: README.quickstart
 Source3: aide.conf.rhel
+Patch0: aide-0.13.1-manuals.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 Buildrequires: mhash-devel zlib-devel
 Buildrequires: flex bison
@@ -35,9 +36,10 @@
 %prep
 %setup -q
 
-# Adjust default paths in manual.
-sed -i -e 's!@sysconfdir@/aide.db\(.new\)\?!%{_localstatedir}/lib/aide/aide.db\1.gz!' doc/aide.1.in
-sed -i -e 's!@sysconfdir@/aide.conf!%{_sysconfdir}/aide.conf!' doc/aide.1.in
+%patch0 -p1 -b .manuals
+# Adjust default paths in manual (not as safe as the patch).
+#sed -i -e 's!@sysconfdir@/aide.db\(.new\)\?!%{_localstatedir}/lib/aide/aide.db\1.gz!' doc/aide.1.in
+#sed -i -e 's!@sysconfdir@/aide.conf!%{_sysconfdir}/aide.conf!' doc/aide.1.in
 
 
 %build




More information about the scm-commits mailing list