gunnar: server/kolab-webadmin/kolab-webadmin ChangeLog, 1.131, 1.132 Makefile.am, 1.63, 1.64 kolab-webadmin.spec.in, 1.21, 1.22
cvs at kolab.org
cvs at kolab.org
Mon Aug 23 16:28:53 CEST 2010
Author: gunnar
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin
In directory doto:/tmp/cvs-serv9224/kolab-webadmin/kolab-webadmin
Modified Files:
ChangeLog Makefile.am kolab-webadmin.spec.in
Log Message:
kolab/issue4512 (Allow to hide the admin mail settings in the web admin)
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/ChangeLog,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- ChangeLog 23 Aug 2010 13:00:34 -0000 1.131
+++ ChangeLog 23 Aug 2010 14:28:50 -0000 1.132
@@ -1,5 +1,10 @@
2010-08-23 Gunnar Wrobel <p at rdus.de>
+ * kolab-webadmin.spec:
+
+ Support template based configuration of the web admin.
+ kolab/issue4512 (Allow to hide the admin mail settings in the web admin)
+
* php/admin/include/form.class.php:
kolab/issue4510 (Fix the kolab web admin display for Firefox)
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/Makefile.am,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- Makefile.am 6 Apr 2010 08:56:32 -0000 1.63
+++ Makefile.am 23 Aug 2010 14:28:50 -0000 1.64
@@ -102,9 +102,6 @@
phpkolabdir = $(phplibdir2)/$(kolab_php_module_prefix)admin
-php_includes_configdir = $(phpkolabdir)/include
-php_includes_config_DATA = php/admin/include/config.php
-
PHP_INCLUDES = php/admin/include/menu.php \
php/admin/include/debug.php \
php/admin/include/form.class.php \
@@ -387,12 +384,6 @@
$(do_subst) <$(srcdir)/php/admin/include/auth.class.php.in >$@
CLEANFILES += php/admin/include/auth.class.php
EXTRA_DIST += php/admin/include/auth.class.php.in
-
-php/admin/include/config.php: php/admin/include/config.php.in
- $(mkinstalldirs) php/admin/include
- $(do_subst) <$(srcdir)/php/admin/include/config.php.in >$@
-CLEANFILES += php/admin/include/config.php
-EXTRA_DIST += php/admin/include/config.php.in
php/admin/include/headers.php: php/admin/include/headers.php.in
@$(mkinstalldirs) php/admin/include
Index: kolab-webadmin.spec.in
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/kolab-webadmin.spec.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- kolab-webadmin.spec.in 12 Dec 2008 13:33:25 -0000 1.21
+++ kolab-webadmin.spec.in 23 Aug 2010 14:28:50 -0000 1.22
@@ -36,6 +36,7 @@
# list of sources
Source0: kolab-webadmin-%{version}.tar.bz2
+Source1: webadmin.conf.template
# build information
Prefix: %{l_prefix}
@@ -61,10 +62,14 @@
./configure -prefix=%{l_prefix} --with-dist=kolab
%install
+ %{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
# install package
%{l_make} %{l_mflags} install \
DESTDIR=$RPM_BUILD_ROOT
+
+ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates
# generate file list
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
More information about the commits
mailing list