Better fix for conf file problem, per bugzilla review

diff --git a/pgpool.spec b/pgpool.spec
index f04d0b152743caebc832e617f9f833e4650d6999..f489253c2686d08bee20fec9744c68fd8e458f25 100644 (file)
--- a/pgpool.spec
+++ b/pgpool.spec
@@ -2,8 +2,8 @@
 
 Summary:       Pgpool is a connection pooling/replication server for PostgreSQL
 Name:          postgresql-%{short_name}
-Version:       3.1.2
-Release:       1%{?dist}
+Version:       3.1.1
+Release:       7%{?dist}
 License:       BSD
 Vendor:                PgPool Global Development Group
 Group:         Applications/Databases
@@ -23,7 +23,7 @@ were a standard PostgreSQL server.
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
 
-%configure --sysconfdir=%{_docdir}/%{name}-%{version} --mandir=%{_mandir} --libdir=%{_libdir}
+%configure
 
 make %{?smp_flags}
 
@@ -32,19 +32,27 @@ rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 install -m 755 %{short_name} %{buildroot}%{_bindir}
 install -m 644 %{short_name}.8 %{buildroot}%{_mandir}/man8/
+install -d %{buildroot}/%{_docdir}/%{name}-%{version}
+mv %{buildroot}%{_sysconfdir}/pgpool.conf.sample %{buildroot}/%{_docdir}/%{name}-%{version}
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README README.euc_jp TODO COPYING INSTALL AUTHORS ChangeLog NEWS  pgpool.conf.sample
+%doc README README.euc_jp TODO COPYING INSTALL AUTHORS ChangeLog NEWS pgpool.conf.sample
 %{_bindir}/pgpool
 %{_mandir}/man8/*
 
 %changelog
 * Tue Dec 5 2006 - Devrim GUNDUZ <devrim@commandprompt.com> 3.1.2-1
-- Update to 3.1.2
+- Update to 3.1.2-1
+
+* Tue Dec 5 2006 - Devrim GUNDUZ <devrim@commandprompt.com> 3.1.1-7
+- Better fix for conf file problem, per bugzilla review
+
+* Fri Nov 28 2006 - Devrim GUNDUZ <devrim@commandprompt.com> 3.1.1-6
+- Truncate configure line
 
 * Fri Nov 24 2006 - Devrim GUNDUZ <devrim@commandprompt.com> 3.1.1-5
 - moved sample conf file to %%doc