SPECS (DEVEL): cowiki.spec - 2005-06-18 snap
glen
glen at pld-linux.org
Sat Jun 18 13:32:27 CEST 2005
Author: glen Date: Sat Jun 18 11:32:27 2005 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- 2005-06-18 snap
---- Files affected:
SPECS:
cowiki.spec (1.8 -> 1.8.2.1)
---- Diffs:
================================================================
Index: SPECS/cowiki.spec
diff -u SPECS/cowiki.spec:1.8 SPECS/cowiki.spec:1.8.2.1
--- SPECS/cowiki.spec:1.8 Sat Jun 18 12:49:07 2005
+++ SPECS/cowiki.spec Sat Jun 18 13:32:21 2005
@@ -3,28 +3,28 @@
# - lighttpd integration possible <http://wiki.lighttpd.net/33.html>.
# snapshot: DATE
-#define _snap 2005-02-20
+%define _snap 2005-06-18
%if 0%{?_snap}
%define _source http://snaps.cowiki.org/%{name}-%{version}-dev-%{_snap}.tar.gz
%else
%define _source http://www.cowiki.org/download/%{name}-%{version}.tar.gz
%endif
-%define _rel 1
+%define _rel 4
Summary: Web collaboration tool
Summary(pl): Narzędzie do współpracy i współtworzenia w sieci
Name: cowiki
-Version: 0.3.4
+Version: 0.4.0
Release: %{?_snap:0.%(echo %{_snap} | tr -d -).}%{_rel}
Epoch: 0
License: GPL
Group: Applications/WWW
Source0: %{_source}
-# Source0-md5: 33d0b6506e39846666434cc3ba2f95bd
+# Source0-md5: 377fac41be7d27675b2ffa4d7f256044
Patch0: %{name}-FHS.patch
URL: http://cowiki.org/
-BuildRequires: rpmbuild(macros) >= 1.177
+#BuildRequires: rpmbuild(macros) >= 1.223
Requires: php >= 5.0.2
Requires: php-mysql
Requires: apache(mod_auth)
@@ -33,8 +33,6 @@
%define _appdir %{_datadir}/%{name}
%define _sysconfdir /etc/%{name}
-%define _apache1dir /etc/apache
-%define _apache2dir /etc/httpd
%description
coWiki is a sophisticated but easy to use web collaboration tool that
@@ -59,20 +57,21 @@
mv includes/cowiki/core.conf-dist .
rm -f {htdocs,includes/cowiki}/.cvsignore
mv htdocs/.htaccess .
+rm -f htdocs/setup/LICENSE # GPL
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_appdir},%{_sysconfdir},/var/lib/%{name}}
+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 = "your.bounce.email at localhost",
+ 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/lib/%{name}/",
+ 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
@@ -83,7 +82,7 @@
Allow from all
</Directory>
-<VirtualHost *>
+<VirtualHost *:80>
ServerName cowiki
DocumentRoot /usr/share/cowiki/htdocs
@@ -97,25 +96,10 @@
rm -rf $RPM_BUILD_ROOT
%post
-# apache1
-if [ -d %{_apache1dir}/conf.d ]; then
- ln -sf %{_sysconfdir}/apache.conf %{_apache1dir}/conf.d/99_%{name}.conf
- if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache restart 1>&2
- fi
-fi
-# apache2
-if [ -d %{_apache2dir}/httpd.conf ]; then
- ln -sf %{_sysconfdir}/apache.conf %{_apache2dir}/httpd.conf/99_%{name}.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
-fi
-
if [ "$1" = 1 ]; then
%banner %{name} -e <<EOF
Install the database using the appropriate "misc/database/*.sql" schema.
-You must setup authorization and root password in:
+You must setup authorization and coWiki root password in:
- %{_sysconfdir}/core.conf
EOF
@@ -123,26 +107,28 @@
%preun
if [ "$1" = "0" ]; then
- # apache1
- if [ -f %{_apache1dir}/apache.conf ]; then
- rm -f %{_apache1dir}/conf.d/99_%{name}.conf
- if [ -f /var/lock/subsys/apache ]; then
- /etc/rc.d/init.d/apache restart 1>&2
- fi
- fi
- # apache2
- if [ -d %{_apache2dir}/httpd.conf ]; then
- rm -f %{_apache2dir}/httpd.conf/99_%{name}.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
- fi
-
# nuke cache
# FIXME could suffer too many arguments error
rm -f /var/lib/%{name}/*
fi
+%triggerin -- apache1 >= 1.3.33-2
+%apache_config_install -v 1 -c %{_sysconfdir}/apache.conf
+
+%triggerun -- apache1 >= 1.3.33-2
+%apache_config_uninstall -v 1
+
+%triggerin -- apache >= 2.0.0
+%apache_config_install -v 2 -c %{_sysconfdir}/apache.conf
+
+%triggerun -- apache >= 2.0.0
+%apache_config_uninstall -v 2
+
+# cache dir moved
+%triggerun -- %{name} < 0.4.0-0.20050618.3
+# FIXME could suffer too many arguments error
+rm -f /var/lib/%{name}/*
+
%files
%defattr(644,root,root,755)
%doc ChangeLog INSTALL* NEWS
@@ -152,7 +138,7 @@
%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}/core.conf
%{_appdir}
-%dir %attr(770,root,http) /var/lib/%{name}
+%dir %attr(770,root,http) /var/cache/%{name}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -160,6 +146,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.8.2.1 2005/06/18 11:32:21 glen
+- 2005-06-18 snap
+
Revision 1.8 2005/06/18 10:49:07 glen
- R: apache(mod_auth)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/cowiki.spec?r1=1.8&r2=1.8.2.1&f=u
More information about the pld-cvs-commit
mailing list