Log Message:
-----------
Changes to configure.ac / RPM spec files per Rod Taylor

Tags:
----
REL_1_2_STABLE

Modified Files:
--------------
    slony1-engine:
        postgresql-slony1-engine.spec.in (r1.31.2.1 -> r1.31.2.2)

-------------- next part --------------
Index: postgresql-slony1-engine.spec.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/postgresql-slony1-engine.spec.in,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -Lpostgresql-slony1-engine.spec.in -Lpostgresql-slony1-engine.spec.in -u -w -r1.31.2.1 -r1.31.2.2
--- postgresql-slony1-engine.spec.in
+++ postgresql-slony1-engine.spec.in
@@ -6,14 +6,14 @@
 %define pg_version   %(rpm -q --queryformat '%{VERSION}' postgresql-devel)
 
 Summary:	A "master to multiple slaves" replication system with cascading and failover
-Name:           @PACKAGE_NAME@
+Name:           postgresql-slony1-engine
 Version:        @PACKAGE_VERSION@
 Release:        2_PG%{pg_version}
 License:        BSD
 Group:          Applications/Databases
 URL:            http://slony.info/
 Packager:       Devrim Gunduz <devrim at commandprompt.com>
-Source0:        @PACKAGE_NAME at -%{version}.tar.gz
+Source0:        @PACKAGE_NAME at -%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	postgresql-devel
 Requires:	postgresql-server = %{pg_version}
@@ -44,7 +44,7 @@
 Prereq: @PACKAGE_NAME at - at PACKAGE_VERSION at -%{release}
 
 %description docs
-The @PACKAGE_NAME at -docs package includes some documentation for Slony-I.
+The %{name}-docs package includes some documentation for Slony-I.
 %endif
 
 %prep
@@ -65,7 +65,7 @@
         --with-perltools=%{_bindir} --with-toolsbin=%{_bindir} \
 %endif
 %if %docs
-        --with-docs --with-docdir=/usr/share/doc \
+        --with-docs --with-docdir=%{_docdir}/%{name}-%{version} \
 %endif
         --datadir %{_datadir}/pgsql --sysconfdir=/etc --with-pglibdir=%{_libdir}/pgsql 
 
@@ -95,12 +95,13 @@
 /bin/rm -rf altperl/*.pl altperl/ToDo altperl/README altperl/Makefile altperl/CVS
 install -m 0644 altperl/slon_tools.conf-sample  $RPM_BUILD_ROOT%{_sysconfdir}/slon_tools.conf
 install -m 0755 altperl/* $RPM_BUILD_ROOT%{_bindir}/
-install -m 0644 altperl/slon-tools  $RPM_BUILD_ROOT%{_libdir}/pgsql/slon-tools
+install -m 0644 altperl/slon-tools  $RPM_BUILD_ROOT%{_libdir}/pgsql/slon-tools.pm
 /bin/rm -f $RPM_BUILD_ROOT%{_sysconfdir}/slon_tools.conf-sample
 /bin/rm -f $RPM_BUILD_ROOT%{_bindir}/slon_tools.conf-sample
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/pgsql/slon-tools.pm
 /bin/rm -f $RPM_BUILD_ROOT%{_bindir}/slon-tools.pm
 /bin/rm -f $RPM_BUILD_ROOT%{_bindir}/slon-tools
+/bin/rm -f $RPM_BUILD_ROOT%{_bindir}/pgsql/slon-tools
 %endif
 
 %clean
@@ -108,7 +109,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT UPGRADING HISTORY-1.1 INSTALL SAMPLE RELEASE-1.2.0 RELEASE-1.2.1
+%doc COPYRIGHT UPGRADING HISTORY-1.1 INSTALL SAMPLE RELEASE-%{version}
 %if %docs
 %doc doc/adminguide  doc/concept  doc/howto  doc/implementation  doc/support
 %endif
@@ -118,11 +119,14 @@
 %{_datadir}/pgsql/*.sql
 %config(noreplace) %{_sysconfdir}/slon.conf
 %if %perltools
-%{_libdir}/pgsql/slon-tools
+%{_libdir}/pgsql/slon-tools.pm
 %config(noreplace) %{_sysconfdir}/slon_tools.conf
 %endif
 
 %changelog
+* Tue Oct 31 2006 Trevor Astrope <astrope at sitesell.com>
+- Fixup tar name and install slon-tools as slon-tools.pm
+
 * Mon Jul 17 2006 Devrim Gunduz <devrim at CommandPrompt.com> postgresql-slony1-engine
 - Updated spec and cleaned up rpmlint errors and warnings