Author: glen Date: Thu Feb 24 20:52:06 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - use _appdir macro for simplicity
---- Files affected: SPECS: chora.spec (1.24 -> 1.25) , imp.spec (1.63 -> 1.64) ---- Diffs: ================================================================ Index: SPECS/chora.spec diff -u SPECS/chora.spec:1.24 SPECS/chora.spec:1.25 --- SPECS/chora.spec:1.24 Thu Feb 24 21:45:44 2005 +++ SPECS/chora.spec Thu Feb 24 21:52:00 2005 @@ -4,7 +4,7 @@ Summary(pl): Program do obsługi CVS przez WWW Name: chora Version: 2.0 -Release: 0.14 +Release: 0.15 License: GPL v2 Group: Networking/Utilities Source0: ftp://ftp.horde.org/pub/chora/%{name}-h3-%{version}.tar.gz @@ -22,6 +22,7 @@ %define _noautoreq 'pear(Horde.*)' %define hordedir /usr/share/horde +%define _appdir %{hordedir}/%{name} %define _sysconfdir /etc/horde.org %define _apache1dir /etc/apache %define _apache2dir /etc/httpd @@ -48,9 +49,9 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \ - $RPM_BUILD_ROOT%{hordedir}/%{name}/{lib,lib,locale,templates,themes} + $RPM_BUILD_ROOT%{_appdir}/{lib,lib,locale,templates,themes} -cp -pR *.php $RPM_BUILD_ROOT%{hordedir}/%{name} +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 @@ -63,10 +64,10 @@ ' < config/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml for i in lib locale templates themes; do - cp -pR $i/* $RPM_BUILD_ROOT%{hordedir}/%{name}/$i + cp -pR $i/* $RPM_BUILD_ROOT%{_appdir}/$i done -ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{hordedir}/%{name}/config +ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_appdir}/config install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf %clean @@ -116,13 +117,13 @@ %attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.conf %attr(640,root,http) %{_sysconfdir}/%{name}/*.xml -%dir %{hordedir}/%{name} -%{hordedir}/%{name}/config -%{hordedir}/%{name}/*.php -%{hordedir}/%{name}/lib -%{hordedir}/%{name}/locale -%{hordedir}/%{name}/templates -%{hordedir}/%{name}/themes +%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 @@ -130,6 +131,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.25 2005/02/24 20:52:00 glen +- use _appdir macro for simplicity + Revision 1.24 2005/02/24 20:45:44 glen - upgraded to 2.0 ================================================================ Index: SPECS/imp.spec diff -u SPECS/imp.spec:1.63 SPECS/imp.spec:1.64 --- SPECS/imp.spec:1.63 Thu Feb 24 21:47:16 2005 +++ SPECS/imp.spec Thu Feb 24 21:52:00 2005 @@ -26,6 +26,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define hordedir /usr/share/horde +%define _appdir %{hordedir}/%{name} %define _sysconfdir /etc/horde.org %define _apache1dir /etc/apache %define _apache2dir /etc/httpd @@ -59,25 +60,25 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{/etc/cron.daily,%{_sysconfdir}/imp} \ - $RPM_BUILD_ROOT%{hordedir}/%{name}/{lib,locale,scripts,templates,themes} + $RPM_BUILD_ROOT%{_appdir}/{lib,locale,scripts,templates,themes} -cp -pR *.php $RPM_BUILD_ROOT%{hordedir}/%{name} +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 cp -pR config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name} echo "<?php ?>" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php -cp -pR lib/* $RPM_BUILD_ROOT%{hordedir}/%{name}/lib -cp -pR locale/* $RPM_BUILD_ROOT%{hordedir}/%{name}/locale -cp -pR scripts/*.php $RPM_BUILD_ROOT%{hordedir}/%{name}/scripts -cp -pR templates/* $RPM_BUILD_ROOT%{hordedir}/%{name}/templates -cp -pR themes/* $RPM_BUILD_ROOT%{hordedir}/%{name}/themes +cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib +cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale +cp -pR scripts/*.php $RPM_BUILD_ROOT%{_appdir}/scripts +cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates +cp -pR themes/* $RPM_BUILD_ROOT%{_appdir}/themes -ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{hordedir}/%{name}/config +ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_appdir}/config install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf -install %{SOURCE6} $RPM_BUILD_ROOT%{hordedir}/%{name}/locale/pl_PL/LC_MESSAGES/%{name}.mo +install %{SOURCE6} $RPM_BUILD_ROOT%{_appdir}/locale/pl_PL/LC_MESSAGES/%{name}.mo %clean rm -rf $RPM_BUILD_ROOT @@ -143,14 +144,14 @@ %attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.txt %attr(640,root,http) %{_sysconfdir}/%{name}/*.xml -%dir %{hordedir}/%{name} -%{hordedir}/%{name}/config -%{hordedir}/%{name}/*.php -%{hordedir}/%{name}/lib -%{hordedir}/%{name}/locale -%{hordedir}/%{name}/scripts -%{hordedir}/%{name}/templates -%{hordedir}/%{name}/themes +%dir %{_appdir} +%{_appdir}/config +%{_appdir}/*.php +%{_appdir}/lib +%{_appdir}/locale +%{_appdir}/scripts +%{_appdir}/templates +%{_appdir}/themes %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -158,6 +159,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.64 2005/02/24 20:52:00 glen +- use _appdir macro for simplicity + Revision 1.63 2005/02/24 20:47:16 glen - fix permissions on php scripts in hordedir - R: apache rather PreReq ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/chora.spec?r1=1.24&r2=1.25&f=u http://cvs.pld-linux.org/SPECS/imp.spec?r1=1.63&r2=1.64&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
