- config file for apache, many fixes... and TODO...

Changed files:
    ct-crm.spec -> 1.5

diff --git a/ct-crm.spec b/ct-crm.spec
index 122dfeca3a5734b0cae748f5b74f20ec8b5d7fb7..844fbd85a7ec1f7565356501280f249b313b5764 100644 (file)
--- a/ct-crm.spec
+++ b/ct-crm.spec
@@ -1,21 +1,26 @@
+# TODO:
+# - move config to /etc
+# - make it work without global_variables=On
 Summary:       A CRM for small to medium firms
 Summary(pl):   CRM dla ma³ych i ¶rednich instytucji
 Name:          ct-crm
 Version:       1.6
 %define                _pre    pre
-Release:       0.%{_pre}.1
+Release:       0.%{_pre}.1.2
 License:       GPL
 Group:         Applications/WWW
 Source0:       http://dl.sourceforge.net/customer-touch/%{name}%{version}%{_pre}.zip
 # Source0-md5: ffe5c4e7b183173832f4c1157a645e05
 Source1:       %{name}-polish_lang
+Source2:       %{name}.conf
 Patch0:                %{name}-lang_pl.patch
 URL:           http://www.customer-touch.com/
-Requires:      php
+Requires:      php-mysql
 Requires:      webserver
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _cthtmldir      /home/services/httpd/html/ct
+%define                _cthtmldir      %{_datadir}/%{name}
 
 %description
 An easy to use and install CRM for small to medium firms.
@@ -38,17 +43,42 @@ done
 install *.php *.js *.css $RPM_BUILD_ROOT%{_cthtmldir}
 cp -Rf Doc/manual_install/* $RPM_BUILD_ROOT%{_cthtmldir}/Doc/manual_install
 
+install Doc/manual_install/config.inc.php $RPM_BUILD_ROOT%{_cthtmldir}
+
 install %{SOURCE1} $RPM_BUILD_ROOT%{_cthtmldir}/languages/polish/global.inc.php
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/httpd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf" /etc/httpd/httpd.conf; then
+       echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf
+fi
+if [ -f /var/lock/subsys/httpd ]; then
+       /usr/sbin/apachectl restart 1>&2
+fi
+
+%preun
+if [ "$1" = "0" ]; then
+       umask 027
+       grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \
+               /etc/httpd/httpd.conf.tmp
+       mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
+       if [ -f /var/lock/subsys/httpd ]; then
+               /usr/sbin/apachectl restart 1>&2
+       fi
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc Doc/*.txt Doc/{CHANGELOG,README} Doc/manual_install/readme
+%config(noreplace) %verify(not size mtime md5) /etc/httpd/%{name}.conf
+%config(noreplace) %verify(not size mtime md5) %{_cthtmldir}/config.inc.php
 %dir %{_cthtmldir}
 %{_cthtmldir}/*.css
-%{_cthtmldir}/*.php
+%{_cthtmldir}/[!^c]*.php
+%{_cthtmldir}/c[asu]*.php
 %{_cthtmldir}/*.js
 %dir %{_cthtmldir}/uploads
 %dir %{_cthtmldir}/modules