Change configuration for source tarballs and RPMs

diff --git a/Makefile b/Makefile
index ecb704a..c850670 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,16 +23,18 @@ DOCS = export_effective_stats-$(MAJORVERSION).sql.sample \
        export_plain_stats-$(MAJORVERSION).sql.sample
 
 STARBALL = pg_dbms_stats-$(DBMSSTATSVER).tar.gz
-STARBALL92 = pg_dbms_stats92-$(DBMSSTATSVER).tar.gz
+STARBALL94 = pg_dbms_stats94-$(DBMSSTATSVER).tar.gz
 STARBALL93 = pg_dbms_stats93-$(DBMSSTATSVER).tar.gz
-STARBALLS = $(STARBALL) $(STARBALL93) $(STARBALL92)
+STARBALL92 = pg_dbms_stats92-$(DBMSSTATSVER).tar.gz
+STARBALL91 = pg_dbms_stats91-$(DBMSSTATSVER).tar.gz
+STARBALLS = $(STARBALL) $(STARBALL94s) $(STARBALL93) $(STARBALL92) $(STARBALL91)
 
 EXTRA_CLEAN = sql/ut_anyarray-*.sql expected/ut_anyarray-*.out \
        sql/ut_imp_exp-*.sql expected/ut_imp_exp-*.out \
        sql/ut_fdw_init-*.sql expected/ut_fdw_init-*.out \
        pg_dbms_stats--1.0--1.3.2.sql export_plain_stats.sql.sample \
        export_effective_stats.sql.sample \
