[packaging] dimp-conf.php.template dimp-hooks.php.template dimp-menu.php.template dimp-portal.php.template dimp-prefs.php.template dimp-servers.php.template dimp.spec webclient-dimp_conf.php.template webclient-dimp_hooks.php.template webclient-dimp_menu.php.template webclient-dimp_portal.php.template webclient-dimp_prefs.php.template webclient-dimp_servers.php.template

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Sat Jan 15 17:27:12 CET 2011


 dimp-conf.php.template              |   15 +++++
 dimp-hooks.php.template             |   15 +++++
 dimp-menu.php.template              |   15 +++++
 dimp-portal.php.template            |   15 +++++
 dimp-prefs.php.template             |   15 +++++
 dimp-servers.php.template           |   15 +++++
 dimp.spec                           |   95 +++++++++++++++++++++++++-----------
 webclient-dimp_conf.php.template    |   15 -----
 webclient-dimp_hooks.php.template   |   15 -----
 webclient-dimp_menu.php.template    |   15 -----
 webclient-dimp_portal.php.template  |   15 -----
 webclient-dimp_prefs.php.template   |   15 -----
 webclient-dimp_servers.php.template |   15 -----
 13 files changed, 157 insertions(+), 118 deletions(-)

New commits:
commit 0f6749e5cdf753e0567c72f92ac5ddfd24b8800d
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sat Jan 15 16:26:30 2011 +0000

    Check in new additional sources

diff --git a/dimp-conf.php.template b/dimp-conf.php.template
new file mode 100644
index 0000000..036bdaf
--- /dev/null
+++ b/dimp-conf.php.template
@@ -0,0 +1,15 @@
+KOLAB_META_START
+TARGET=@@@dimp_confdir@@@/conf.d/20-kolab_local.php
+PERMISSIONS=0640
+OWNERSHIP=root:@@@webserver_grp@@@
+KOLAB_META_END
+<?php
+/*
+@@@warning@@@
+*/
+
+/* This file can be used to customize your kolab-webclient installation. */
+/* Anything you add to this configuration file will override settings    */
+/* from @@@dimp_confdir@@@/conf.php
+   Please refer to that file to see which settings you can influence via */
+/* this template.                                                        */
diff --git a/dimp-hooks.php.template b/dimp-hooks.php.template
new file mode 100644
index 0000000..cd8ebc7
--- /dev/null
+++ b/dimp-hooks.php.template
@@ -0,0 +1,15 @@
+KOLAB_META_START
+TARGET=@@@dimp_confdir@@@/hooks.d/20-kolab_local.php
+PERMISSIONS=0640
+OWNERSHIP=root:@@@webserver_grp@@@
+KOLAB_META_END
+<?php
+/*
+@@@warning@@@
+*/
+
+/* This file can be used to customize your kolab-webclient installation. */
+/* Anything you add to this configuration file will override settings    */
+/* from @@@dimp_confdir@@@/hooks.php
+   Please refer to that file to see which settings you can influence via */
+/* this template.                                                        */
diff --git a/dimp-menu.php.template b/dimp-menu.php.template
new file mode 100644
index 0000000..834fa9d
--- /dev/null
+++ b/dimp-menu.php.template
@@ -0,0 +1,15 @@
+KOLAB_META_START
+TARGET=@@@dimp_confdir@@@/menu.d/20-kolab_local.php
+PERMISSIONS=0640
+OWNERSHIP=root:@@@webserver_grp@@@
+KOLAB_META_END
+<?php
+/*
+@@@warning@@@
+*/
+
+/* This file can be used to customize your kolab-webclient installation. */
+/* Anything you add to this configuration file will override settings    */
+/* from @@@dimp_confdir@@@/menu.php
+   Please refer to that file to see which settings you can influence via */
+/* this template.                                                        */
diff --git a/dimp-portal.php.template b/dimp-portal.php.template
new file mode 100644
index 0000000..25e0a54
--- /dev/null
+++ b/dimp-portal.php.template
@@ -0,0 +1,15 @@
+KOLAB_META_START
+TARGET=@@@dimp_confdir@@@/portal.d/20-kolab_local.php
+PERMISSIONS=0640
+OWNERSHIP=root:@@@webserver_grp@@@
+KOLAB_META_END
+<?php
+/*
+@@@warning@@@
+*/
+
+/* This file can be used to customize your kolab-webclient installation. */
+/* Anything you add to this configuration file will override settings    */
+/* from @@@dimp_confdir@@@/portal.php
+   Please refer to that file to see which settings you can influence via */
+/* this template.                                                        */
diff --git a/dimp-prefs.php.template b/dimp-prefs.php.template
new file mode 100644
index 0000000..16dd8d4
--- /dev/null
+++ b/dimp-prefs.php.template
@@ -0,0 +1,15 @@
+KOLAB_META_START
+TARGET=@@@dimp_confdir@@@/prefs.d/20-kolab_local.php
+PERMISSIONS=0640
+OWNERSHIP=root:@@@webserver_grp@@@
+KOLAB_META_END
+<?php
+/*
+@@@warning@@@
+*/
+
+/* This file can be used to customize your kolab-webclient installation. */
+/* Anything you add to this configuration file will override settings    */
+/* from @@@dimp_confdir@@@/prefs.php
+   Please refer to that file to see which settings you can influence via */
+/* this template.                                                        */
diff --git a/dimp-servers.php.template b/dimp-servers.php.template
new file mode 100644
index 0000000..c2745d9
--- /dev/null
+++ b/dimp-servers.php.template
@@ -0,0 +1,15 @@
+KOLAB_META_START
+TARGET=@@@dimp_confdir@@@/servers.d/20-kolab_local.php
+PERMISSIONS=0640
+OWNERSHIP=root:@@@webserver_grp@@@
+KOLAB_META_END
+<?php
+/*
+@@@warning@@@
+*/
+
+/* This file can be used to customize your kolab-webclient installation. */
+/* Anything you add to this configuration file will override settings    */
+/* from @@@dimp_confdir@@@/servers.php
+   Please refer to that file to see which settings you can influence via */
+/* this template.                                                        */
diff --git a/dimp.spec b/dimp.spec
index 89d1ce3..e33148f 100644
--- a/dimp.spec
+++ b/dimp.spec
@@ -9,12 +9,12 @@ Group:		    Applications/System
 BuildArch:      noarch
 
 Source0:        http://ftp.horde.org/pub/dimp/dimp-h3-1.1.6.tar.gz
