Log Message:
-----------


Reverted back the latest commit to GNUMakefile.in and applied the best solution to prevent errors during make rpm.

The solution is renaming the second spec file under redhat/ which collides with the original spec file.

Modified Files:
--------------
    slony1-engine:
        GNUmakefile.in (r1.26 -> r1.27)

Added Files:
-----------
    slony1-engine/redhat:
        slony-I.specfile (r1.1)

Removed Files:
-------------
    slony1-engine/redhat:
        slony-I.spec

-------------- next part --------------
Index: GNUmakefile.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/GNUmakefile.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -LGNUmakefile.in -LGNUmakefile.in -u -w -r1.26 -r1.27
--- GNUmakefile.in
+++ GNUmakefile.in
@@ -94,8 +94,7 @@
 	-rm -rf $(distdir)
 
 rpm: dist
-	mv @PACKAGE_NAME at -@PACKAGE_VERSION at .tar.gz /usr/src/redhat/SOURCES
-	mv @PACKAGE_NAME at .spec /usr/src/redhat/SPECS
-	rpmbuild -ba /usr/src/redhat/SPECS/@PACKAGE_NAME at .spec
+
+	rpmbuild -ta @PACKAGE_NAME at -@PACKAGE_VERSION at .tar.gz
 
 .PHONY: install
