Author: glen                         Date: Sun Feb 20 22:04:18 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use snapshot. now works

---- Files affected:
SPECS:
   cowiki.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/cowiki.spec
diff -u SPECS/cowiki.spec:1.1 SPECS/cowiki.spec:1.2
--- SPECS/cowiki.spec:1.1       Sun Feb 20 22:44:15 2005
+++ SPECS/cowiki.spec   Sun Feb 20 23:04:12 2005
@@ -1,17 +1,27 @@
 # $Revision$, $Date$
 # TODO
 #  - lighttpd integration possible <http://wiki.lighttpd.net/33.html>.
+
+# snapshot: DATE
+%define _snap 2005-02-20
+
+%if 0%{?_snap}
+%define _source http://snaps.cowiki.org/%{name}-%{version}-dev-%{_snap}.tar.gz
+%else
+%define _source http://cowiki.org/download/%{name}-%{version}.tar.gz
+%endif
+%define _rel 0.17
+
 Summary:       Web collaboration tool
 Name:          cowiki
-Version:       0.3.3
-Release:       0.14
+Version:       0.3.4
+Release:       %{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
 Epoch:         0
 License:       GPL
 Group:         Applications/WWW
-Source0:       http://cowiki.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: 91f995347ed5791f052285124223b87b
+Source0:       %{_source}
+# Source0-md5: 6351667cdfbf3b6e8937af855a4414ba
 Patch0:                %{name}-FHS.patch
-Patch1:                %{name}-class-case.patch
 URL:           http://cowiki.org/
 BuildRequires: rpmbuild(macros) >= 1.177
 Requires:      php >= 5.0.2
@@ -33,9 +43,8 @@
 complicated structural syntaxes.
 
 %prep
-%setup -q
+%setup -q %{?_snap:-n %{name}-%{version}-dev-%{_snap}}
 %patch0 -p1
-%patch1 -p1
 
 mv includes/cowiki/core.conf-dist .
 rm -f {htdocs,includes/cowiki}/.cvsignore
@@ -53,7 +62,8 @@
     s/ABUSE_PATH = .*/ABUSE_PATH = "[EMAIL PROTECTED]"/
     s/ROOT_PASSWD = .*/ROOT_PASSWD = "XXX"/
     s/LOOKUP_DNS = .*/LOOKUP_DNS = off/
-' core.conf-dist > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.ini
+' 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
@@ -93,7 +103,7 @@
 if [ "$1" = 1 ]; then
 %banner %{name} -e <<EOF
 Install the database using the appropriate "misc/database/*.sql" schema
-Configure the coWiki in %{_sysconfdir}/%{name}.ini
+Configure the coWiki in %{_sysconfdir}/core.conf
 
 EOF
 fi
@@ -118,12 +128,12 @@
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog INSTALL NEWS 
+%doc ChangeLog INSTALL* NEWS 
 %doc README.IDIOM README.PLUGIN SKEL.PLUGIN
 %doc misc/database
 %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/apache.conf
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/%{name}.ini
+%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/core.conf
 %{_appdir}
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -132,6 +142,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/02/20 22:04:12  glen
+- use snapshot. now works
+
 Revision 1.1  2005/02/20 21:44:15  glen
 - new, but doesn't work with php 5.0.3
 
================================================================

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


_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to