-Source1:        webclient-dimp_conf.php.template
-Source2:        webclient-dimp_hooks.php.template
-Source3:        webclient-dimp_menu.php.template
-Source4:        webclient-dimp_portal.php.template
-Source5:        webclient-dimp_prefs.php.template
-Source6:        webclient-dimp_servers.php.template
+Source1:        dimp-conf.php.template
+Source2:        dimp-hooks.php.template
+Source3:        dimp-menu.php.template
+Source4:        dimp-portal.php.template
+Source5:        dimp-prefs.php.template
+Source6:        dimp-servers.php.template
 Source7:        10-kolab_menu_base.php
 Source8:        10-kolab_servers_base.php
 Source9:        conf.php
@@ -30,7 +30,10 @@ BuildRoot:	    %{_tmppath}/%{name}-%{version}-build
 
 BuildRequires:  php
 BuildRequires:  php-pear
+
+Requires:       horde >= 3
 Requires:       imp >= 4.3.6
+Requires:       php-pear(Horde_Kolab)
 
 %description 
 DIMP is a project to create a version of IMP utilizing AJAX-like
@@ -52,42 +55,78 @@ written in PHP and provides webmail access to IMAP and POP3 accounts.
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/%{_datadir}/kolab/client/dimp
-mkdir -p %{buildroot}/%{_sysconfdir}/kolab/templates
 
