Author: glen Date: Sun Feb 27 19:05:20 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- still, put conf.php.bak as %ghost, to avoid conf.php.bak.rpmnew files
- move util to %doc
- R: php-zip for lib/Hord
---- Files affected:
SPECS:
horde.spec (1.78 -> 1.79)
---- Diffs:
================================================================
Index: SPECS/horde.spec
diff -u SPECS/horde.spec:1.78 SPECS/horde.spec:1.79
--- SPECS/horde.spec:1.78 Sat Feb 26 00:14:43 2005
+++ SPECS/horde.spec Sun Feb 27 20:05:09 2005
@@ -3,8 +3,11 @@
# - support for Oracle and Sybase
# - make default install secure. so that it doesn't auto auth you to
# administrator. ip restriction in apache? any better ideas?
+# - remove config/ (and others in apache.conf) from document root, so
+# apache deny from all not needed.
# - put docs/CREDITS to package, rather in doc (so installations with
# --excludedocs have functional horde?)
+# - [Sun Feb 27 20:36:12 2005] [error] PHP Fatal error: Call to undefined
function: gzdeflate() in /usr/share/horde/lib/Horde/Image/png.php on line 198
#
%include /usr/lib/rpm/macros.php
Summary: The common Horde Framework for all Horde modules
@@ -13,7 +16,7 @@
Summary(pt_BR): Componentes comuns do Horde usados por todos os módulos
Name: horde
Version: 3.0.3
-Release: 2.33
+Release: 2.36
License: LGPL
Vendor: The Horde Project
Group: Development/Languages/PHP
@@ -22,6 +25,7 @@
Source1: %{name}.conf
Patch0: %{name}-path.patch
Patch1: %{name}-shell.disabled.patch
+Patch2: %{name}-util-h3.patch
URL: http://www.horde.org/
BuildRequires: rpmbuild(macros) >= 1.177
BuildRequires: rpm-php-pearprov >= 4.0.2-98
@@ -39,6 +43,7 @@
Requires: php-posix >= 4.1.0
Requires: php-session >= 4.1.0
Requires: php-xml >= 4.1.0
+Requires: php-zlib >= 4.1.0
Obsoletes: horde-mysql
Obsoletes: horde-pgsql
BuildArch: noarch
@@ -93,6 +98,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
# Described in documentation as dangerous file...
rm test.php
@@ -100,7 +106,7 @@
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_sysconfdir}/%{name} \
- $RPM_BUILD_ROOT%{_appdir}/{admin,js,services,util} \
+ $RPM_BUILD_ROOT%{_appdir}/{admin,js,services} \
$RPM_BUILD_ROOT%{_appdir}/{docs,lib,locale,templates,themes} \
$RPM_BUILD_ROOT/var/log/%{name}
@@ -116,7 +122,6 @@
cp -pR admin/* $RPM_BUILD_ROOT%{_appdir}/admin
cp -pR js/* $RPM_BUILD_ROOT%{_appdir}/js
cp -pR services/* $RPM_BUILD_ROOT%{_appdir}/services
-cp -pR util/* $RPM_BUILD_ROOT%{_appdir}/util
cp -pR lib/* $RPM_BUILD_ROOT%{_appdir}/lib
cp -pR locale/* $RPM_BUILD_ROOT%{_appdir}/locale
@@ -134,6 +139,10 @@
rm -rf $RPM_BUILD_ROOT
%post
+if [ ! -f %{_sysconfdir}/%{name}/conf.php.bak ]; then
+ install /dev/null -o root -g http -m660
%{_sysconfdir}/%{name}/conf.php.bak
+fi
+
# apache1
if [ -d %{_apache1dir}/conf.d ]; then
ln -sf %{_sysconfdir}/apache-%{name}.conf
%{_apache1dir}/conf.d/99_%{name}.conf
@@ -163,7 +172,8 @@
You need to install php-ldap package and setup ldap schema from
%{_defaultdocdir}/%{name}-%{version}/scripts/ldap.
-NOTE: You don't need SQL database, if you use just LDAP.
+NOTE: You don't need SQL database, if you use LDAP for
+authorization.
EOF
# '
@@ -237,14 +247,14 @@
%files
%defattr(644,root,root,755)
-%doc README scripts
+%doc README scripts util
%doc docs/{CHANGES,CODING_STANDARDS,CONTRIBUTING,CREDITS,HACKING,INSTALL}
%doc docs/{PERFORMANCE,RELEASE{,_NOTES},SECURITY,TODO,TRANSLATIONS,UPGRADING}
%dir %{_sysconfdir}
%attr(750,root,http) %dir %{_sysconfdir}/%{name}
%attr(640,root,root) %config(noreplace) %{_sysconfdir}/apache-%{name}.conf
%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php
-%attr(660,root,http) %config(noreplace) %{_sysconfdir}/%{name}/conf.php.bak
+%attr(660,root,http) %config(noreplace) %ghost
%{_sysconfdir}/%{name}/conf.php.bak
%attr(640,root,http) %config(noreplace) %{_sysconfdir}/%{name}/[!c]*.php
%attr(640,root,http) %{_sysconfdir}/%{name}/*.xml
@@ -259,7 +269,6 @@
%{_appdir}/services
%{_appdir}/templates
%{_appdir}/themes
-%{_appdir}/util
%dir %attr(750,root,http) /var/log/%{name}
%ghost %attr(770,root,http) /var/log/%{name}/%{name}.log
@@ -270,6 +279,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.79 2005/02/27 19:05:09 glen
+- still, put conf.php.bak as %ghost, to avoid conf.php.bak.rpmnew files
+- move util to %doc
+- R: php-zip for lib/Hord
+
Revision 1.78 2005/02/25 23:14:43 glen
- file security revisited: remove write permission on config directory and add
.bak files as config
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/horde.spec?r1=1.78&r2=1.79&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
