gunnar: server/kolab-webclient/nag nag.spec,1.1,1.2

cvs at kolab.org cvs at kolab.org
Fri Jan 22 22:19:16 CET 2010


Author: gunnar

Update of /kolabrepository/server/kolab-webclient/nag
In directory doto:/tmp/cvs-serv20494/kolab-webclient/nag

Modified Files:
	nag.spec 
Log Message:
Add mnemo and nag.

Index: nag.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/nag/nag.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nag.spec	19 Jan 2010 13:27:48 -0000	1.1
+++ nag.spec	22 Jan 2010 21:19:14 -0000	1.2
@@ -1,7 +1,7 @@
 # Macros
 %define         V_package nag
 %define         V_version 2.3.4
-%define         V_release 20100119
+%define         V_release 20100122
 
 # Package Information
 Name:		%{V_package}
@@ -20,6 +20,7 @@
 Source2:        webclient-nag_menu.php.template
 Source3:        webclient-nag_prefs.php.template
 Source4:        10-kolab_conf_base.php
+Source5:        conf.php
 
 # List of Patches
 Patch0:         package.patch
@@ -31,7 +32,7 @@
 #Pre requisites
 BuildPreReq:  OpenPKG, openpkg >= 20070603
 BuildPreReq:  php, php::with_pear = yes
-PreReq:       horde-3.3.6
+PreReq:       horde >= 3.3.6
 
 AutoReq:      no
 AutoReqProv:  no
@@ -79,6 +80,7 @@
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:4} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/nag/config/conf.d/
+	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:5} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/nag/config/
 
 	sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/nag/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
 
@@ -86,7 +88,7 @@
             '%config %{l_prefix}/etc/kolab/templates/webclient-nag_conf.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-nag_menu.php.template' \
             '%config %{l_prefix}/etc/kolab/templates/webclient-nag_prefs.php.template' \
-#	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/nag/config/conf.php
+	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/nag/config/conf.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT





More information about the commits mailing list