[pgbouncer/f18] Update to 1.5.3, which also fixes bz #872527.

[Devrim GÜNDÜZ]

commit 8763c6855c5f6e298c135c70aa6cdcd7cc89d5e5
Author: Devrim GUNDUZ <devrim at gunduz.org>
Date:   Fri Nov 2 14:22:40 2012 +0200

    Update to 1.5.3, which also fixes bz #872527.
    
        Add mkauth.py among installed files.

 pgbouncer.spec |   37 ++++++++++++++++++++++++++++---------
 1 files changed, 28 insertions(+), 9 deletions(-)
---
diff --git a/pgbouncer.spec b/pgbouncer.spec
index 5136f37..d293564 100644
--- a/pgbouncer.spec
+++ b/pgbouncer.spec
@@ -1,20 +1,19 @@
 %define debug 0
 
 Name:		pgbouncer
-Version:	1.4
-Release:	3%{?dist}
+Version:	1.5.3
+Release:	1%{?dist}
 Summary:	Lightweight connection pooler for PostgreSQL
 Group:		Applications/Databases
 License:	MIT and BSD
 URL:		http://pgfoundry.org/projects/pgbouncer/
-Source0:	http://pgfoundry.org/frs/download.php/2912/%{name}-%{version}.tgz
+Source0:	http://ftp.postgresql.org/pub/projects/pgFoundry/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-ini.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libevent-devel >= 1.3b
-Requires:	initscripts
+BuildRequires:	libevent-devel >= 2.0
 
 Requires(post):	chkconfig
 Requires(preun):	chkconfig, initscripts
@@ -46,17 +45,31 @@ make %{?_smp_mflags} V=1
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
-install -p -d %{buildroot}%{_sysconfdir}/
+install -p -d %{buildroot}%{_sysconfdir}/%{name}/
 install -p -d %{buildroot}%{_sysconfdir}/sysconfig
-install -p -m 644 etc/pgbouncer.ini %{buildroot}%{_sysconfdir}/
-rm -f %{buildroot}%{_docdir}/%{name}/pgbouncer.ini
+install -p -m 644 etc/pgbouncer.ini %{buildroot}%{_sysconfdir}/%{name}
+install -p -m 700 etc/mkauth.py %{buildroot}%{_sysconfdir}/%{name}/
 install -p -d %{buildroot}%{_initrddir}
 install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/%{name}
 install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
 
+# Remove duplicated files
+%{__rm} -f %{buildroot}%{_docdir}/%{name}/pgbouncer.ini
+%{__rm} -f %{buildroot}%{_docdir}/%{name}/NEWS
+%{__rm} -f %{buildroot}%{_docdir}/%{name}/README
+%{__rm} -f %{buildroot}%{_docdir}/%{name}/userlist.txt
+
 %post
 chkconfig --add pgbouncer
 
+%pre
+groupadd -r pgbouncer >/dev/null 2>&1 || :
+useradd -m -g pgbouncer -r -s /bin/bash \
+        -c "PgBouncer Server" pgbouncer >/dev/null 2>&1 || :
+touch /var/log/pgbouncer.log
+chown pgbouncer:pgbouncer /var/log/pgbouncer.log
+chmod 0700 /var/log/pgbouncer.log
+
 %preun
 if [ $1 = 0 ] ; then
 	/sbin/service pgbouncer condstop >/dev/null 2>&1
@@ -75,13 +88,19 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc README NEWS AUTHORS
 %{_bindir}/*
-%config(noreplace) %{_sysconfdir}/%{name}.ini
+%config(noreplace) %{_sysconfdir}/%{name}/%{name}.ini
 %{_initrddir}/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %{_mandir}/man1/%{name}.*
 %{_mandir}/man5/%{name}.*
+%{_sysconfdir}/%{name}/mkauth.py*
 
 %changelog
+* Fri Nov 2 2012 Devrim GÜNDÜZ <devrim at gunduz.org> - 1.5.3-1
+- Update to 1.5.3, which also fixes bz #872527.
+- Add mkauth.py among installed files.
+- TODO: Apply systemd changes.
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild