From 772e52922d81ef4bbb69092d38398f3f45bab58e Mon Sep 17 00:00:00 2001 From: Kyotaro Horiguchi Date: Fri, 31 Jan 2020 12:27:26 +0900 Subject: [PATCH] Revert "Version 1.3.1" To swap branches including master, this reverts commit 132519a8cf6e8e3af57130734bf3e24321d6f8e4. --- Makefile | 4 ++-- SPECS/pg_store_plans10.spec | 12 ++++-------- SPECS/pg_store_plans11.spec | 13 +++++-------- SPECS/pg_store_plans96.spec | 12 ++++-------- pg_store_plans--1.3--1.3.1.sql | 1 - pg_store_plans--1.3.1.sql => pg_store_plans--1.3.sql | 0 pg_store_plans.control | 2 +- 7 files changed, 16 insertions(+), 28 deletions(-) delete mode 100644 pg_store_plans--1.3--1.3.1.sql rename pg_store_plans--1.3.1.sql => pg_store_plans--1.3.sql (100%) diff --git a/Makefile b/Makefile index f6ce920..1f19702 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # pg_stat_plan/Makefile MODULES = pg_store_plans -STOREPLANSVER = 1.3.1 +STOREPLANSVER = 1.3 MODULE_big = pg_store_plans OBJS = pg_store_plans.o pgsp_json.o pgsp_json_text.o pgsp_explain.o @@ -10,7 +10,7 @@ EXTENSION = pg_store_plans PG_VERSION := $(shell pg_config --version | sed "s/^PostgreSQL //" | sed "s/\.[0-9]*$$//") -DATA = pg_store_plans--1.3.1.sql pg_store_plans--1.3--1.3.1.sql +DATA = pg_store_plans--1.3.sql ifeq ($(PG_VERSION),10) DATA += pg_store_plans--1.2--1.3.sql endif diff --git a/SPECS/pg_store_plans10.spec b/SPECS/pg_store_plans10.spec index 0ca9c51..996173b 100644 --- a/SPECS/pg_store_plans10.spec +++ b/SPECS/pg_store_plans10.spec @@ -1,5 +1,5 @@ # SPEC file for pg_store_plans -# Copyright(C) 2020 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright(C) 2019 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define _pgdir /usr/pgsql-10 %define _bindir %{_pgdir}/bin @@ -13,7 +13,7 @@ ## Set general information for pg_store_plans. Summary: Record executed plans on PostgreSQL 10 Name: pg_store_plans10 -Version: 1.3.1 +Version: 1.3 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -57,8 +57,7 @@ install -d %{buildroot}%{_libdir} install pg_store_plans.so %{buildroot}%{_libdir}/pg_store_plans.so install -d %{buildroot}%{_datadir}/extension install -m 644 pg_store_plans--1.2--1.3.sql %{buildroot}%{_datadir}/extension/pg_store_plans--1.2--1.3.sql -install -m 644 pg_store_plans--1.3--1.3.1.sql %{buildroot}%{_datadir}/extension/pg_store_plans--1.3--1.3.1.sql -install -m 644 pg_store_plans--1.3.1.sql %{buildroot}%{_datadir}/extension/pg_store_plans--1.3.1.sql +install -m 644 pg_store_plans--1.3.sql %{buildroot}%{_datadir}/extension/pg_store_plans--1.3.sql install -m 644 pg_store_plans.control %{buildroot}%{_datadir}/extension/pg_store_plans.control %clean @@ -69,14 +68,11 @@ rm -rf %{buildroot} %{_libdir}/pg_store_plans.so %defattr(0644,root,root) %{_datadir}/extension/pg_store_plans--1.2--1.3.sql -%{_datadir}/extension/pg_store_plans--1.3--1.3.1.sql -%{_datadir}/extension/pg_store_plans--1.3.1.sql +%{_datadir}/extension/pg_store_plans--1.3.sql %{_datadir}/extension/pg_store_plans.control # History of pg_store_plans. %changelog -* Tue Jan 30 2020 Kyotaro Horiguchi -- Fixed a bug. * Tue Jan 22 2019 Kyotaro Horiguchi - Fixed a bug. * Tue Oct 10 2017 Kyotaro Horiguchi diff --git a/SPECS/pg_store_plans11.spec b/SPECS/pg_store_plans11.spec index 595bab8..d3c41f6 100644 --- a/SPECS/pg_store_plans11.spec +++ b/SPECS/pg_store_plans11.spec @@ -1,5 +1,5 @@ # SPEC file for pg_store_plans -# Copyright(C) 2020 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright(C) 2019 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define _pgdir /usr/pgsql-11 %define _bindir %{_pgdir}/bin @@ -16,8 +16,8 @@ ## Set general information for pg_store_plans. Summary: Record executed plans on PostgreSQL 11 Name: pg_store_plans11 -Version: 1.3.1 -Release: 1%{?dist} +Version: 1.3 +Release: 2%{?dist} License: BSD Group: Applications/Databases Source0: %{name}-%{version}.tar.gz @@ -39,7 +39,7 @@ Note that this package is available for only PostgreSQL 11. %package llvmjit Requires: postgresql11-server, postgresql11-llvmjit -Requires: pg_store_plans11 = 1.3.1 +Requires: pg_store_plans11 = 1.3 Summary: Just-in-time compilation support for pg_store_plans11 %description llvmjit @@ -75,8 +75,7 @@ rm -rf %{buildroot} %defattr(0755,root,root) %{_libdir}/pg_store_plans.so %defattr(0644,root,root) -%{_datadir}/extension/pg_store_plans--1.3--1.3.1.sql -%{_datadir}/extension/pg_store_plans--1.3.1.sql +%{_datadir}/extension/pg_store_plans--1.3.sql %{_datadir}/extension/pg_store_plans.control %files llvmjit @@ -86,8 +85,6 @@ rm -rf %{buildroot} # History of pg_store_plans. %changelog -* Tue Jan 30 2020 Kyotaro Horiguchi -- Fixed a bug. * Tue Jan 22 2019 Kyotaro Horiguchi - Supports PostgreSQL 11 * Tue Oct 10 2017 Kyotaro Horiguchi diff --git a/SPECS/pg_store_plans96.spec b/SPECS/pg_store_plans96.spec index 54d01f7..7fb5ead 100644 --- a/SPECS/pg_store_plans96.spec +++ b/SPECS/pg_store_plans96.spec @@ -1,5 +1,5 @@ # SPEC file for pg_store_plans -# Copyright(C) 2020 NIPPON TELEGRAPH AND TELEPHONE CORPORATION +# Copyright(C) 2019 NIPPON TELEGRAPH AND TELEPHONE CORPORATION %define _pgdir /usr/pgsql-9.6 %define _bindir %{_pgdir}/bin @@ -13,7 +13,7 @@ ## Set general information for pg_store_plans. Summary: Record executed plans on PostgreSQL 9.6 Name: pg_store_plans96 -Version: 1.3.1 +Version: 1.3 Release: 1%{?dist} License: BSD Group: Applications/Databases @@ -58,8 +58,7 @@ install pg_store_plans.so %{buildroot}%{_libdir}/pg_store_plans.so install -d %{buildroot}%{_datadir}/extension install -m 644 pg_store_plans--1.1--1.2.sql %{buildroot}%{_datadir}/extension/pg_store_plans--1.1--1.2.sql install -m 644 pg_store_plans--1.2--1.3.sql %{buildroot}%{_datadir}/extension/pg_store_plans--1.2--1.3.sql -install -m 644 pg_store_plans--1.3--1.3.1.sql %{buildroot}%{_datadir}/extension/pg_store_plans--1.3--1.3.1.sql -install -m 644 pg_store_plans--1.3.1.sql %{buildroot}%{_datadir}/extension/pg_store_plans--1.3.1.sql +install -m 644 pg_store_plans--1.3.sql %{buildroot}%{_datadir}/extension/pg_store_plans--1.3.sql install -m 644 pg_store_plans.control %{buildroot}%{_datadir}/extension/pg_store_plans.control %clean @@ -71,14 +70,11 @@ rm -rf %{buildroot} %defattr(0644,root,root) %{_datadir}/extension/pg_store_plans--1.1--1.2.sql %{_datadir}/extension/pg_store_plans--1.2--1.3.sql -%{_datadir}/extension/pg_store_plans--1.3--1.3.1.sql -%{_datadir}/extension/pg_store_plans--1.3.1.sql +%{_datadir}/extension/pg_store_plans--1.3.sql %{_datadir}/extension/pg_store_plans.control # History of pg_store_plans. %changelog -* Tue Jan 30 2020 Kyotaro Horiguchi -- Fixed a bug. * Tue Jan 22 2019 Kyotaro Horiguchi - Fixed a bug. * Fri Aug 26 2016 Kyotaro Horiguchi diff --git a/pg_store_plans--1.3--1.3.1.sql b/pg_store_plans--1.3--1.3.1.sql deleted file mode 100644 index 238feea..0000000 --- a/pg_store_plans--1.3--1.3.1.sql +++ /dev/null @@ -1 +0,0 @@ --- Nothing to do for SQL definitions as of 1.2 diff --git a/pg_store_plans--1.3.1.sql b/pg_store_plans--1.3.sql similarity index 100% rename from pg_store_plans--1.3.1.sql rename to pg_store_plans--1.3.sql diff --git a/pg_store_plans.control b/pg_store_plans.control index ce1c588..02ede9f 100644 --- a/pg_store_plans.control +++ b/pg_store_plans.control @@ -1,5 +1,5 @@ # pg_store_plans extension comment = 'track plan statistics of all SQL statements executed' -default_version = '1.3.1' +default_version = '1.3' module_pathname = '$libdir/pg_store_plans' relocatable = true -- 2.11.0