- modernized

Changed files:
    horde.spec -> 1.18

diff --git a/horde.spec b/horde.spec
index c49e71b745a34e2263ee3a01149f88b04b2d66fc..52e48a1200f4c833e5c00d0cec86926a1a657e88 100644 (file)
--- a/horde.spec
+++ b/horde.spec
@@ -16,14 +16,14 @@ License:    GPL v2 (CHECK IT FIRST, could be ASL)
 Group:         Applications/WWW
 Source0:       ftp://ftp.horde.org/pub/skeleton/%{hordeapp}-h3-%{version}.tar.gz
 # Source0-md5: -
-Source1:       %{hordeapp}.conf
-Patch0:                %{hordeapp}-prefs.patch
+Source1:       apache.conf
+Patch0:                prefs.patch
 URL:           http://www.horde.org/skeleton/
 BuildRequires: rpm-php-pearprov >= 4.0.2-98
 BuildRequires: rpmbuild(macros) >= 1.264
-Requires:      apache(mod_access)
 Requires:      horde >= 3.0
 Requires:      webapps
+Requires:      webserver(access)
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -52,6 +52,7 @@ Skeleton) można znaleźć na stronie <http://www.horde.org/>.
 
 %prep
 %setup -q -n %{hordeapp}-h3-%{version}
+%patch0 -p1
 
 rm {,*/}.htaccess
 for i in config/*.dist; do
@@ -80,17 +81,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 if [ ! -f %{_sysconfdir}/conf.php.bak ]; then
-       install /dev/null -o root -g http -m660 %{_sysconfdir}/conf.php.bak
+       install /dev/null -o root -g http -m 0660 %{_sysconfdir}/conf.php.bak
 fi
 
 # CHECK FIRST DOES IT HAVE SQL AND FILE THERE.
 if [ "$1" = 1 ]; then
-%banner %{name} -e <<-EOF
+       %banner %{name} -e <<-EOF
        IMPORTANT:
        If you are installing Skeleton for the first time, You may need to
        create the Skeleton database tables. To do so run:
        zcat %{_docdir}/%{name}-%{version}/scripts/sql/%{hordeapp}.sql.gz | mysql horde
-EOF
+       EOF
 fi
 
 %triggerin -- apache1 < 1.3.37-3, apache1-base