Author: glen Date: Wed Feb 16 21:04:49 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use _sysconfdir macro - description cosmetics
---- Files affected: SPECS: imp.spec (1.57 -> 1.58) ---- Diffs: ================================================================ Index: SPECS/imp.spec diff -u SPECS/imp.spec:1.57 SPECS/imp.spec:1.58 --- SPECS/imp.spec:1.57 Sun Feb 13 21:46:15 2005 +++ SPECS/imp.spec Wed Feb 16 22:04:44 2005 @@ -5,7 +5,7 @@ Summary(pt_BR): Programa de Mail via Web Name: imp Version: 4.0.2 -Release: 1 +Release: 1.1 License: GPL v2 Group: Applications/Mail Source0: ftp://ftp.horde.org/pub/imp/%{name}-h3-%{version}.tar.gz @@ -28,7 +28,7 @@ %define apachedir /etc/httpd %define hordedir /usr/share/horde -%define confdir /etc/horde.org +%define _sysconfdir /etc/horde.org %description IMP is the Internet Messaging Program, one of the Horde components. It @@ -36,7 +36,7 @@ The Horde Project writes web applications in PHP and releases them under the GNU Public License. For more information (including help -with IMP) please visit http://www.horde.org/ . +with IMP) please visit <http://www.horde.org/>. %description -l es Programa de correo vía Internet basado en IMAP. @@ -47,7 +47,7 @@ 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/>. %description -l pt_BR Programa de Mail via Web baseado no IMAP. @@ -58,30 +58,30 @@ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{apachedir},/etc/cron.daily,%{confdir}/imp} \ +install -d $RPM_BUILD_ROOT{%{apachedir},/etc/cron.daily,%{_sysconfdir}/imp} \ $RPM_BUILD_ROOT%{hordedir}/imp/{lib,locale,scripts,templates,themes} cp -pR *.php $RPM_BUILD_ROOT%{hordedir}/imp -cp -pR config/*.dist $RPM_BUILD_ROOT%{confdir}/imp -cp -pR config/*.xml $RPM_BUILD_ROOT%{confdir}/imp -echo "<?php ?>" > $RPM_BUILD_ROOT%{confdir}/imp/conf.php +cp -pR config/*.dist $RPM_BUILD_ROOT%{_sysconfdir}/imp +cp -pR config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/imp +echo "<?php ?>" > $RPM_BUILD_ROOT%{_sysconfdir}/imp/conf.php cp -pR lib/* $RPM_BUILD_ROOT%{hordedir}/imp/lib cp -pR locale/* $RPM_BUILD_ROOT%{hordedir}/imp/locale cp -pR scripts/*.php $RPM_BUILD_ROOT%{hordedir}/imp/scripts cp -pR templates/* $RPM_BUILD_ROOT%{hordedir}/imp/templates cp -pR themes/* $RPM_BUILD_ROOT%{hordedir}/imp/themes -cp -p config/.htaccess $RPM_BUILD_ROOT%{confdir}/imp +cp -p config/.htaccess $RPM_BUILD_ROOT%{_sysconfdir}/imp cp -p locale/.htaccess $RPM_BUILD_ROOT%{hordedir}/imp/locale cp -p scripts/.htaccess $RPM_BUILD_ROOT%{hordedir}/imp/scripts cp -p templates/.htaccess $RPM_BUILD_ROOT%{hordedir}/imp/templates -ln -sf %{confdir}/%{name} $RPM_BUILD_ROOT%{hordedir}/%{name}/config +ln -sf %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{hordedir}/%{name}/config install %{SOURCE1} $RPM_BUILD_ROOT%{apachedir} install %{SOURCE6} $RPM_BUILD_ROOT%{hordedir}/imp/locale/pl_PL/LC_MESSAGES/imp.mo -cd $RPM_BUILD_ROOT%{confdir}/imp +cd $RPM_BUILD_ROOT%{_sysconfdir}/imp for i in *.dist; do cp $i `basename $i .dist`; done %clean @@ -118,8 +118,8 @@ %triggerpostun -- imp <= 3.2.6-0.1 for i in conf.php filter.txt header.txt html.php menu.php mime_drivers.php motd.php prefs.php servers.php trailer.txt; do if [ -f /home/services/httpd/html/horde/imp/config/$i.rpmsave ]; then - mv -f %{confdir}/%{name}/$i %{confdir}/%{name}/$i.rpmnew - mv -f /home/services/httpd/html/horde/imp/config/$i.rpmsave %{confdir}/%{name}/$i + mv -f %{_sysconfdir}/%{name}/$i %{_sysconfdir}/%{name}/$i.rpmnew + mv -f /home/services/httpd/html/horde/imp/config/$i.rpmsave %{_sysconfdir}/%{name}/$i fi done @@ -134,14 +134,14 @@ %attr(750,root,http) %{hordedir}/%{name}/templates %attr(750,root,http) %{hordedir}/%{name}/themes -%attr(750,root,http) %dir %{confdir}/%{name} +%attr(750,root,http) %dir %{_sysconfdir}/%{name} %{hordedir}/%{name}/config -%attr(640,root,http) %{confdir}/%{name}/*.dist -%attr(640,root,http) %{confdir}/%{name}/*.xml -%attr(640,root,http) %{confdir}/%{name}/.htaccess +%attr(640,root,http) %{_sysconfdir}/%{name}/*.dist +%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml +%attr(640,root,http) %{_sysconfdir}/%{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}/*.txt +%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.php +%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.txt %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -149,6 +149,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.58 2005/02/16 21:04:44 glen +- use _sysconfdir macro +- description cosmetics + Revision 1.57 2005/02/13 20:46:15 matipl - update to 4.0.2, remove patch1 (include in update) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.57&r2=1.58&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
