Author: kosmo                        Date: Wed Aug 24 09:11:25 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- R & BR changes
- better /etc/httpd/web-cyradm.conf
- added %ghost for logfile

---- Files affected:
SPECS:
   web-cyradm.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/web-cyradm.spec
diff -u SPECS/web-cyradm.spec:1.2 SPECS/web-cyradm.spec:1.3
--- SPECS/web-cyradm.spec:1.2   Tue Aug 23 22:48:55 2005
+++ SPECS/web-cyradm.spec       Wed Aug 24 11:11:20 2005
@@ -2,8 +2,6 @@
 #
 # TODO:
 #      - R: & BR:
-#      - better /etc/httpd/web-cyradm.conf
-#      - many more
 #
 %define                version_major   0.5.4
 %define                version_minor   1
@@ -17,13 +15,14 @@
 License:       GPL
 Group:         Applications
 Source0:       
http://www.web-cyradm.org/%{name}-%{version_major}-%{version_minor}.tar.gz
+Source1:       %{name}-apache.conf
 Patch0:                %{name}-locale.patch
 # Source0-md5: d06dc16899680c29b94a5460709b5fe0
 URL:           http://www.web-cyradm.org/
-Requires:      mysql
+Requires:      apache
 Requires:      php
 Requires:      php-gettext
-Requires:      webserver
+Requires:      php-pear-DB
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -79,8 +78,10 @@
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{css,images,lib}
 install -d $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 
-install        config/*        $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
-echo "Alias /%{name} %{_datadir}/%{name}" > 
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf
+install        config/conf.php.dist    \
+       $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php
+
+install        %{SOURCE1}      $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf
 
 install        *.php           $RPM_BUILD_ROOT%{_datadir}/%{name}
 install        css/*           $RPM_BUILD_ROOT%{_datadir}/%{name}/css
@@ -94,6 +95,8 @@
     install $i/LC_MESSAGES/*.mo $RPM_BUILD_ROOT%{_datadir}/$i/LC_MESSAGES
 done
 
+touch $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}/%{name}-login.log
+
 %find_lang %{name}
 
 %clean
@@ -104,7 +107,7 @@
        ln -sf %{_sysconfdir}/httpd/%{name}.conf 
%{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf
 
        if [ -f /var/lock/subsys/httpd ]; then
-               %service httpd restart
+               %service -q httpd restart
        fi
 fi
 
@@ -115,7 +118,7 @@
                rm -f %{_sysconfdir}/httpd/httpd.conf/99_%{name}.conf
 
                if [ -f /var/lock/subsys/httpd ]; then
-                   %service httpd restart
+                   %service -q httpd restart
                fi
        fi
 fi
@@ -126,6 +129,7 @@
 %dir %{_sysconfdir}/%{name}
 %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/%{name}/*
 %attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/httpd/%{name}.conf
+%ghost %{_localstatedir}/log/%{name}/*.log
 %{_datadir}/%{name}
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -134,6 +138,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/08/24 09:11:20  kosmo
+- R & BR changes
+- better /etc/httpd/web-cyradm.conf
+- added %ghost for logfile
+
 Revision 1.2  2005/08/23 20:48:55  qboosh
 - pl fixes
 
================================================================

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

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

Reply via email to