Log Message:
-----------
- On 64-bit boxes, both 32 and 64 bit -devel packages may be installed. Fix version check
script
- Revert tar name patch
- Macros cannot be used in various parts of the spec file. Revert that commit
- Spec file cleanup

Modified Files:
--------------
    slony1-engine:
        postgresql-slony1-engine.spec.in (r1.32 -> r1.33)

-------------- 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.32
retrieving revision 1.33
diff -Lpostgresql-slony1-engine.spec.in -Lpostgresql-slony1-engine.spec.in -u -w -r1.32 -r1.33
--- postgresql-slony1-engine.spec.in
+++ postgresql-slony1-engine.spec.in
@@ -3,17 +3,16 @@
 %{?buildrhel3:%define kerbdir /usr/kerberos}
 %{!?kerbdir:%define kerbdir "/usr"}
 
-%define pg_version   %(rpm -q --queryformat '%{VERSION}' postgresql-devel)
+%define pg_version   %(rpm -qv postgresql-devel|head -n 1|awk -F '-' '{print $3}')
 
 Summary:	A "master to multiple slaves" replication system with cascading and failover
-Name:           postgresql-slony1-engine
+Name:		@PACKAGE_NAME@
 Version:        @PACKAGE_VERSION@
-Release:        2_PG%{pg_version}
+Release:	1_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.bz2
+Source0:	@PACKAGE_NAME at -%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	postgresql-devel
 Requires:	postgresql-server = %{pg_version}
@@ -44,7 +43,7 @@
 Prereq: @PACKAGE_NAME at - at PACKAGE_VERSION at -%{release}
 
 %description docs
-The %{name}-docs package includes some documentation for Slony-I.
+The @PACKAGE_NAME at -docs package includes some documentation for Slony-I.
 %endif
 
 %prep
@@ -67,7 +66,7 @@
 %if %docs
         --with-docs --with-docdir=%{_docdir}/%{name}-%{version} \
 %endif
-        --datadir %{_datadir}/pgsql --sysconfdir=/etc --with-pglibdir=%{_libdir}/pgsql 
+        --datadir %{_datadir}/pgsql --sysconfdir=%{_sysconfdir} --with-pglibdir=%{_libdir}/pgsql 
 
 autoconf
 
@@ -77,39 +76,39 @@
 %endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
-install -d $RPM_BUILD_ROOT%{_datadir}/pgsql/
-install -d $RPM_BUILD_ROOT%{_libdir}/pgsql/
-make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
-install -m 0755 src/backend/slony1_funcs.so $RPM_BUILD_ROOT%{_libdir}/pgsql/slony1_funcs.so
-install -m 0755 src/xxid/xxid.so $RPM_BUILD_ROOT%{_libdir}/pgsql/xxid.so
-install -m 0644 src/backend/*.sql $RPM_BUILD_ROOT%{_datadir}/pgsql/
-install -m 0644 src/xxid/*.sql $RPM_BUILD_ROOT%{_datadir}/pgsql/
-install -m 0755 tools/*.sh  $RPM_BUILD_ROOT%{_bindir}/
-install -m 0644 share/slon.conf-sample $RPM_BUILD_ROOT%{_sysconfdir}/slon.conf
+rm -rf %{buildroot}
+install -d %{buildroot}%{_sysconfdir}
+install -d %{buildroot}%{_datadir}/pgsql/
+install -d %{buildroot}%{_libdir}/pgsql/
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
+install -m 0755 src/backend/slony1_funcs.so %{buildroot}%{_libdir}/pgsql/slony1_funcs.so
+install -m 0755 src/xxid/xxid.so %{buildroot}%{_libdir}/pgsql/xxid.so
+install -m 0644 src/backend/*.sql %{buildroot}%{_datadir}/pgsql/
+install -m 0644 src/xxid/*.sql %{buildroot}%{_datadir}/pgsql/
+install -m 0755 tools/*.sh  %{buildroot}%{_bindir}/
+install -m 0644 share/slon.conf-sample %{buildroot}%{_sysconfdir}/slon.conf
 
 %if %perltools
 cd tools
-make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 /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.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
+install -m 0644 altperl/slon_tools.conf-sample  %{buildroot}%{_sysconfdir}/slon_tools.conf
+install -m 0755 altperl/* %{buildroot}%{_bindir}/
+install -m 0644 altperl/slon-tools  %{buildroot}%{_libdir}/pgsql/slon-tools.pm
+/bin/rm -f %{buildroot}%{_sysconfdir}/slon_tools.conf-sample
+/bin/rm -f %{buildroot}%{_bindir}/slon_tools.conf-sample
+#/bin/rm -f %{buildroot}%{_libdir}/pgsql/slon-tools.pm
+/bin/rm -f %{buildroot}%{_bindir}/slon-tools.pm
+/bin/rm -f %{buildroot}%{_bindir}/slon-tools
+/bin/rm -f %{buildroot}%{_bindir}/pgsql/slon-tools
 %endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc COPYRIGHT UPGRADING HISTORY-1.1 INSTALL SAMPLE RELEASE-%{version}
+%doc COPYRIGHT UPGRADING HISTORY-1.1 INSTALL SAMPLE RELEASE-1.2.1
 %if %docs
 %doc doc/adminguide  doc/concept  doc/howto  doc/implementation  doc/support
 %endif
@@ -124,6 +123,13 @@
 %endif
 
 %changelog
+* Mon Dec 4 2006 Devrim Gunduz <devrim at CommandPrompt.com>
+- On 64-bit boxes, both 32 and 64 bit -devel packages may be installed. Fix version check
+script
+- Revert tar name patch
+- Macros cannot be used in various parts of the spec file. Revert that commit
+- Spec file cleanup
+
 * Tue Oct 31 2006 Trevor Astrope <astrope at sitesell.com>
 - Fixup tar name and install slon-tools as slon-tools.pm