- add -overquote, -hash-UL, -logfile patches

- simplify build
- add log dirs; rel 3

Changed files:
    pound.spec -> 1.63

diff --git a/pound.spec b/pound.spec
index ef35139cc426e2466460cc0fcd99733264e4ddb4..e2206a3f47a107cf685761974aebf8757e978f55 100644 (file)
--- a/pound.spec
+++ b/pound.spec
@@ -2,11 +2,14 @@ Summary:      Pound - reverse-proxy and load-balancer
 Summary(pl.UTF-8):     Pound - reverse-proxy i load-balancer
 Name:          pound
 Version:       2.4.3
-Release:       2.2
+Release:       3
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://www.apsis.ch/pound/Pound-%{version}.tgz
 # Source0-md5: 2de4c2ac1023b420b74a1bc08fb93b8a
+Patch0:                %{name}-overquote.patch
+Patch1:                %{name}-hash-UL.patch
+Patch2:                %{name}-logfile.patch
 Source1:       %{name}.cfg
 Source2:       %{name}.init
 Source3:       %{name}.sysconfig
@@ -27,6 +30,8 @@ Provides:     group(pound)
 Provides:      user(pound)
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _sysconfdir     /etc/pound
+
 %description
 The Pound program is a reverse proxy, load balancer and HTTPS
 front-end for Web server(s). Pound was developped to enable
@@ -45,25 +50,26 @@ swobodnego używania, kopiowania i rozdawania.
 
 %prep
 %setup -q -n Pound-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
 %configure \
        --with-maxbuf=2048
-
-%{__make} \
-       CC="%{__cc}" \
-       F_CONF=%{_sysconfdir}/%{name}/pound.cfg
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,%{_sysconfdir}/pound,/var/run/%{name},/etc/{sysconfig,rc.d/init.d}}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8,%{_sysconfdir},/etc/{sysconfig,rc.d/init.d}} \
+       $RPM_BUILD_ROOT{/var/log/{%{name},archive/%{name}},/var/run/%{name}}
 
 install pound    $RPM_BUILD_ROOT%{_sbindir}
 install poundctl $RPM_BUILD_ROOT%{_sbindir}
 install pound.8  $RPM_BUILD_ROOT%{_mandir}/man8
 install poundctl.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
@@ -94,9 +100,11 @@ fi
 %defattr(644,root,root,755)
 %doc README FAQ CHANGELOG z*.py
 %attr(755,root,root) %{_sbindir}/*
-%dir %{_sysconfdir}/pound
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pound/*
+%dir %{_sysconfdir}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pound.cfg
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %{_mandir}/man8/*
 %dir /var/run/%{name}
+%dir %attr(751,root,root) /var/log/%{name}
+%attr(750,root,root) %dir /var/log/archive/%{name}