SPECS (DEVEL): cowiki.spec - use config and patches instead of inl...

[glen]

Author: glen                         Date: Mon Nov  7 18:41:36 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- use config and patches instead of inline edit in .spec

---- Files affected:
SPECS:
   cowiki.spec (1.8.2.3 -> 1.8.2.4) 

---- Diffs:

================================================================
Index: SPECS/cowiki.spec
diff -u SPECS/cowiki.spec:1.8.2.3 SPECS/cowiki.spec:1.8.2.4
--- SPECS/cowiki.spec:1.8.2.3	Mon Nov  7 19:35:42 2005
+++ SPECS/cowiki.spec	Mon Nov  7 19:41:31 2005
@@ -22,7 +22,9 @@
 Group:		Applications/WWW
 Source0:	%{_source}
 # Source0-md5:	aea66d8526e1633b942ad2f6d3aa1110
+Source1:	%{name}.conf
 Patch0:		%{name}-FHS.patch
+Patch1:		%{name}-config.patch
 URL:		http://cowiki.org/
 #BuildRequires:	rpmbuild(macros) >= 1.223
 Requires:	php >= 4:5.0.2
@@ -53,6 +55,7 @@
 %prep
 %setup -q %{?_snap:-n %{name}-%{version}-interim-%{_snap}}
 %patch0 -p1
+%patch1 -p1
 
 mv includes/cowiki/core.conf-dist .
 rm {htdocs,includes/cowiki}/.cvsignore
@@ -64,33 +67,8 @@
 install -d $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir},/var/cache/%{name}}
 
 cp -a htdocs includes $RPM_BUILD_ROOT%{_appdir}
-
-sed -e '
-    s,CHECK_INTERVAL = .*,CHECK_INTERVAL = "-1",
-    s,RETURN_PATH = .*,RETURN_PATH = "postmaster at localhost",
-    s,ABUSE_PATH = .*,ABUSE_PATH = "abuse at localhost",
-    s,ROOT_PASSWD = .*,ROOT_PASSWD = "XXX",
-    s,LOOKUP_DNS = .*,LOOKUP_DNS = off,
-    s,TEMP = .*,TEMP = "/var/cache/%{name}/",
-
-' core.conf-dist > $RPM_BUILD_ROOT%{_sysconfdir}/core.conf
-echo -e '\n; vim: ft=dosini' >> $RPM_BUILD_ROOT%{_sysconfdir}/core.conf
-
-# unfortunately cowiki works only as vhost root
-cat <<EOF >> $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-<Directory /usr/share/cowiki/htdocs>
-    Allow from all
-</Directory>
-
-<VirtualHost *:80>
-	ServerName cowiki
-	DocumentRoot /usr/share/cowiki/htdocs
-
-EOF
-sed -ne '/BEGIN/,/END/p' .htaccess >> $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cat <<EOF >> $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-</VirtualHost>
-EOF
+install core.conf-dist $RPM_BUILD_ROOT%{_sysconfdir}/core.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -146,6 +124,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8.2.4  2005/11/07 18:41:31  glen
+- use config and patches instead of inline edit in .spec
+
 Revision 1.8.2.3  2005/11/07 18:35:42  glen
 - 2005-11-07 snap; fix preun
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cowiki.spec?r1=1.8.2.3&r2=1.8.2.4&f=u