steffen: server/kolab kolab.spec,1.41,1.42

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab
In directory doto:/tmp/cvs-serv20117

Modified Files:
	kolab.spec 
Log Message:
move templates to subdir

Index: kolab.spec
===================================================================
RCS file: /kolabrepository/server/kolab/kolab.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- kolab.spec	7 Jun 2004 10:00:58 -0000	1.41
+++ kolab.spec	7 Jun 2004 10:33:02 -0000	1.42
@@ -42,7 +42,7 @@
 Group:        Mail
 License:      GPL
 Version:      1.9.0
-Release:      20040602
+Release:      20040607
 
 #   package options
 %option       with_genuine   no
@@ -63,7 +63,7 @@
 PreReq:       imapd >= 2.2.3-20040202, imapd::with_group = yes
 PreReq:       apache >= 1.3.29-20031124, apache::with_gdbm_ndbm = yes, apache::with_mod_auth_ldap = yes, apache::with_mod_dav = yes, apache::with_mod_php = yes, apache::with_mod_php_gdbm = yes, apache::with_mod_php_gettext = yes, apache::with_mod_php_imap = yes, apache::with_mod_php_openldap = yes, apache::with_mod_php_xml = yes, apache::with_mod_php_pear = yes, apache::with_mod_ssl = yes
 %if "%{with_genuine}" == "no"
-PreReq:       perl-kolab, perl-db
+PreReq:       perl-kolab >= 5.8.3-20040607 , perl-db
 PreReq:	      amavisd
 PreReq:	      clamav
 PreReq:	      dcron
@@ -100,6 +100,7 @@
 
     %{l_shtool} mkdir -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates \
         $RPM_BUILD_ROOT%{l_prefix}/var/kolab/log \
         $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/cgi-bin \
         $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/icons
@@ -117,8 +118,12 @@
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
 
     %{l_shtool} install -c -m 644 %{l_value -s -a} \
-        kolab.conf *.template quotawarning.txt \
+        kolab.conf quotawarning.txt \
         $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/
+
+    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+        templates/*.template \
+        $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/
 
 %if "%{with_genuine}" == "no"
     %{l_shtool} mkdir -p -m 755 \