--- redhat/slony-I.spec
+++ /dev/null
@@ -1,152 +0,0 @@
-%{!?perltools:%define perltools 1}
-%{!?docs:%define docs 0}
-%define pg_version   %(rpm -q --queryformat '%{VERSION}' postgresql-devel)
-
-Summary:	A "master to multiple slaves" replication system with cascading and failover.
-Name:		slony1
-Version:	1.1.1
-Release:	1_PG%{pg_version}
-License:	Berkeley/BSD
-Group:		Applications/Databases
-URL:		http://slony.info/
-Packager:	Devrim Gunduz <devrim at PostgreSQL.org>
-Source0:	slony1-%{version}.tar.bz2
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	postgresql-devel
-Requires:	postgresql-server = %{pg_version}
-
-%if %docs
-BuildRequires:	docbook-style-dsssl
-%endif
-
-%define prefix /usr
-
-%description
-Slony-I will be a "master to multiple slaves" replication 
-system with cascading and failover.
-
-The big picture for the development of Slony-I is to build 
-a master-slave system that includes all features and 
-capabilities needed to replicate large databases to a 
-reasonably limited number of slave systems.
-
-Slony-I is planned as a system for data centers and backup 
-sites, where the normal mode of operation is that all nodes 
-are available
-
-%prep
-%setup -q -n slony1-%{version}
-
-%build
-CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
-CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
-CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et" ; export CPPFLAGS
-CFLAGS="${CFLAGS} -I%{_includedir}/et" ; export CFLAGS
-
-# Strip out -ffast-math from CFLAGS....
-
-CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
-export LIBNAME=%{_lib}
-./configure --includedir %{_includedir}/pgsql \
-%if %perltools
-        --with-perltools=%{_bindir} \
-%endif
-%if %docs
-        --with-docs --with-docdir=/usr/share/doc \
-%endif
-        --datadir %{_datadir}/pgsql --sysconfdir=/etc --with-pglibdir=%{_libdir}/pgsql 
-
-autoconf
-
-make
-%if %perltools
- cd tools
- make
-%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 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 0755 src/backend/*.sql $RPM_BUILD_ROOT%{_datadir}/pgsql/
-install -m 0755 src/xxid/*.sql $RPM_BUILD_ROOT%{_datadir}/pgsql/
-install -m 0755 tools/*.sh  $RPM_BUILD_ROOT%{_bindir}/
-install -m 0755 share/slon.conf-sample $RPM_BUILD_ROOT%{_sysconfdir}/slon.conf
-
-%if %perltools
-cd tools
-make DESTDIR=$RPM_BUILD_ROOT install
-/bin/rm -rf altperl/*.pl altperl/ToDo altperl/README altperl/Makefile altperl/CVS
-install -m 0755 altperl/slon_tools.conf-sample  $RPM_BUILD_ROOT%{_sysconfdir}/slon_tools.conf
-install -m 0755 altperl/* $RPM_BUILD_ROOT%{_bindir}/
-install -m 0755 altperl/slon-tools.pm  $RPM_BUILD_ROOT%{_libdir}/pgsql/
-/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}/slon-tools.pm
-/bin/rm -f $RPM_BUILD_ROOT%{_bindir}/slon-tools.pm
-%endif
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root,-)
-%if %docs
-%doc COPYRIGHT UPGRADING HISTORY-1.1 INSTALL SAMPLE doc/adminguide  doc/concept  doc/howto  doc/implementation  doc/support
-%endif
-%{_bindir}/*
-%{_libdir}/pgsql/slony1_funcs.so
-%{_libdir}/pgsql/xxid.so
-%{_datadir}/pgsql/*.sql
-%{_sysconfdir}/slon.conf
-%if %perltools
-%{_libdir}/pgsql/slon-tools.pm
-%{_sysconfdir}/slon_tools.conf
-%endif
-
-%changelog
-* Sat Oct 01 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
-- Upgrade to 1.1.1
-
-* Tue Jul 12 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
-- Added a line to check postgresql RPM version and tag SlonyI RPM with it.
-
-- Updated Requires files so that it checks correct PostgreSQL version
-- Moved autoconf line into correct place.
-
-* Thu Jun 08 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
-- Added UPGRADING, HISTORY-1.1, INSTALL, SAMPLE among installed files, reflecting the change in GNUMakefile.in
-
-* Thu Jun 02 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
-- Apply a new %docs macro and disable building of docs by default.
-- Remove slon-tools.conf-sample from bindir.
-- Removed --bindir and --libdir, since they are not needed.
-
-* Mon Apr 10 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
-- More fixes on RPM builds
-
-* Thu Apr 07 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
-- More fixes on RPM builds
-
-* Tue Apr 04 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
-- Fix RPM build errors, regarding to tools/ .
-
-* Thu Apr 02 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
-- Added docs to installed files list.
-- Added perltools, so that tools/altperl may be compiled.
-- Updated the spec file
-
-* Thu Mar 17 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
-- Update to 1.1.0beta1
-- Remove PostgreSQL source dependency
-
-* Thu Mar 17 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
-- Fix RPM builds
-
-* Thu Mar 18 2004 Daniel Berrange <berrange at redhat.com> postgresql-slony1-engine
-- Initial RPM packaging
-
--- /dev/null
+++ redhat/slony-I.specfile
@@ -0,0 +1,152 @@
+%{!?perltools:%define perltools 1}
+%{!?docs:%define docs 0}
+%define pg_version   %(rpm -q --queryformat '%{VERSION}' postgresql-devel)
+
+Summary:	A "master to multiple slaves" replication system with cascading and failover.
+Name:		slony1
+Version:	1.1.1
+Release:	1_PG%{pg_version}
+License:	Berkeley/BSD
+Group:		Applications/Databases
+URL:		http://slony.info/
+Packager:	Devrim Gunduz <devrim at PostgreSQL.org>
+Source0:	slony1-%{version}.tar.bz2
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+BuildRequires:	postgresql-devel
+Requires:	postgresql-server = %{pg_version}
+
+%if %docs
+BuildRequires:	docbook-style-dsssl
+%endif
+
+%define prefix /usr
+
+%description
+Slony-I will be a "master to multiple slaves" replication 
+system with cascading and failover.
+
+The big picture for the development of Slony-I is to build 
+a master-slave system that includes all features and 
+capabilities needed to replicate large databases to a 
+reasonably limited number of slave systems.
+
+Slony-I is planned as a system for data centers and backup 
+sites, where the normal mode of operation is that all nodes 
+are available
+
+%prep
+%setup -q -n slony1-%{version}
+
+%build
+CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
+CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
+CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et" ; export CPPFLAGS
+CFLAGS="${CFLAGS} -I%{_includedir}/et" ; export CFLAGS
+
+# Strip out -ffast-math from CFLAGS....
+
+CFLAGS=`echo $CFLAGS|xargs -n 1|grep -v ffast-math|xargs -n 100`
+export LIBNAME=%{_lib}
+./configure --includedir %{_includedir}/pgsql \
+%if %perltools
+        --with-perltools=%{_bindir} \
+%endif
+%if %docs
+        --with-docs --with-docdir=/usr/share/doc \
+%endif
+        --datadir %{_datadir}/pgsql --sysconfdir=/etc --with-pglibdir=%{_libdir}/pgsql 
+
+autoconf
+
+make
+%if %perltools
+ cd tools
+ make
+%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 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 0755 src/backend/*.sql $RPM_BUILD_ROOT%{_datadir}/pgsql/
+install -m 0755 src/xxid/*.sql $RPM_BUILD_ROOT%{_datadir}/pgsql/
+install -m 0755 tools/*.sh  $RPM_BUILD_ROOT%{_bindir}/
+install -m 0755 share/slon.conf-sample $RPM_BUILD_ROOT%{_sysconfdir}/slon.conf
+
+%if %perltools
+cd tools
+make DESTDIR=$RPM_BUILD_ROOT install
+/bin/rm -rf altperl/*.pl altperl/ToDo altperl/README altperl/Makefile altperl/CVS
+install -m 0755 altperl/slon_tools.conf-sample  $RPM_BUILD_ROOT%{_sysconfdir}/slon_tools.conf
+install -m 0755 altperl/* $RPM_BUILD_ROOT%{_bindir}/
+install -m 0755 altperl/slon-tools.pm  $RPM_BUILD_ROOT%{_libdir}/pgsql/
+/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}/slon-tools.pm
+/bin/rm -f $RPM_BUILD_ROOT%{_bindir}/slon-tools.pm
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%if %docs
+%doc COPYRIGHT UPGRADING HISTORY-1.1 INSTALL SAMPLE doc/adminguide  doc/concept  doc/howto  doc/implementation  doc/support
+%endif
+%{_bindir}/*
+%{_libdir}/pgsql/slony1_funcs.so
+%{_libdir}/pgsql/xxid.so
+%{_datadir}/pgsql/*.sql
+%{_sysconfdir}/slon.conf
+%if %perltools
+%{_libdir}/pgsql/slon-tools.pm
+%{_sysconfdir}/slon_tools.conf
+%endif
+
+%changelog
+* Sat Oct 01 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+- Upgrade to 1.1.1
+
+* Tue Jul 12 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+- Added a line to check postgresql RPM version and tag SlonyI RPM with it.
+
+- Updated Requires files so that it checks correct PostgreSQL version
+- Moved autoconf line into correct place.
+
+* Thu Jun 08 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+- Added UPGRADING, HISTORY-1.1, INSTALL, SAMPLE among installed files, reflecting the change in GNUMakefile.in
+
+* Thu Jun 02 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+- Apply a new %docs macro and disable building of docs by default.
+- Remove slon-tools.conf-sample from bindir.
+- Removed --bindir and --libdir, since they are not needed.
+
+* Mon Apr 10 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+- More fixes on RPM builds
+
+* Thu Apr 07 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+- More fixes on RPM builds
+
+* Tue Apr 04 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+- Fix RPM build errors, regarding to tools/ .
+
+* Thu Apr 02 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+- Added docs to installed files list.
+- Added perltools, so that tools/altperl may be compiled.
+- Updated the spec file
+
+* Thu Mar 17 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+- Update to 1.1.0beta1
+- Remove PostgreSQL source dependency
+
+* Thu Mar 17 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine
+- Fix RPM builds
+
+* Thu Mar 18 2004 Daniel Berrange <berrange at redhat.com> postgresql-slony1-engine
+- Initial RPM packaging
+