Tue Aug 28 22:45:00 PDT 2007
- Previous message: [Slony1-commit] slony1-engine/tools release_checklist.sh
- Next message: [Slony1-commit] slony1-engine/redhat postgresql-slony1.init postgresql-slony1.specfile
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Update of /home/cvsd/slony1/slony1-engine In directory main.slony.info:/tmp/cvs-serv418 Modified Files: Tag: REL_1_2_STABLE INSTALL configure configure.ac Added Files: Tag: REL_1_2_STABLE postgresql-slony1.spec.in Removed Files: Tag: REL_1_2_STABLE postgresql-slony1-engine.spec.in Log Message: Remove -engine from spec file name Fix configure and configure.ac accordingly Update docs for the file name change Update release_checklist.sh --- NEW FILE: postgresql-slony1.spec.in --- %{!?docs:%define docs 1} %{?buildrhel3:%define kerbdir /usr/kerberos} %{!?kerbdir:%define kerbdir "/usr"} Summary: A "master to multiple slaves" replication system with cascading and failover Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ Release: 1%{?dist} License: BSD Group: Applications/Databases URL: http://main.slony.info/ Source0: http://main.slony.info/downloads/1.2/source/@PACKAGE_NAME@-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql-devel, postgresql-server, initscripts Requires: postgresql-server %if %docs BuildRequires: docbook-style-dsssl %endif %description Slony-I is a "master to multiple slaves" replication system for PostgreSQL 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 a system for data centers and backup sites, where the normal mode of operation is that all nodes are available %if %docs %package docs Summary: Documentation for Slony-I Group: Applications/Databases Requires: @PACKAGE_NAME at -@PACKAGE_VERSION at -%{release} BuildRequires: libjpeg, netpbm-progs, groff, docbook-style-dsssl, ghostscript %description docs The @PACKAGE_NAME at -docs package includes some documentation for Slony-I. %endif %prep %setup -q -n @PACKAGE_NAME at -%{version} %build #Â Temporary measure for 1.2.10 %if %docs find doc/ -type f -exec chmod 600 {} \; %endif CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS CPPFLAGS="${CPPFLAGS} -I%{_includedir}/et -I%{kerbdir}/include" ; export CPPFLAGS CFLAGS="${CFLAGS} -I%{_includedir}/et -I%{kerbdir}/include" ; export CFLAGS export LIBNAME=%{_lib} %configure --includedir %{_includedir}/pgsql --with-pgconfigdir=%{_bindir} --libdir=%{_libdir} \ --with-perltools=%{_bindir} --with-toolsbin=%{_bindir} \ %if %docs --with-docs --with-docdir=%{_docdir}/%{name}-%{version} \ %endif --datadir %{_datadir}/pgsql --with-pglibdir=%{_libdir}/pgsql make %{?_smp_mflags} make %{?_smp_mflags} -C tools %install 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 /bin/chmod 644 COPYRIGHT UPGRADING SAMPLE HISTORY-1.1 RELEASE install -d %{buildroot}%{_initrddir} install -m 755 redhat/postgresql-slony1.init %{buildroot}%{_initrddir}/postgresql-slony1 #Â Temporary measure for 1.2.10 %if %docs rm -f doc/implementation/.cvsignore rm -f doc/concept/.cvsignore %endif cd tools 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 %{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}%{_bindir}/slon-tools.pm /bin/rm -f %{buildroot}%{_bindir}/slon-tools /bin/rm -f %{buildroot}%{_bindir}/pgsql/slon-tools /bin/rm -f %{buildroot}%{_bindir}/old-apache-rotatelogs.patch %clean rm -rf %{buildroot} %post chkconfig --add @PACKAGE_NAME@ %preun if [ $1 = 0 ] ; then /sbin/service @PACKAGE_NAME@ condstop >/dev/null 2>&1 chkconfig --del @PACKAGE_NAME@ fi %postun if [ $1 -ge 1 ]; then /sbin/service @PACKAGE_NAME@ condrestart >/dev/null 2>&1 fi %files %defattr(-,root,root,-) %attr(644,root,root) %doc COPYRIGHT UPGRADING HISTORY-1.1 INSTALL SAMPLE RELEASE %{_bindir}/* %{_libdir}/pgsql/slony1_funcs.so %{_libdir}/pgsql/xxid.so %{_datadir}/pgsql/*.sql %config(noreplace) %{_sysconfdir}/slon.conf %{_libdir}/pgsql/slon-tools.pm %config(noreplace) %{_sysconfdir}/slon_tools.conf %attr(755,root,root) %{_sysconfdir}/rc.d/init.d/@PACKAGE_NAME@ %if %docs %files docs %attr(644,root,root) %doc doc/adminguide doc/concept doc/howto doc/implementation doc/support %endif %changelog * Wed Aug 29 2007 Devrim Gunduz <devrim at CommandPrompt.com> 1.2.11-1 - Update to 1.2.11 - Remove the word "engine" from init script name. * Mon Aug 6 2007 Devrim Gunduz <devrim at CommandPrompt.com> 1.2.10-2 - Fix Source0 - Spec file cleanup (removed macro for perltools) - Added initscripts as BR. - Fix doc package installation path (and ownership issue) * Wed Jun 13 2007 Devrim Gunduz <devrim at CommandPrompt.com> 1.2.10-1 - Update to 1.2.10 * Mon Jun 11 2007 Devrim Gunduz <devrim at CommandPrompt.com> 1.2.9-3 - Add BuildRequires for docs subpackage, per #199154 (Thanks Ruben). * Sun Jun 3 2007 Devrim Gunduz <devrim at CommandPrompt.com> 1.2.9-2 - Some more fixes for Fedora review. - Remove executable bits from docs. * Thu May 17 2007 Devrim Gunduz <devrim at CommandPrompt.com> - Install init script with rpm. - Fix --with-pgconfigdir parameter. - Fix rpm build problem when the system has pg_config in both under /usr/local/pgsql/bin and /usr/bin * Wed Mar 22 2007 Christopher Browne <cbbrowne at ca.afilias.info> - Added more recent release notes * Wed Mar 7 2007 Christopher Browne <cbbrowne at ca.afilias.info> - Added more recent release notes * Thu Jan 4 2007 Devrim Gunduz <devrim at CommandPrompt.com> - Add docs package (It should be added before but...) * Wed Nov 8 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 * Mon Jul 17 2006 Devrim Gunduz <devrim at CommandPrompt.com> postgresql-slony1-engine - Updated spec and cleaned up rpmlint errors and warnings * Wed Dec 21 2005 Devrim Gunduz <devrim at commandprompt.com> postgresql-slony1-engine - Added a buildrhel3 macro to fix RHEL 3 RPM builds - Added a kerbdir macro * Wed Dec 14 2005 Devrim Gunduz <devrim at commandprompt.com> postgresql-slony1-engine - Fixed the spec file so that during upgrade, conf files will not be replaced, and a .rpmnew will be created. * Thu Nov 24 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine - Created bindir * Wed Oct 26 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine - Modify CPPFLAGS and CFLAGS to fix builds on RHEL -- Per Philip Yarra * Tue Oct 18 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine - Created a new package : -docs and moved all the docs there. * Tue Oct 18 2005 Devrim Gunduz <devrim at PostgreSQL.org> postgresql-slony1-engine - Fixed the problem in http://gborg.postgresql.org/pipermail/slony1-general/2005-October/003105.html * 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 --- postgresql-slony1-engine.spec.in DELETED --- Index: configure.ac =================================================================== RCS file: /home/cvsd/slony1/slony1-engine/configure.ac,v retrieving revision 1.57.2.3 retrieving revision 1.57.2.4 diff -C2 -d -r1.57.2.3 -r1.57.2.4 *** configure.ac 2 May 2007 21:37:06 -0000 1.57.2.3 --- configure.ac 29 Aug 2007 05:44:58 -0000 1.57.2.4 *************** *** 16,20 **** -e 's/\ //g' -e s/\:/`date +HEAD_%Y%m%d`/ | tr -d '\n'])) ! AC_INIT(postgresql-slony1-engine,[SLONREL_VERSION]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_AUX_DIR(config) --- 16,20 ---- -e 's/\ //g' -e s/\:/`date +HEAD_%Y%m%d`/ | tr -d '\n'])) ! AC_INIT(postgresql-slony1,[SLONREL_VERSION]) AC_CONFIG_HEADERS(config.h) AC_CONFIG_AUX_DIR(config) *************** *** 244,248 **** AC_OUTPUT([ ! postgresql-slony1-engine.spec Makefile.port:makefiles/Makefile.${template} ]) --- 244,248 ---- AC_OUTPUT([ ! postgresql-slony1.spec Makefile.port:makefiles/Makefile.${template} ]) Index: configure =================================================================== RCS file: /home/cvsd/slony1/slony1-engine/configure,v retrieving revision 1.70.2.6 retrieving revision 1.70.2.7 diff -C2 -d -r1.70.2.6 -r1.70.2.7 *** configure 5 Jun 2007 16:14:54 -0000 1.70.2.6 --- configure 29 Aug 2007 05:44:57 -0000 1.70.2.7 *************** *** 1,5 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.61 for postgresql-slony1-engine HEAD_20070509. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, --- 1,5 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.61 for postgresql-slony1 HEAD_20070509. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, *************** *** 571,578 **** # Identity of this package. ! PACKAGE_NAME='postgresql-slony1-engine' ! PACKAGE_TARNAME='postgresql-slony1-engine' PACKAGE_VERSION='HEAD_20070509' ! PACKAGE_STRING='postgresql-slony1-engine HEAD_20070509' PACKAGE_BUGREPORT='' --- 571,578 ---- # Identity of this package. ! PACKAGE_NAME='postgresql-slony1' ! PACKAGE_TARNAME='postgresql-slony1' PACKAGE_VERSION='HEAD_20070509' ! PACKAGE_STRING='postgresql-slony1 HEAD_20070509' PACKAGE_BUGREPORT='' *************** *** 1237,1241 **** # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF ! \`configure' configures postgresql-slony1-engine HEAD_20070509 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... --- 1237,1241 ---- # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF ! \`configure' configures postgresql-slony1 HEAD_20070509 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... *************** *** 1285,1289 **** --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] ! --docdir=DIR documentation root [DATAROOTDIR/doc/postgresql-slony1-engine] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --- 1285,1289 ---- --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] ! --docdir=DIR documentation root [DATAROOTDIR/doc/postgresql-slony1] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] *************** *** 1302,1306 **** if test -n "$ac_init_help"; then case $ac_init_help in ! short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20070509:";; esac cat <<\_ACEOF --- 1302,1306 ---- if test -n "$ac_init_help"; then case $ac_init_help in ! short | recursive ) echo "Configuration of postgresql-slony1 HEAD_20070509:";; esac cat <<\_ACEOF *************** *** 1407,1411 **** if $ac_init_version; then cat <<\_ACEOF ! postgresql-slony1-engine configure HEAD_20070509 generated by GNU Autoconf 2.61 --- 1407,1411 ---- if $ac_init_version; then cat <<\_ACEOF ! postgresql-slony1 configure HEAD_20070509 generated by GNU Autoconf 2.61 *************** *** 1421,1425 **** running configure, to aid debugging if configure makes a mistake. ! It was created by postgresql-slony1-engine $as_me HEAD_20070509, which was generated by GNU Autoconf 2.61. Invocation command line was --- 1421,1425 ---- running configure, to aid debugging if configure makes a mistake. ! It was created by postgresql-slony1 $as_me HEAD_20070509, which was generated by GNU Autoconf 2.61. Invocation command line was *************** *** 10741,10745 **** ! ac_config_files="$ac_config_files postgresql-slony1-engine.spec Makefile.port:makefiles/Makefile.${template}" cat >confcache <<\_ACEOF --- 10741,10745 ---- ! ac_config_files="$ac_config_files postgresql-slony1.spec Makefile.port:makefiles/Makefile.${template}" cat >confcache <<\_ACEOF *************** *** 11139,11143 **** # values after options handling. ac_log=" ! This file was extended by postgresql-slony1-engine $as_me HEAD_20070509, which was generated by GNU Autoconf 2.61. Invocation command line was --- 11139,11143 ---- # values after options handling. ac_log=" ! This file was extended by postgresql-slony1 $as_me HEAD_20070509, which was generated by GNU Autoconf 2.61. Invocation command line was *************** *** 11188,11192 **** cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ ! postgresql-slony1-engine config.status HEAD_20070509 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" --- 11188,11192 ---- cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ ! postgresql-slony1 config.status HEAD_20070509 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" *************** *** 11298,11302 **** "Makefile.global") CONFIG_FILES="$CONFIG_FILES Makefile.global" ;; "GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;; ! "postgresql-slony1-engine.spec") CONFIG_FILES="$CONFIG_FILES postgresql-slony1-engine.spec" ;; "Makefile.port") CONFIG_FILES="$CONFIG_FILES Makefile.port:makefiles/Makefile.${template}" ;; --- 11298,11302 ---- "Makefile.global") CONFIG_FILES="$CONFIG_FILES Makefile.global" ;; "GNUmakefile") CONFIG_FILES="$CONFIG_FILES GNUmakefile" ;; ! "postgresql-slony1.spec") CONFIG_FILES="$CONFIG_FILES postgresql-slony1.spec" ;; "Makefile.port") CONFIG_FILES="$CONFIG_FILES Makefile.port:makefiles/Makefile.${template}" ;; Index: INSTALL =================================================================== RCS file: /home/cvsd/slony1/slony1-engine/INSTALL,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -C2 -d -r1.12.2.1 -r1.12.2.2 *** INSTALL 11 Jun 2007 17:59:37 -0000 1.12.2.1 --- INSTALL 29 Aug 2007 05:44:57 -0000 1.12.2.2 *************** *** 148,152 **** authentication draws in a dependancy on Kerberos that isn't automatically detected. You may need to add an -I path for ! /usr/kerberos/include; see postgresql-slony1-engine.spec for more details. --- 148,152 ---- authentication draws in a dependancy on Kerberos that isn't automatically detected. You may need to add an -I path for ! /usr/kerberos/include; see postgresql-slony1.spec for more details.
- Previous message: [Slony1-commit] slony1-engine/tools release_checklist.sh
- Next message: [Slony1-commit] slony1-engine/redhat postgresql-slony1.init postgresql-slony1.specfile
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list