-       export_stats.dmp ut-fdw.csv $(DATA) $(STARBALLS) RPMS \
+       export_stats.dmp ut-fdw.csv $(DATA) $(STARBALLS) RPMS/*/* \
        *~
 
 ifdef USE_PGXS
@@ -55,14 +57,9 @@ TARSOURCES = Makefile *.c  *.h pg_dbms_stats--*-9.*.sql pg_dbms_stats.control \
        doc/* expected/*.out sql/*.sql input/*.source input/*.csv \
        output/*.source SPECS/*.spec
 
-RPMS93 = RPMS/pg_dbms_stats93-$(DBMSSTATSVER)-1.el6.x86_64.rpm \
-        RPMS/pg_dbms_stats93-debuginfo-$(DBMSSTATSVER)-1.el6.x86_64.rpm 
-RPMS92 = RPMS/pg_dbms_stats92-$(DBMSSTATSVER)-1.el6.x86_64.rpm \
-        RPMS/pg_dbms_stats92-debuginfo-$(DBMSSTATSVER)-1.el6.x86_64.rpm 
-
 all: $(DATA) $(DOCS)
 
-rpms: $(RPMS93)  $(RPMS92)
+rpms: rpm93 rpm92 rpm91
 
 sourcetar: $(STARBALL)
 
@@ -79,10 +76,14 @@ $(STARBALLS): $(TARSOURCES)
        tar -chzf $@ $(addprefix $(subst .tar.gz,,$@)/, $^)
        rm $(subst .tar.gz,,$@)
 
-$(RPMS93): $(STARBALL93)
-       export MAKE_ROOT=`pwd`
-       rpmbuild -bb SPECS/pg_dbms_stats93.spec
+rpm94: $(STARBALL94)
+       MAKE_ROOT=`pwd` rpmbuild -bb SPECS/pg_dbms_stats94.spec
+
+rpm93: $(STARBALL93)
+       MAKE_ROOT=`pwd` rpmbuild -bb SPECS/pg_dbms_stats93.spec
+
+rpm92: $(STARBALL92)
+       MAKE_ROOT=`pwd` rpmbuild -bb SPECS/pg_dbms_stats92.spec
 
-$(RPMS92): $(STARBALL92)
-       export MAKE_ROOT=`pwd`
-       rpmbuild -bb SPECS/pg_dbms_stats92.spec
\ No newline at end of file
+rpm91: $(STARBALL91)
+       MAKE_ROOT=`pwd` rpmbuild -bb SPECS/pg_dbms_stats91.spec

diff --git a/SPECS/pg_dbms_stats91.spec b/SPECS/pg_dbms_stats91.spec
index 458dd5c..daabdf8 100644 (file)
--- a/SPECS/pg_dbms_stats91.spec
+++ b/SPECS/pg_dbms_stats91.spec
@@ -1,4 +1,4 @@
-# SPEC file for pg_dbms_stats
+# SPEC file for pg_dbms_stats91
 # Copyright(C) 2012-2014 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
 
 %define _pgdir   /usr/pgsql-9.1
@@ -6,42 +6,49 @@
 %define _libdir  %{_pgdir}/lib
 %define _datadir %{_pgdir}/share
 %define _docdir  /usr/share/doc/pgsql
+%if "%(echo ${MAKE_ROOT})" != ""
+  %define _rpmdir %(echo ${MAKE_ROOT})/RPMS
+  %define _sourcedir %(echo ${MAKE_ROOT})
+%endif
 
 ## Set general information for pg_dbms_stats.
 Summary:    Plan Stabilizer for PostgreSQL 9.1
 Name:       pg_dbms_stats91
-Version:    1.3.1
+Version:    1.3.2
 Release:    1%{?dist}
 License:    BSD
 Group:      Applications/Databases
-Source0:    %{name}-%{version}.tar.gz
-#URL:        http://example.com/pg_dbms_stats/
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
+Source:     %{name}-%{version}.tar.gz
+URL:        http://sourceforge.jp/projects/pgdbmsstats/
+BuildRoot:  %{buildroot}
 Vendor:     NIPPON TELEGRAPH AND TELEPHONE CORPORATION
 
-## We use postgresql-devel package
+## postgresql-devel package required
 BuildRequires:  postgresql91-devel
 Requires:  postgresql91-libs
 
 ## Description for "pg_dbms_stats"
 %description
-pg_dbms_stats provides capability to replace planner's statistics with snapshot
-taken at arbitrary timing, so that planner generates stable plans even if
-ANALYZE is invoked after changes of data.
+pg_dbms_stats disguises database statistics with a prevously taken
+snapshot so that the planner won't change its behavior even after
+ANALYZE updates the statistics.
 
 pg_dbms_stats also provides following features:
-  - backup multiple generations of planner statistics to reuse plans after
-  - import planner statistics from another system for tuning an testing
+  - backup multiple generations of planner statistics to reuse plans afterwards
+  - import planner statistics from another system for tuning or testing.
 
 Note that this package is available for only PostgreSQL 9.1.
 
 ## pre work for build pg_dbms_stats
 %prep
+PATH=/usr/pgsql-9.1/bin:$PATH
+if [ ! -d %{_rpmdir} ]; then mkdir -p %{_rpmdir}; fi
 %setup -q
 
 ## Set variables for build environment
 %build
-make %{?_smp_mflags}
+PATH=/usr/pgsql-9.1/bin:$PATH
+make USE_PGXS=1 %{?_smp_mflags}
 
 ## Set variables for install
 %install
@@ -49,7 +56,8 @@ rm -rf %{buildroot}
 install -d %{buildroot}%{_libdir}
 install -m 755 pg_dbms_stats.so %{buildroot}%{_libdir}/pg_dbms_stats.so
 install -d %{buildroot}%{_datadir}/extension
-install -m 644 pg_dbms_stats--1.0.sql %{buildroot}%{_datadir}/extension/pg_dbms_stats--1.0.sql
+install -m 644 pg_dbms_stats--1.3.2.sql %{buildroot}%{_datadir}/extension/pg_dbms_stats--1.3.2.sql
+install -m 644 pg_dbms_stats--1.0--1.3.2.sql %{buildroot}%{_datadir}/extension/pg_dbms_stats--1.0--1.3.2.sql
 install -m 644 pg_dbms_stats.control %{buildroot}%{_datadir}/extension/pg_dbms_stats.control
 install -d %{buildroot}%{_docdir}/extension
 install -m 644 export_effective_stats-9.1.sql.sample %{buildroot}%{_docdir}/extension/export_effective_stats-9.1.sql.sample
@@ -62,13 +70,16 @@ rm -rf %{buildroot}
 %defattr(0755,root,root)
 %{_libdir}/pg_dbms_stats.so
 %defattr(0644,root,root)
-%{_datadir}/extension/pg_dbms_stats--1.0.sql
+%{_datadir}/extension/pg_dbms_stats--1.3.2.sql
+%{_datadir}/extension/pg_dbms_stats--1.0--1.3.2.sql
 %{_datadir}/extension/pg_dbms_stats.control
 %{_docdir}/extension/export_effective_stats-9.1.sql.sample
 %{_docdir}/extension/export_plain_stats-9.1.sql.sample
 
 # History of pg_dbms_stats.
 %changelog
+* Thu Jun 05 2014 Kyotaro Horiguchi
+- Update to 1.3.2
 * Wed Nov 06 2013 Takashi Suzuki
 - Update to 1.3.1
 * Wed Sep 05 2012 Shigeru Hanada

diff --git a/SPECS/pg_dbms_stats92.spec b/SPECS/pg_dbms_stats92.spec
index 2ff6bdd..75182c5 100644 (file)
--- a/SPECS/pg_dbms_stats92.spec
+++ b/SPECS/pg_dbms_stats92.spec
@@ -37,7 +37,7 @@ pg_dbms_stats also provides following features:
   - backup multiple generations of planner statistics to reuse plans afterwards
   - import planner statistics from another system for tuning or testing.
 
-Note that this package is available for only PostgreSQL 9.3.
+Note that this package is available for only PostgreSQL 9.2.
 
 ## pre work for build pg_dbms_stats
 %prep
@@ -47,7 +47,8 @@ if [ ! -d %{_rpmdir} ]; then mkdir -p %{_rpmdir}; fi
 
 ## Set variables for build environment
 %build
-make %{?_smp_mflags}
+PATH=/usr/pgsql-9.2/bin:$PATH
+make USE_PGXS=1 %{?_smp_mflags}
 
 ## Set variables for install
 %install

diff --git a/SPECS/pg_dbms_stats93.spec b/SPECS/pg_dbms_stats93.spec
index a084e2d..0fdbcf2 100644 (file)
--- a/SPECS/pg_dbms_stats93.spec
+++ b/SPECS/pg_dbms_stats93.spec
@@ -44,7 +44,7 @@ Note that this package is available for only PostgreSQL 9.3.
 PATH=/usr/pgsql-9.3/bin:$PATH
 if [ "${MAKE_ROOT}" != "" ]; then
   pushd ${MAKE_ROOT}
-  make clean %{name}-%{version}.tar.gz
+  make USE_PGXS=1 clean %{name}-%{version}.tar.gz
   popd
 fi
 if [ ! -d %{_rpmdir} ]; then mkdir -p %{_rpmdir}; fi
@@ -52,7 +52,8 @@ if [ ! -d %{_rpmdir} ]; then mkdir -p %{_rpmdir}; fi
 
 ## Set variables for build environment
 %build
-make %{?_smp_mflags}
+PATH=/usr/pgsql-9.3/bin:$PATH
+make USE_PGXS=1 %{?_smp_mflags}
 
 ## Set variables for install
 %install

diff --git a/SPECS/pg_dbms_stats94.spec b/SPECS/pg_dbms_stats94.spec
new file mode 100644 (file)
index 0000000..a520a69
--- /dev/null
+++ b/SPECS/pg_dbms_stats94.spec
@@ -0,0 +1,92 @@
+# SPEC file for pg_dbms_stats94
+# Copyright(C) 2012-2014 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+
+%define _pgdir   /usr/pgsql-9.4
+%define _bindir  %{_pgdir}/bin
+%define _libdir  %{_pgdir}/lib
+%define _datadir %{_pgdir}/share
+%define _docdir  /usr/share/doc/pgsql
+%if "%(echo ${MAKE_ROOT})" != ""
+  %define _rpmdir %(echo ${MAKE_ROOT})/RPMS
+  %define _sourcedir %(echo ${MAKE_ROOT})
+%endif
+
+## Set general information for pg_dbms_stats.
+Summary:    Plan Stabilizer for PostgreSQL 9.4
+Name:       pg_dbms_stats93
+Version:    1.3.2
+Release:    1%{?dist}
+License:    BSD
+Group:      Applications/Databases
+Source:     %{name}-%{version}.tar.gz
+URL:        http://sourceforge.jp/projects/pgdbmsstats/
+BuildRoot:  %{buildroot}
+Vendor:     NIPPON TELEGRAPH AND TELEPHONE CORPORATION
+
+## postgresql-devel package required
+BuildRequires:  postgresql94-devel
+Requires:  postgresql94-libs
+
+## Description for "pg_dbms_stats"
+%description
+pg_dbms_stats disguises database statistics with a prevously taken
+snapshot so that the planner won't change its behavior even after
+ANALYZE updates the statistics.
+
+pg_dbms_stats also provides following features:
+  - backup multiple generations of planner statistics to reuse plans afterwards
+  - import planner statistics from another system for tuning or testing.
+
+Note that this package is available for only PostgreSQL 9.4.
+
+## pre work for build pg_dbms_stats
+%prep
+PATH=/usr/pgsql-9.4/bin:$PATH
+if [ "${MAKE_ROOT}" != "" ]; then
+  pushd ${MAKE_ROOT}
+  make clean %{name}-%{version}.tar.gz
+  popd
+fi
+if [ ! -d %{_rpmdir} ]; then mkdir -p %{_rpmdir}; fi
+%setup -q
+
+## Set variables for build environment
+%build
+PATH=/usr/pgsql-9.4/bin:$PATH
+make USE_PGXS=1 %{?_smp_mflags}
+
+## Set variables for install
+%install
+rm -rf %{buildroot}
+install -d %{buildroot}%{_libdir}
+install -m 755 pg_dbms_stats.so %{buildroot}%{_libdir}/pg_dbms_stats.so
+install -d %{buildroot}%{_datadir}/extension
+install -m 644 pg_dbms_stats--1.3.2.sql %{buildroot}%{_datadir}/extension/pg_dbms_stats--1.3.2.sql
+install -m 644 pg_dbms_stats--1.0--1.3.2.sql %{buildroot}%{_datadir}/extension/pg_dbms_stats--1.0--1.3.2.sql
+install -m 644 pg_dbms_stats.control %{buildroot}%{_datadir}/extension/pg_dbms_stats.control
+install -d %{buildroot}%{_docdir}/extension
+install -m 644 export_effective_stats-9.4.sql.sample %{buildroot}%{_docdir}/extension/export_effective_stats-9.3.sql.sample
+install -m 644 export_plain_stats-9.3.sql.sample %{buildroot}%{_docdir}/extension/export_plain_stats-9.3.sql.sample
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(0755,root,root)
+%{_libdir}/pg_dbms_stats.so
+%defattr(0644,root,root)
+%{_datadir}/extension/pg_dbms_stats--1.3.2.sql
+%{_datadir}/extension/pg_dbms_stats--1.0--1.3.2.sql
+%{_datadir}/extension/pg_dbms_stats.control
+%{_docdir}/extension/export_effective_stats-9.3.sql.sample
+%{_docdir}/extension/export_plain_stats-9.3.sql.sample
+
+# History of pg_dbms_stats.
+%changelog
+* Thu Jun 05 2014 Kyotaro Horiguchi
+- Update to 1.3.2
+* Wed Nov 06 2013 Takashi Suzuki
+- Update to 1.3.1
+* Wed Sep 05 2012 Shigeru Hanada
+- Initial cut for 1.0.0
+