SPECS: postgresql.spec - slony1 removed -- version 1.1 may be buil...

Fri Jul 1 09:26:06 CEST 2005

Author: jajcus                       Date: Fri Jul  1 07:26:06 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- slony1 removed -- version 1.1 may be built separately

---- Files affected:
SPECS:
   postgresql.spec (1.328 -> 1.329) 

---- Diffs:

================================================================
Index: SPECS/postgresql.spec
diff -u SPECS/postgresql.spec:1.328 SPECS/postgresql.spec:1.329

--- SPECS/postgresql.spec:1.328	Sat May 14 02:44:47 2005
+++ SPECS/postgresql.spec	Fri Jul  1 09:26:01 2005
@@ -14,12 +14,8 @@
 %bcond_with	php			# enable PHP support
 %bcond_with	absolute_dbpaths	# enable absolute paths to create database
 					# (disabled by default because it is a security risk)
-%bcond_without	slony1			# disable Slony-I replication system
-
 %define		postgresql_version	8.0.3
-%define		postgresql_release	3
-%define		slony1_version	1.0.5
-%define		slony1_release	1
+%define		postgresql_release	3.1
 
 Summary:	PostgreSQL Data Base Management System
 Summary(de):	PostgreSQL Datenbankverwaltungssystem
@@ -43,11 +39,6 @@
 Source2:	pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5:	5b656ddf1db41965761f85204a14398e
 Source3:	%{name}.sysconfig
-Source4:	http://developer.postgresql.org/~wieck/slony1/download/slony1-%{slony1_version}.tar.gz
-# Source4-md5:	66fcc0f53028101e4e0f969e5f47fe43
-Source5:	slony1.init
-Source6:	slony1.pgpass
-Source7:	slony1.sysconfig
 Source8:	http://www.commandprompt.com/files/plphp-8.x.tar.bz2
 # Source8-md5:	d307e4ab8cb6900a1c290a5dde1bdeee
 Patch0:		%{name}-conf.patch
@@ -731,41 +722,8 @@
 przeszukiwaniu z dostępem poprzez indeksy:
 http://www.sai.msu.su/~megera/postgres/gist/tsearch/V2/
 
-%package -n slony1
-Summary:	Slony-I - a "master to multiple slaves" replication system for PostgreSQL
-Summary(pl):	Slony-I - system replikacji dla PostgreSQL
-Version:	%{slony1_version}
-Release:	%{slony1_release}@%{postgresql_version}_%{postgresql_release}
-URL:		http://slony.info/
-Group:		Applications/Databases
-Requires:	%{name} = %{postgresql_version}-%{postgresql_release}
-Requires:	%{name}-libs = %{postgresql_version}-%{postgresql_release}
-
-%description -n slony1
-Slony-I is a "master to multiple slaves" replication system with
-cascading and failover.
-
-The big picture for the development of Slony-I is 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 a system for data centers and backup sites, where the
-normal mode of operation is that all nodes are available. 
-
-%description -n slony1 -l pl
-Slony-I jest systemem replikacji dla PostgreSQL. Pozwala na replikację
-typu "jeden serwer głowny, wiele serwerów pomocniczych".
-
-Główną zaletą Slony-I jest system "master-slave". Zawiera on wszelką
-funkcjonalność potrzebną do replikowania dużych baz danych na
-określoną ilość serwerów pomocniczych lub zastępczych.
-
-Slony-I jest przeznaczony dla systemów, gdzie normalny tryb pracy
-wymaga aby zarówno serwer główny jak i wszystkie serwery pomocnicze
-były cały czas operacyjne.
-
 %prep
-%setup -q -a4 -a8
+%setup -q -a8
 %patch0 -p1
 %{?with_absolute_dbpaths:%patch1 -p1}
 %patch2 -p1
@@ -823,15 +781,6 @@
 %{?with_tests:%{__make} check}
 %endif
 
-%if %{with slony1}
-cd slony1-%{slony1_version}
-install /usr/share/automake/config.* config
-%configure \
-	--with-pgsourcetree=`pwd`/..
-%{__make}
-cd ..
-%endif
-
 %if %{with php}
 cd src/pl/plphp
 %{__make}
@@ -867,15 +816,6 @@
 %{__make} -C contrib/tsearch2 install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%if %{with slony1}
-%{__make} install -C slony1-%{slony1_version} \
-	DESTDIR=$RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT/home/services/slony1
-install %{SOURCE7} $RPM_BUILD_ROOT/etc/sysconfig/slony1
-install %{SOURCE6} $RPM_BUILD_ROOT/home/services/slony1/.pgpass
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/slony1
-%endif
-
 %if %{with php}
 cd src/pl/plphp
 %{__make} install \
@@ -973,28 +913,6 @@
 %post	ecpg -p /sbin/ldconfig
 %postun	ecpg -p /sbin/ldconfig
 
-%pre -n slony1
-%groupadd -P slony1 -g 131 -r slony1
-%useradd -P slony1 -M -o -r -u 131 -d /home/services/slony1 -s /bin/sh -g slony1 -c "Slony-I Replicator" slony1
-
-
-%post -n slony1
-/sbin/chkconfig --add slony1
-if [ -f /var/lock/subsys/slony1 ]; then
-	/etc/rc.d/init.d/slony1 restart >&2 || :
-else
-	echo "Run \"/etc/rc.d/init.d/slony1 start\" to start slony1 replicator."
-fi
-
-%preun -n slony1
-if [ "$1" = "0" ]; then
-	# FIXME: no slony1 user removal?
-	if [ -f /var/lock/subsys/slony1 ]; then
-		/etc/rc.d/init.d/slony1 stop
-	fi
-	/sbin/chkconfig --del slony1
-fi
-
 %files -f main.lang
 %defattr(644,root,root,755)
 %doc COPYRIGHT README HISTORY doc/{FAQ*,README*,bug.template}
@@ -1165,26 +1083,15 @@
 %{_pgsqldir}/untsearch2.sql
 %{_pgsqldir}/*.stop
 
-%if %{with slony1}
-%files -n slony1
-%defattr(644,root,root,755)
-%doc slony1-%{slony1_version}/doc/howto/*
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/slony1
-%attr(754,root,root) /etc/rc.d/init.d/slony1
-%attr(755,root,root) %{_bindir}/slon
-%attr(755,root,root) %{_bindir}/slonik
-%attr(750,slony1,slony1) %dir /home/services/slony1
-%attr(600,slony1,slony1) /home/services/slony1/.pgpass
-%attr(755,root,root) %{_pgmoduledir}/slony1_funcs.so
-%attr(755,root,root) %{_pgmoduledir}/xxid.so
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.329  2005/07/01 07:26:01  jajcus
+- slony1 removed -- version 1.1 may be built separately
+
 Revision 1.328  2005/05/14 00:44:47  arekm
 - fix libpq; rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/postgresql.spec?r1=1.328&r2=1.329&f=u