-pushd config
-for CONFIG in *.dist; do
-    cp $CONFIG `basename $CONFIG .dist`
-    mkdir -p `basename $CONFIG .php.dist`.d
+mkdir -p %{buildroot}/%{_datadir}/horde/%{name}
+
+# Copy eveything... except config and docs
+cp -a * %{buildroot}%{_datadir}/horde/%{name}
+rm -rf %{buildroot}%{_datadir}/horde/%{name}/config/
+rm -rf %{buildroot}%{_datadir}/horde/%{name}/docs/
+rm %{buildroot}%{_datadir}/horde/%{name}/COPYING
+rm %{buildroot}%{_datadir}/horde/%{name}/README*
+
+# Copy locale *.mo files into /usr/share/locale
+for lang in %{buildroot}%{_datadir}/horde/%{name}/locale/*; do
+    mkdir -p %{buildroot}%{_datadir}/locale/`basename $lang`/LC_MESSAGES
+    if [ -f $lang/LC_MESSAGES/*.mo ]; then
+        for file in $lang/LC_MESSAGES/*.mo; do
+            mv $file %{buildroot}%{_datadir}/locale/`basename $lang`/LC_MESSAGES/
+        done
+    fi
 done
-popd
 
-cp -a * %{buildroot}/%{_datadir}/kolab/client/dimp/
+%find_lang %{name}
+
+# Put our config files in /etc/horde/dimp and make symlinks
+install -m 0750 -d %{buildroot}%{_sysconfdir}/horde/%{name}
+cp -a config/* %{buildroot}%{_sysconfdir}/horde/%{name}
+ln -fs ../../../..%{_sysconfdir}/horde/%{name} %{buildroot}%{_datadir}/horde/%{name}/config
+
+# Create default config files
+pushd %{buildroot}%{_sysconfdir}/horde/%{name}
+for d in *.dist; do
+    d0=`basename $d .dist`
+    if [ ! -f "$d0" ]; then
+        mv $d $d0
+    fi
+done
+popd
 
 for dir in conf.d hooks.d menu.d portal.d prefs.d servers.d; do
-    mkdir -p %{buildroot}/%{_datadir}/kolab/client/dimp/config/$dir
+    mkdir -p %{buildroot}/%{_sysconfdir}/horde/%{name}/$dir
 done
-install -p -m 644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} \
-    %{buildroot}/%{_sysconfdir}/kolab/templates
 
-install -p -m 644 %{S:7} %{buildroot}/%{_datadir}/kolab/client/dimp/config/menu.d/
-install -p -m 644 %{S:8} %{buildroot}/%{_datadir}/kolab/client/dimp/config/servers.d/
-install -p -m 644 %{S:9} %{buildroot}/%{_datadir}/kolab/client/dimp/config/
+install -p -m 644 %{S:7} %{buildroot}/%{_sysconfdir}/horde/%{name}/menu.d/
+install -p -m 644 %{S:8} %{buildroot}/%{_sysconfdir}/horde/%{name}/servers.d/
+install -p -m 644 %{S:9} %{buildroot}/%{_sysconfdir}/horde/%{name}/
+
+mkdir -p %{buildroot}/%{_sysconfdir}/kolab/templates
 
-sed -i -e 's#@@@horde_confdir@@@#%{_datadir}/kolab/www/client/dimp/config#' %{buildroot}/%{_sysconfdir}/kolab/templates/*.php.template
+install -p -m 644 %{S:1} %{S:2} %{S:3} %{S:4} %{S:5} %{S:6} \
+    %{buildroot}/%{_sysconfdir}/kolab/templates
 
 %clean
 rm -rf %{buildroot}
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING README docs/*
-%dir %{_sysconfdir}/kolab
-%dir %{_sysconfdir}/kolab/templates
-%config(noreplace) %{_sysconfdir}/kolab/templates/*.template
-%dir %{_datadir}/kolab/
-%dir %{_datadir}/kolab/client/
-%{_datadir}/kolab/client/dimp/
+%attr(0750,root,apache) %dir %{_sysconfdir}/horde/%{name}/
+%attr(0640,root,apache) %{_sysconfdir}/horde/%{name}/*.xml
+%attr(0640,root,apache) %{_sysconfdir}/horde/%{name}/*.php
+%dir %{_datadir}/horde/
+%dir %{_datadir}/horde/%{name}/
+%{_datadir}/horde/%{name}/compose.php
+%dir %{_datadir}/horde/%{name}/config/
+%{_datadir}/horde/%{name}/dimple.php
+%{_datadir}/horde/%{name}/imp.php
+%{_datadir}/horde/%{name}/index.php
+%{_datadir}/horde/%{name}/js/
+%{_datadir}/horde/%{name}/lib/
+%{_datadir}/horde/%{name}/message.php
+%{_datadir}/horde/%{name}/po/
+%{_datadir}/horde/%{name}/templates/
+%{_datadir}/horde/%{name}/themes/
 
 %changelog
 * Tue Jan 11 2011 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 1.1.6-2
diff --git a/webclient-dimp_conf.php.template b/webclient-dimp_conf.php.template
deleted file mode 100644
index c3bd872..0000000
--- a/webclient-dimp_conf.php.template
+++ /dev/null
@@ -1,15 +0,0 @@
-KOLAB_META_START
-TARGET=@@@dimp_confdir@@@/conf.d/20-kolab_local.php
-PERMISSIONS=0400
-OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
-KOLAB_META_END
-<?php
-/*
-@@@warning@@@
-*/
-
-/* This file can be used to customize your kolab-webclient installation. */
-/* Anything you add to this configuration file will override settings    */
-/* from @@@dimp_confdir@@@/conf.php
-   Please refer to that file to see which settings you can influence via */
-/* this template.                                                        */
diff --git a/webclient-dimp_hooks.php.template b/webclient-dimp_hooks.php.template
deleted file mode 100644
index 4e2a215..0000000
--- a/webclient-dimp_hooks.php.template
+++ /dev/null
@@ -1,15 +0,0 @@
-KOLAB_META_START
-TARGET=@@@dimp_confdir@@@/hooks.d/20-kolab_local.php
-PERMISSIONS=0400
-OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
-KOLAB_META_END
-<?php
-/*
-@@@warning@@@
-*/
-
-/* This file can be used to customize your kolab-webclient installation. */
-/* Anything you add to this configuration file will override settings    */
-/* from @@@dimp_confdir@@@/hooks.php
-   Please refer to that file to see which settings you can influence via */
-/* this template.                                                        */
diff --git a/webclient-dimp_menu.php.template b/webclient-dimp_menu.php.template
deleted file mode 100644
index 4e8d28f..0000000
--- a/webclient-dimp_menu.php.template
+++ /dev/null
@@ -1,15 +0,0 @@
-KOLAB_META_START
-TARGET=@@@dimp_confdir@@@/menu.d/20-kolab_local.php
-PERMISSIONS=0400
-OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
-KOLAB_META_END
-<?php
-/*
-@@@warning@@@
-*/
-
-/* This file can be used to customize your kolab-webclient installation. */
-/* Anything you add to this configuration file will override settings    */
-/* from @@@dimp_confdir@@@/menu.php
-   Please refer to that file to see which settings you can influence via */
-/* this template.                                                        */
diff --git a/webclient-dimp_portal.php.template b/webclient-dimp_portal.php.template
deleted file mode 100644
index ec89ba5..0000000
--- a/webclient-dimp_portal.php.template
+++ /dev/null
@@ -1,15 +0,0 @@
-KOLAB_META_START
-TARGET=@@@dimp_confdir@@@/portal.d/20-kolab_local.php
-PERMISSIONS=0400
-OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
-KOLAB_META_END
-<?php
-/*
-@@@warning@@@
-*/
-
-/* This file can be used to customize your kolab-webclient installation. */
-/* Anything you add to this configuration file will override settings    */
-/* from @@@dimp_confdir@@@/portal.php
-   Please refer to that file to see which settings you can influence via */
-/* this template.                                                        */
diff --git a/webclient-dimp_prefs.php.template b/webclient-dimp_prefs.php.template
deleted file mode 100644
index 8081a92..0000000
--- a/webclient-dimp_prefs.php.template
+++ /dev/null
@@ -1,15 +0,0 @@
-KOLAB_META_START
-TARGET=@@@dimp_confdir@@@/prefs.d/20-kolab_local.php
-PERMISSIONS=0400
-OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
-KOLAB_META_END
-<?php
-/*
-@@@warning@@@
-*/
-
-/* This file can be used to customize your kolab-webclient installation. */
-/* Anything you add to this configuration file will override settings    */
-/* from @@@dimp_confdir@@@/prefs.php
-   Please refer to that file to see which settings you can influence via */
-/* this template.                                                        */
diff --git a/webclient-dimp_servers.php.template b/webclient-dimp_servers.php.template
deleted file mode 100644
index c2dea7f..0000000
--- a/webclient-dimp_servers.php.template
+++ /dev/null
@@ -1,15 +0,0 @@
-KOLAB_META_START
-TARGET=@@@dimp_confdir@@@/servers.d/20-kolab_local.php
-PERMISSIONS=0400
-OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
-KOLAB_META_END
-<?php
-/*
-@@@warning@@@
-*/
-
-/* This file can be used to customize your kolab-webclient installation. */
-/* Anything you add to this configuration file will override settings    */
-/* from @@@dimp_confdir@@@/servers.php
-   Please refer to that file to see which settings you can influence via */
-/* this template.                                                        */




More information about the packaging-commits mailing list