Author: glen Date: Thu Feb 24 22:18:21 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- unification of horde apps
---- Files affected:
SPECS:
turba.spec (1.22 -> 1.23)
---- Diffs:
================================================================
Index: SPECS/turba.spec
diff -u SPECS/turba.spec:1.22 SPECS/turba.spec:1.23
--- SPECS/turba.spec:1.22 Tue Feb 22 09:23:44 2005
+++ SPECS/turba.spec Thu Feb 24 23:18:16 2005
@@ -1,9 +1,9 @@
# $Revision$, $Date$
-Summary: TURBA - Adress book for IMP
+Summary: TURBA - Address book for IMP
Summary(pl): TURBA - Książka adresowa dla IMP-a
Name: turba
Version: 2.0.2
-Release: 1
+Release: 1.2
License: LGPL
Vendor: The Horde Project
Group: Applications/Mail
@@ -14,7 +14,8 @@
Source2: %{name}-trans.mo
URL: http://www.horde.org/turba/
PreReq: apache
-Requires(post): grep
+BuildRequires: rpmbuild(macros) >= 1.177
+Requires(triggerpreun): sed >= 4.0
Requires: horde >= 3.0
Requires: php-xml >= 4.1.0
Obsoletes: horde-addons-turba
@@ -22,8 +23,12 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define apachedir /etc/httpd
+
%define hordedir /usr/share/horde
-%define confdir /etc/horde.org
+%define _appdir %{hordedir}/%{name}
+%define _sysconfdir /etc/horde.org
+%define _apache1dir /etc/apache
+%define _apache2dir /etc/httpd
%description
Turba is a complete basic contact management application. SQL, LDAP,
@@ -37,7 +42,7 @@
The Horde Project writes web applications in PHP and releases them
under the GNU Public License. For more information (including help
-with Horde and its modules) please visit http://www.horde.org/ .
+with Horde and its modules) please visit <http://www.horde.org/>.
%description -l pl
Turba to kompletna aplikacja do podstawowego zarządzania kontaktami.
@@ -51,94 +56,108 @@
Projekt Horde tworzy aplikacje w PHP i dostarcza je na licencji GNU
Public License. Jeżeli chcesz się dowiedzieć czegoś więcej (także help
-do IMP-a) zajrzyj na stronę http://www.horde.org/ .
+do IMP-a) zajrzyj na stronę <http://www.horde.org/>.
%prep
%setup -q -n %{name}-h3-%{version}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{apachedir},%{confdir}/turba} \
- $RPM_BUILD_ROOT%{hordedir}/turba/{lib,locale,templates,themes,scripts}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
+ $RPM_BUILD_ROOT%{_appdir}/{lib,locale,templates,themes,scripts}
+
+cp -pR *.php $RPM_BUILD_ROOT%{_appdir}
+for i in config/*.dist; do
+ cp -p $i $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$(basename $i .dist)
+done
+echo "<?php ?>" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php
+cp -pR config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib
+cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale
+cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates
+cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes
-cp -pR *.php $RPM_BUILD_ROOT%{hordedir}/turba
-cp -pR config/*.dist $RPM_BUILD_ROOT%{confdir}/turba
-cp -pR config/*.xml $RPM_BUILD_ROOT%{confdir}/turba
-echo "<?php ?>" > $RPM_BUILD_ROOT%{confdir}/turba/conf.php
-cp -pR lib/* $RPM_BUILD_ROOT%{hordedir}/turba/lib
-cp -pR locale/* $RPM_BUILD_ROOT%{hordedir}/turba/locale
-cp -pR templates/* $RPM_BUILD_ROOT%{hordedir}/turba/templates
-cp -pR themes/* $RPM_BUILD_ROOT%{hordedir}/turba/themes
-
-cp -p config/.htaccess $RPM_BUILD_ROOT%{confdir}/turba
-cp -p locale/.htaccess $RPM_BUILD_ROOT%{hordedir}/turba/locale
-cp -p templates/.htaccess $RPM_BUILD_ROOT%{hordedir}/turba/templates
-
-install %{SOURCE1} $RPM_BUILD_ROOT%{apachedir}
-ln -fs %{confdir}/%{name} $RPM_BUILD_ROOT%{hordedir}/%{name}/config
-
-install %{SOURCE2}
$RPM_BUILD_ROOT%{hordedir}/turba/locale/pl_PL/LC_MESSAGES/turba.mo
-
-# bit unclean..
-cd $RPM_BUILD_ROOT%{confdir}/turba
-for i in *.dist; do cp $i `basename $i .dist`; done
+ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_appdir}/config
+install %{SOURCE1}
$RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf
+
+install %{SOURCE2}
$RPM_BUILD_ROOT%{_appdir}/locale/pl_PL/LC_MESSAGES/turba.mo
%clean
rm -rf $RPM_BUILD_ROOT
%post
-if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*%{name}.conf"
/etc/httpd/httpd.conf; then
- echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf
- if [ -f /var/lock/subsys/httpd ]; then
- /usr/sbin/apachectl restart 1>&2
+# apache1
+if [ -d %{_apache1dir}/conf.d ]; then
+ ln -sf %{_sysconfdir}/apache-%{name}.conf
%{_apache1dir}/conf.d/99_%{name}.conf
+ if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache restart 1>&2
fi
-elif [ -d /etc/httpd/httpd.conf ]; then
- ln -sf /etc/httpd/%{name}.conf /etc/httpd/httpd.conf/99_%{name}.conf
+fi
+# apache2
+if [ -d %{_apache2dir}/httpd.conf ]; then
+ ln -sf %{_sysconfdir}/apache-%{name}.conf
%{_apache2dir}/httpd.conf/99_%{name}.conf
if [ -f /var/lock/subsys/httpd ]; then
- /usr/sbin/apachectl restart 1>&2
+ /etc/rc.d/init.d/httpd restart 1>&2
fi
fi
-cat <<_EOF2_
+if [ "$1" = 1 ]; then
+%banner %{name} -e <<EOF
IMPORTANT:
If you are installing for the first time, you must now
create the TURBA database tables. Look into directory
/usr/share/doc/%{name}-%{version}/drivers
to find out how to do this for your database.
-_EOF2_
-%preun
+EOF
+fi
+
if [ "$1" = "0" ]; then
- umask 027
- if [ -d /etc/httpd/httpd.conf ]; then
- rm -f /etc/httpd/httpd.conf/99_%{name}.conf
- else
- grep -v "^Include.*%{name}.conf" /etc/httpd/httpd.conf > \
- /etc/httpd/httpd.conf.tmp
- mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
+ # apache1
+ if [ -d %{_apache1dir}/conf.d ]; then
+ rm -f %{_apache1dir}/conf.d/99_%{name}.conf
+ if [ -f /var/lock/subsys/apache ]; then
+ /etc/rc.d/init.d/apache restart 1>&2
+ fi
fi
- if [ -f /var/lock/subsys/httpd ]; then
- /usr/sbin/apachectl restart 1>&2
+ # apache2
+ if [ -d %{_apache2dir}/httpd.conf ]; then
+ rm -f %{_apache2dir}/httpd.conf/99_%{name}.conf
+ if [ -f /var/lock/subsys/httpd ]; then
+ /etc/rc.d/init.d/httpd restart 1>&2
+ fi
fi
fi
+%triggerpostun -- turba <= 1.2.2-2
+if [ -f /etc/httpd/httpd.conf ]; then
+ sed -i -e '/^Include.*%{name}.conf/d' /etc/httpd/httpd.conf
+fi
+
+if [ -f %{_apache2dir}/%{name}.conf.rpmsave ]; then
+ cp -f %{_sysconfdir}/apache-%{name}.conf{,.rpmnew}
+ mv -f %{_apache2dir}/%{name}.conf.rpmsave
%{_sysconfdir}/apache-%{name}.conf
+fi
+
+if [ -f /var/lock/subsys/httpd ]; then
+ /etc/rc.d/init.d/httpd restart 1>&2
+fi
+
%files
%defattr(644,root,root,755)
%doc README docs/* scripts/*.reg scripts/ldap
-%dir %{hordedir}/%{name}
-%attr(640,root,http) %{hordedir}/%{name}/*.php
-%attr(750,root,http) %{hordedir}/%{name}/lib
-%attr(750,root,http) %{hordedir}/%{name}/locale
-%attr(750,root,http) %{hordedir}/%{name}/templates
-%attr(750,root,http) %{hordedir}/%{name}/themes
-
-%attr(770,root,http) %dir %{confdir}/%{name}
-%dir %{hordedir}/%{name}/config
-%attr(640,root,http) %{confdir}/%{name}/*.dist
-%attr(640,root,http) %{confdir}/%{name}/.htaccess
-%attr(640,root,http) %config(noreplace) %{apachedir}/%{name}.conf
-%attr(660,root,http) %config(noreplace) %{confdir}/%{name}/*.php
-%attr(640,root,http) %config(noreplace) %{confdir}/%{name}/*.xml
+%attr(770,root,http) %dir %{_sysconfdir}/%{name}
+%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf
+%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.php
+%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml
+
+%dir %{_appdir}
+%{_appdir}/config
+%{_appdir}/*.php
+%{_appdir}/lib
+%{_appdir}/locale
+%{_appdir}/templates
+%{_appdir}/themes
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -146,6 +165,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2005/02/24 22:18:16 glen
+- unification of horde apps
+
Revision 1.22 2005/02/22 08:23:44 paszczus
- allow horde application to keep backups of turba configuration [from
imp.spec]
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/turba.spec?r1=1.22&r2=1.23&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
