Home CVS Mailinglists Documentation Download
[Slony1-general] Patch for RPM builds
Devrim GUNDUZ devrim
Wed May 4 13:02:19 PDT 2005 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


Hi,

Attached is a patch for RPM builds:

- - We have a new spec, which is heavily improved.
- - I've patched some makefiles so that make rpm will work. It was broken 
for some time.

The patch is against current CVS HEAD.

Regards, 
- --
Devrim GUNDUZ 
devrim~gunduz.org, devrim~PostgreSQL.org, devrim.gunduz~linux.org.tr
http://www.tdmsoft.com.tr                      http://www.gunduz.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQFCeLnDtl86P3SPfQ4RAo1WAJ9OVcl57wkefliQ5XY9soDOzPhxDACeJACi
+W7by3MthWcUQhKdTJWenw8=
=GN4s
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: GNUmakefile.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/GNUmakefile.in,v
retrieving revision 1.17
diff -c -r1.17 GNUmakefile.in
*** GNUmakefile.in	12 Apr 2005 20:29:27 -0000	1.17
--- GNUmakefile.in	4 May 2005 11:59:14 -0000
***************
*** 23,28 ****
--- 23,31 ----
    @PACKAGE_NAME at .spec \
    @PACKAGE_NAME at .spec.in \
    $(wildcard config/*) \
+   $(wildcard src/*) \
+   $(wildcard doc/*) \
+   $(wildcard share/*) \
    $(wildcard makefiles/*)
  
  
***************
*** 33,39 ****
  	echo "All of Slony-I is successfully made. Ready to install"
  
  install	installdirs:
! 	@for subdir in src share tools doc ; do \
  	  $(MAKE) -C $$subdir $@ || exit; \
      done && \
  	echo "All of Slony-I is successfully installed"
--- 36,42 ----
  	echo "All of Slony-I is successfully made. Ready to install"
  
  install	installdirs:
! 	@for subdir in src tools doc ; do \
  	  $(MAKE) -C $$subdir $@ || exit; \
      done && \
  	echo "All of Slony-I is successfully installed"
***************
*** 64,73 ****
  	-rm -rf $(distdir)
  	mkdir $(distdir)
  	mkdir $(distdir)/config
  	mkdir $(distdir)/makefiles
  	-chmod -R 777 $(distdir)
  	for file in $(DISTFILES) ; do \
!       cp $$file $(distdir)/$$file ; \
      done
  	for subdir in src doc tools ; do \
  	  $(MAKE) -C $$subdir distdir ; \
--- 67,79 ----
  	-rm -rf $(distdir)
  	mkdir $(distdir)
  	mkdir $(distdir)/config
+ 	mkdir $(distdir)/src
+ 	mkdir $(distdir)/doc
+ 	mkdir $(distdir)/share
  	mkdir $(distdir)/makefiles
  	-chmod -R 777 $(distdir)
  	for file in $(DISTFILES) ; do \
!       cp -r $$file $(distdir)/$$file ; \
      done
  	for subdir in src doc tools ; do \
  	  $(MAKE) -C $$subdir distdir ; \
Index: postgresql-slony1-engine.spec.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/postgresql-slony1-engine.spec.in,v
retrieving revision 1.8
diff -c -r1.8 postgresql-slony1-engine.spec.in
*** postgresql-slony1-engine.spec.in	3 Aug 2004 01:39:02 -0000	1.8
--- postgresql-slony1-engine.spec.in	4 May 2005 11:59:14 -0000
***************
*** 1,14 ****
  Summary: A "master to multiple slaves" replication system with cascading and failover.
  Name: @PACKAGE_NAME@
  Version: @PACKAGE_VERSION@
! Release: 1
  License: Berkeley/BSD
  Group: Applications/Databases
  URL: http://slony.info/
  Source0: @PACKAGE_NAME at -%{version}.tar.gz
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  BuildRequires: postgresql-devel
! Requires: postgresql
  
  %description
  Slony-I will be a "master to multiple slaves" replication 
--- 1,19 ----
+ %{!?perltools:%define perltools 1}
+ 
  Summary: A "master to multiple slaves" replication system with cascading and failover.
  Name: @PACKAGE_NAME@
  Version: @PACKAGE_VERSION@
! Release: beta1
  License: Berkeley/BSD
  Group: Applications/Databases
  URL: http://slony.info/
+ Packager: Devrim Gunduz <devrim at PostgreSQL.org>
  Source0: @PACKAGE_NAME at -%{version}.tar.gz
  BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
  BuildRequires: postgresql-devel
! Requires:       postgresql-server
! 
! %define prefix /usr
  
  %description
  Slony-I will be a "master to multiple slaves" replication 
***************
*** 25,52 ****
  
  %prep
  %setup -q -n @PACKAGE_NAME at -%{version}
- ./configure --with-pgbindir=/usr/bin --with-pglibdir=/usr/lib/pgsql --with-pgincludedir=/usr/include/pgsql --with-pgsharedir=/usr/share/pgsql
  
  %build
! make CFLAGS="-I /usr/kerberos/include"
  
  %install
  rm -rf $RPM_BUILD_ROOT
! make install DESTDIR=$RPM_BUILD_ROOT
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
  %files
  %defattr(-,root,root,-)
! %doc COPYRIGHT
! /usr/bin/slon
! /usr/bin/slonik
! /usr/lib/pgsql/slony1_funcs.so
! /usr/lib/pgsql/xxid.so
! /usr/share/pgsql/*.sql
! 
  
  %changelog
  * Thu Mar 18 2004 Daniel Berrange <berrange at redhat.com> postgresql-slony1-engine
  - Initial RPM packaging
--- 30,113 ----
  
  %prep
  %setup -q -n @PACKAGE_NAME at -%{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 --bindir /usr/bin --libdir %{_libdir}/pgsql \
!         --includedir %{_includedir}/pgsql \
! %if %perltools
!         --with-perltools \
! %endif
!         --datadir %{_datadir}/pgsql --sysconfdir=/etc
! make
! %if %perltools
!  cd tools
!  make
! %endif
  
  %install
  rm -rf $RPM_BUILD_ROOT
! mkdir -p $RPM_BUILD_ROOT/etc
! mkdir -p $RPM_BUILD_ROOT%{_datadir}/pgsql
! mkdir -p $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/etc/slon.conf-sample
! 
! %if %perltools
! install -m 0755 tools/altperl/slon_tools.conf-sample $RPM_BUILD_ROOT/etc/slon_tools.conf-sample
! install -m 0755 tools/altperl/slon-tools.pm  $RPM_BUILD_ROOT/%{_datadir}/pgsql/
! /bin/rm -rf tools/altperl/*.pl tools/altperl/ToDo tools/altperl/README tools/altperl/Makefile tools/altperl/CVS
! install -m 0755 tools/altperl/* $RPM_BUILD_ROOT/%{_bindir}/
! %endif
  
  %clean
  rm -rf $RPM_BUILD_ROOT
  
+ %post
+ echo "Slony1 has been successfully installed. Before running slony,"
+ echo "be sure to edit /etc/slony.conf-sample and rename it to"
+ echo "/etc/slony.conf"
+ 
  %files
  %defattr(-,root,root,-)
! %doc COPYRIGHT doc/adminguide  doc/concept  doc/howto  doc/implementation  doc/support
! %{_bindir}/*
! %{_libdir}/pgsql/slony1_funcs.so
! %{_libdir}/pgsql/xxid.so
! %{_datadir}/pgsql/*.sql
! %{_sysconfdir}/slon.conf-sample
! %if %perltools
!  %{_datadir}/pgsql/slon-tools.pm
!  %{_sysconfdir}/slon_tools.conf-sample
! %endif
  
  %changelog
+ * 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
+ 
Index: doc/adminguide/Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/Makefile,v
retrieving revision 1.11
diff -c -r1.11 Makefile
*** doc/adminguide/Makefile	12 Apr 2005 20:29:28 -0000	1.11
--- doc/adminguide/Makefile	4 May 2005 11:59:15 -0000
***************
*** 261,263 ****
--- 261,264 ----
  	echo "<!entity version \"$(VERSION)\">"; \
  	echo "<!entity majorversion \"`expr $(VERSION) : '\([0-9][0-9]*\.[0-9][0-9]*\)'`\">"; \
  	} >$@
+ distdir: all
Index: tools/Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/Makefile,v
retrieving revision 1.4
diff -c -r1.4 Makefile
*** tools/Makefile	12 Apr 2005 20:29:28 -0000	1.4
--- tools/Makefile	4 May 2005 11:59:15 -0000
***************
*** 25,31 ****
  	mkdir $(distdir)/$(subdir)
  	-chmod 777 $(distdir)/$(subdir)
  	for file in $(DISTFILES) ; do \
! 		cp $$file $(distdir)/$(subdir)/$$file ; \
  	done
  	for subdir in $(SUBDIRS) ; do \
  		$(MAKE) -C $$subdir distdir ; \
--- 25,31 ----
  	mkdir $(distdir)/$(subdir)
  	-chmod 777 $(distdir)/$(subdir)
  	for file in $(DISTFILES) ; do \
! 		cp -r $$file $(distdir)/$(subdir)/$$file ; \
  	done
  	for subdir in $(SUBDIRS) ; do \
  		$(MAKE) -C $$subdir distdir ; \
More information about the Slony1-general mailing list

Content © 2007 Slony Development Group - Hosting provided by Command Prompt, Inc.