Updates to spec, per bugzilla review.

diff --git a/pgpool.spec b/pgpool.spec
index ccabdee61b6cfe90cf6ab6634874b423b76d28da..742ac410c25a4ef6d8cb724d2b10af5d91d33ba8 100644 (file)
--- a/pgpool.spec
+++ b/pgpool.spec
@@ -1,12 +1,14 @@
+%define short_name     pgpool
+
 Summary:       Pgpool is a connection pooling/replication server for PostgreSQL
-Name:          pgpool
+Name:          postgresql-%{short_name}
 Version:       3.1.1
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       BSD
 Vendor:                PgPool Global Development Group
 Group:         Applications/Databases
 URL:           http://pgpool.projects.PostgreSQL.org
-Source0:       http://pgfoundry.org/frs/download.php/980/%{name}-%{version}.tar.gz
+Source0:       http://pgfoundry.org/frs/download.php/980/%{short_name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -16,33 +18,35 @@ pgpool runs between PostgreSQL's clients(front ends) and servers
 were a standard PostgreSQL server.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{short_name}-%{version}
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
 
-%configure --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir}
+%configure --sysconfdir=%{_docdir}/%{name}-%{version} --mandir=%{_mandir} --libdir=%{_libdir}
 
 make %{?smp_flags}
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
-install -m 755 %{name} %{buildroot}%{_bindir}
-install -m 644 %{name}.conf.sample %{buildroot}%{_sysconfdir}
-install -m 644 %{name}.8 %{buildroot}%{_mandir}/man8/
+install -m 755 %{short_name} %{buildroot}%{_bindir}
+install -m 644 %{short_name}.8 %{buildroot}%{_mandir}/man8/
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc README README.euc_jp TODO COPYING INSTALL AUTHORS ChangeLog NEWS 
+%doc README README.euc_jp TODO COPYING INSTALL AUTHORS ChangeLog NEWS  pgpool.conf.sample
 %{_bindir}/pgpool
-%config(noreplace) %{_sysconfdir}/pgpool.conf.sample
 %{_mandir}/man8/*
 
 %changelog
+* Fri Nov 24 2006 - Devrim GUNDUZ <devrim@commandprompt.com> 3.1.1-5
+- moved sample conf file to %%doc
+- Renamed package to postgresql-pgpool
+
 * Fri Sep 8 2006 - Devrim GUNDUZ <devrim@commandprompt.com> 3.1.1-4
 - Fix changelog date
 - Remove dependency for postgresql-server.