Author: glen Date: Fri Feb 25 00:31:37 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - strict apache version require (for confdir support) - package conf.php.bak as ghost for clean uninstall - keep write permission only on conf.php - cosmetics
---- Files affected: SPECS: chora.spec (1.25 -> 1.26) , turba.spec (1.26 -> 1.27) ---- Diffs: ================================================================ Index: SPECS/chora.spec diff -u SPECS/chora.spec:1.25 SPECS/chora.spec:1.26 --- SPECS/chora.spec:1.25 Thu Feb 24 21:52:00 2005 +++ SPECS/chora.spec Fri Feb 25 01:31:32 2005 @@ -4,14 +4,14 @@ Summary(pl): Program do obsługi CVS przez WWW Name: chora Version: 2.0 -Release: 0.15 +Release: 0.16 License: GPL v2 Group: Networking/Utilities Source0: ftp://ftp.horde.org/pub/chora/%{name}-h3-%{version}.tar.gz # Source0-md5: 11f4b8ad6e0706026aefd0ee29eff7a5 Source1: %{name}.conf URL: http://www.horde.org/chora/ -Requires: apache +Requires: apache >= 1.3.33-2 # well. depending on configuration, it needs cvs, rcs or svn, cvsps Requires: cvs Requires: rcs @@ -49,7 +49,7 @@ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \ - $RPM_BUILD_ROOT%{_appdir}/{lib,lib,locale,templates,themes} + $RPM_BUILD_ROOT%{_appdir}/{lib,locale,templates,themes} cp -pR *.php $RPM_BUILD_ROOT%{_appdir} for i in config/*.dist; do @@ -62,10 +62,12 @@ s,/usr/local/bin/cvsps,/usr/bin/cvsps, s,dirname(__FILE__).*/cvsgraph.conf.,%{_sysconfdir}/%{name}/cvsgraph.conf, ' < config/conf.xml > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.xml +> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak -for i in lib locale templates themes; do - cp -pR $i/* $RPM_BUILD_ROOT%{_appdir}/$i -done +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 ln -s %{_sysconfdir}/%{name} $RPM_BUILD_ROOT%{_appdir}/config install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache-%{name}.conf @@ -112,9 +114,11 @@ %doc README docs/* %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(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php +%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[^c]*.php %attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.txt %attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/*.conf +%ghost %{_sysconfdir}/%{name}/*.php.bak %attr(640,root,http) %{_sysconfdir}/%{name}/*.xml %dir %{_appdir} @@ -131,6 +135,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.26 2005/02/25 00:31:32 glen +- strict apache version require (for confdir support) +- package conf.php.bak as ghost for clean uninstall +- keep write permission only on conf.php +- cosmetics + Revision 1.25 2005/02/24 20:52:00 glen - use _appdir macro for simplicity @@ -198,7 +208,7 @@ - modified for new pear requires/provides rpm scripts Revision 1.5 2002/10/11 21:55:09 misto -- filename conflict while processing %%doc - FIXED +- filename conflict while processing %doc - FIXED - release 0.2 Revision 1.4 2002/10/10 12:39:02 marcus @@ -206,7 +216,7 @@ Revision 1.3 2002/07/21 10:30:52 blues - 1.1 -- nfy +- NFY Revision 1.2 2002/04/30 14:25:22 qboosh - cosmetics ================================================================ Index: SPECS/turba.spec diff -u SPECS/turba.spec:1.26 SPECS/turba.spec:1.27 --- SPECS/turba.spec:1.26 Thu Feb 24 23:55:51 2005 +++ SPECS/turba.spec Fri Feb 25 01:31:32 2005 @@ -3,7 +3,7 @@ Summary(pl): TURBA - Książka adresowa dla IMP-a Name: turba Version: 2.0.2 -Release: 1.3 +Release: 1.4 License: LGPL Vendor: The Horde Project Group: Applications/Mail @@ -13,9 +13,9 @@ Source1: %{name}.conf Source2: %{name}-trans.mo URL: http://www.horde.org/turba/ -Requires: apache BuildRequires: rpmbuild(macros) >= 1.177 Requires(triggerpreun): sed >= 4.0 +Requires: apache >= 1.3.33-2 Requires: horde >= 3.0 Requires: php-xml >= 4.1.0 Obsoletes: horde-addons-turba @@ -72,6 +72,8 @@ done echo "<?php ?>" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php cp -pR config/*.xml $RPM_BUILD_ROOT%{_sysconfdir}/%{name} +> $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.php.bak + cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale cp -pR templates/* $RPM_BUILD_ROOT%{_appdir}/templates @@ -150,7 +152,9 @@ %doc README docs/* scripts/*.reg scripts/ldap scripts/sql %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(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php +%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[^c]*.php +%ghost %{_sysconfdir}/%{name}/*.php.bak %attr(640,root,http) %{_sysconfdir}/%{name}/*.xml %dir %{_appdir} @@ -167,6 +171,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.27 2005/02/25 00:31:32 glen +- strict apache version require (for confdir support) +- package conf.php.bak as ghost for clean uninstall +- keep write permission only on conf.php +- cosmetics + Revision 1.26 2005/02/24 22:55:51 glen - typo @@ -227,7 +237,7 @@ - release 0.1 Revision 1.8.2.1 2004/12/13 21:55:26 paszczus -- updated to 2.0rc3 +- updated to 2.0rc3 Revision 1.8 2004/11/11 08:52:38 paszczus - release 2 @@ -252,4 +262,3 @@ Revision 1.1 2004/10/28 18:45:59 blues - moved to /usr/share by Mateusz Kamiński <[EMAIL PROTECTED]> - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/chora.spec?r1=1.25&r2=1.26&f=u http://cvs.pld-linux.org/SPECS/turba.spec?r1=1.26&r2=1.27&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
