rpms/postgresql-pgpool/FC-6 pgpool-Makefile.am.patch, NONE, 1.1 pgpool-Makefile.in.patch, NONE, 1.1 postgresql-pgpool.spec, 1.5, 1.6

[Devrim GÜNDÜZ (devrim)]

Author: devrim

Update of /cvs/extras/rpms/postgresql-pgpool/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3868/FC-6

Modified Files:
	postgresql-pgpool.spec 
Added Files:
	pgpool-Makefile.am.patch pgpool-Makefile.in.patch 
Log Message:
- Update to 3.3
- Added temporary patches from upstream, will be removed in next
release.



pgpool-Makefile.am.patch:

--- NEW FILE pgpool-Makefile.am.patch ---
--- /usr/src/redhat/SOURCES/pgpool-3.3/Makefile.am	2007-05-17 07:48:32.000000000 +0300
+++ Makefile.am	2007-05-21 10:25:40.000000000 +0300
@@ -13,7 +13,7 @@
 
 sysconf_DATA = pgpool.conf.sample pool_hba.conf.sample
 
-data_DATA = pgpool.pam
+pkgdata_DATA = pgpool.pam
 
 AM_CPPFLAGS = -Wall -Wmissing-prototypes -Wmissing-declarations -D_GNU_SOURCE
 

pgpool-Makefile.in.patch:

--- NEW FILE pgpool-Makefile.in.patch ---
--- /usr/src/redhat/SOURCES/pgpool-3.3/Makefile.in	2007-05-17 07:48:33.000000000 +0300
+++ Makefile.in	2007-05-21 10:25:40.000000000 +0300
@@ -52,7 +52,7 @@
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man8dir)" \
-	"$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)"
+	"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(sysconfdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_pgpool_OBJECTS = main.$(OBJEXT) child.$(OBJEXT) pool_auth.$(OBJEXT) \
@@ -83,9 +83,9 @@
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-dataDATA_INSTALL = $(INSTALL_DATA)
+pkgdataDATA_INSTALL = $(INSTALL_DATA)
 sysconfDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(data_DATA) $(sysconf_DATA)
+DATA = $(pkgdata_DATA) $(sysconf_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -192,7 +192,7 @@
 	pool_type.h pool_ip.h pool_ip.c pool_hba.conf.sample pgpool.pam
 
 sysconf_DATA = pgpool.conf.sample pool_hba.conf.sample
-data_DATA = pgpool.pam
+pkgdata_DATA = pgpool.pam
 AM_CPPFLAGS = -Wall -Wmissing-prototypes -Wmissing-declarations -D_GNU_SOURCE
 man_MANS = pgpool.8
 CLEANFILES = pgpool.8
@@ -366,22 +366,22 @@
 	  echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \
 	  rm -f "$(DESTDIR)$(man8dir)/$$inst"; \
 	done
-install-dataDATA: $(data_DATA)
+install-pkgdataDATA: $(pkgdata_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
-	@list='$(data_DATA)'; for p in $$list; do \
+	test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+	@list='$(pkgdata_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
-	  $(dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
+	  echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+	  $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	done
 
-uninstall-dataDATA:
+uninstall-pkgdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(data_DATA)'; for p in $$list; do \
+	@list='$(pkgdata_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(datadir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	done
 install-sysconfDATA: $(sysconf_DATA)
 	@$(NORMAL_INSTALL)
@@ -579,7 +579,7 @@
 check: check-am
 all-am: Makefile $(PROGRAMS) $(MANS) $(DATA) config.h
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(sysconfdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(sysconfdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -629,7 +629,7 @@
 
 info-am:
 
-install-data-am: install-dataDATA install-man
+install-data-am: install-man install-pkgdataDATA
 
 install-exec-am: install-binPROGRAMS install-sysconfDATA
 
@@ -658,8 +658,8 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA \
-	uninstall-info-am uninstall-man uninstall-sysconfDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
+	uninstall-pkgdataDATA uninstall-sysconfDATA
 
 uninstall-man: uninstall-man8
 
@@ -669,15 +669,15 @@
 	distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am \
-	install-dataDATA install-exec install-exec-am install-info \
-	install-info-am install-man install-man8 install-strip \
+	install-binPROGRAMS install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-man8 install-pkgdataDATA install-strip \
 	install-sysconfDATA installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-dataDATA uninstall-info-am uninstall-man \
-	uninstall-man8 uninstall-sysconfDATA
+	uninstall-info-am uninstall-man uninstall-man8 \
+	uninstall-pkgdataDATA uninstall-sysconfDATA
 
 
 pgpool.8: pgpool.8.in


Index: postgresql-pgpool.spec
===================================================================
RCS file: /cvs/extras/rpms/postgresql-pgpool/FC-6/postgresql-pgpool.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- postgresql-pgpool.spec	21 May 2007 07:09:19 -0000	1.5
+++ postgresql-pgpool.spec	21 May 2007 07:32:46 -0000	1.6
@@ -10,6 +10,9 @@
 Source0:	http://pgfoundry.org/frs/download.php/1374/%{short_name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1:		pgpool-Makefile.in.patch
+Patch2:		pgpool-Makefile.am.patch
+
 %description
 pgpool is a connection pooling/replication server for PostgreSQL.
 pgpool runs between PostgreSQL's clients(front ends) and servers
@@ -18,11 +21,14 @@
 
 %prep
 %setup -q -n %{short_name}-%{version}
+%patch1 -p0
+%patch2 -p0
+
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS
 CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS
 
-%configure
+%configure --with-pam
 
 make %{?smp_flags}
 
@@ -41,6 +47,7 @@
 %files
 %defattr(-,root,root,-)
 %doc README README.euc_jp TODO COPYING INSTALL AUTHORS ChangeLog NEWS pgpool.conf.sample pool_hba.conf.sample
+%{_datadir}/pgpool/pgpool.pam
 %{_bindir}/pgpool
 %{_mandir}/man8/*
 
@@ -48,6 +55,8 @@
 %changelog
 * Mon May 21 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 3.3-1
 - Update to 3.3
+- Added temporary patches from upstream, will be removed in next
+release.
 
 * Mon Feb 12 2007 - Devrim GUNDUZ <devrim at commandprompt.com> 3.2-1
 - Update to 3.2