Skip to content

Commit d46a30a

Browse files
kiskkkiskk
authored
Merge pull request #5 from kiskk/dev_dblink_plus_1.0.6
Dev dblink plus 1.0.6
2 parents 53bafad + 11d7a7e commit d46a30a

File tree

10 files changed

+225
-52
lines changed

10 files changed

+225
-52
lines changed

‎COPYRIGHT‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2011-2020, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
1+
Copyright (c) 2011-2021, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#
22
# dblink_plus: Makefile
33
#
4-
# Copyright (c) 2011-2020, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
4+
# Copyright (c) 2011-2021, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
55
#
66
MODULE_big = dblink_plus
7-
DATA_built = dblink_plus.sql dblink_plus--1.0.5.sql
7+
DATA_built = dblink_plus.sql dblink_plus--1.0.6.sql
88
DATA = uninstall_dblink_plus.sql
99
OBJS = dblink.o dblink_postgres.o
1010

@@ -51,8 +51,8 @@ SHLIB_LINK += -L$(ORACLE_HOME)/lib -lclntsh
5151
endif
5252
endif
5353

54-
dblink_plus--1.0.5.sql:
55-
head -n -2 dblink_plus.sql.in | tail -n +4 > dblink_plus--1.0.5.sql
54+
dblink_plus--1.0.6.sql:
55+
head -n -2 dblink_plus.sql.in | tail -n +4 > dblink_plus--1.0.6.sql
5656

5757
standbycheck: all
5858
$(pg_regress_installcheck) --schedule=standby_schedule --use-existing --dbname=contrib_regression --port=$(PGPORT)

‎SPECS/dblink_plus_pg12.spec‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPEC file for dblink_plus
2-
# Copyright(C) 2019 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
2+
# Copyright(C) 2021 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
33

44
%define _pgdir /usr/pgsql-12
55
%define _bindir %{_pgdir}/bin
@@ -11,7 +11,7 @@
1111
## Set general information
1212
Summary: PostgreSQL module to connect PostgreSQL/Oracle
1313
Name: dblink_plus
14-
Version: 1.0.5
14+
Version: 1.0.6
1515
Release: 1%{?dist}
1616
License: BSD
1717
Group: Applications/Databases
@@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 12.
3535

3636
%package llvmjit
3737
Requires: postgresql12-server, postgresql12-llvmjit
38-
Requires: dblink_plus = 1.0.5
38+
Requires: dblink_plus = 1.0.6
3939
Summary: Just-in-time compilation support for dblink_plus
4040

4141
%description llvmjit
42-
Just-in-time compilation support for dblink_plus 1.0.5
42+
Just-in-time compilation support for dblink_plus 1.0.6
4343

4444
## prework
4545
%prep
@@ -52,28 +52,18 @@ USE_PGXS=1 make %{?_smp_mflags} MYSQL=0 SQLITE3=0 ORACLE=0
5252
## Set variables for install
5353
%install
5454
rm -rf %{buildroot}
55-
56-
install -d %{buildroot}%{_libdir}
57-
install -m 755 dblink_plus.so %{buildroot}%{_libdir}/dblink_plus.so
58-
install -d %{buildroot}%{_datadir}
59-
install -m 755 dblink_plus.sql %{buildroot}%{_datadir}/dblink_plus.sql
60-
install -m 755 dblink_plus--1.0.5.sql %{buildroot}%{_datadir}/dblink_plus--1.0.5.sql
61-
install -m 755 dblink_plus.control %{buildroot}%{_datadir}/dblink_plus.control
62-
install -m 755 uninstall_dblink_plus.sql %{buildroot}%{_datadir}/uninstall_dblink_plus.sql
63-
install -m 755 COPYRIGHT %{buildroot}%{_datadir}/COPYRIGHT_dblink_plus
64-
install -d %{buildroot}%{_bcdir}
65-
install -m 644 dblink.bc %{buildroot}%{_bcdir}/dblink.bc
66-
install -m 644 dblink_postgres.bc %{buildroot}%{_bcdir}/dblink_postgres.bc
67-
install -m 644 dblink_plus.index.bc %{buildroot}%{_bc_ind_dir}/dblink_plus.index.bc
55+
USE_PGXS=1 make install MYSQL=0 SQLITE3=0 ORACLE=0 DESTDIR=%{buildroot}
56+
install -m 644 COPYRIGHT %{buildroot}%{_datadir}/COPYRIGHT_dblink_plus
6857

6958
%clean
7059
rm -rf %{buildroot}
7160

7261
%files
73-
%defattr(755,root,root)
62+
%defattr(0755,root,root)
7463
%{_libdir}/dblink_plus.so
64+
%defattr(0644,root,root)
7565
%{_datadir}/dblink_plus.sql
76-
%{_datadir}/dblink_plus--1.0.5.sql
66+
%{_datadir}/dblink_plus--1.0.6.sql
7767
%{_datadir}/dblink_plus.control
7868
%{_datadir}/uninstall_dblink_plus.sql
7969
%{_datadir}/COPYRIGHT_dblink_plus
@@ -86,6 +76,8 @@ rm -rf %{buildroot}
8676

8777
# History.
8878
%changelog
79+
* Thu Jan 07 2021 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.6-1
80+
Support PG13 and fix how to install bitcode.
8981
* Mon Nov 25 2019 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.5-1
9082
Support PG12.
9183
* Tue Jan 22 2019 - NTT OSS Center <tatsuro.yamada@lab.ntt.co.jp> 1.0.4-1

‎SPECS/dblink_plus_pg12_ora.spec‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPEC file for dblink_plus
2-
# Copyright(C) 2019 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
2+
# Copyright(C) 2021 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
33

44
%define _pgdir /usr/pgsql-12
55
%define _bindir %{_pgdir}/bin
@@ -11,7 +11,7 @@
1111
## Set general information
1212
Summary: PostgreSQL module to connect PostgreSQL/Oracle
1313
Name: dblink_plus
14-
Version: 1.0.5
14+
Version: 1.0.6
1515
Release: 1%{?dist}
1616
License: BSD
1717
Group: Applications/Databases
@@ -35,11 +35,11 @@ Note that this package is available for only PostgreSQL 12.
3535

3636
%package llvmjit
3737
Requires: postgresql12-server, postgresql12-llvmjit
38-
Requires: dblink_plus = 1.0.5
38+
Requires: dblink_plus = 1.0.6
3939
Summary: Just-in-time compilation support for dblink_plus
4040

4141
%description llvmjit
42-
Just-in-time compilation support for dblink_plus 1.0.5
42+
Just-in-time compilation support for dblink_plus 1.0.6
4343

4444
## prework
4545
%prep
@@ -52,29 +52,18 @@ USE_PGXS=1 make %{?_smp_mflags} MYSQL=0 SQLITE3=0 ORACLE=1
5252
## Set variables for install
5353
%install
5454
rm -rf %{buildroot}
55-
56-
install -d %{buildroot}%{_libdir}
57-
install -m 755 dblink_plus.so %{buildroot}%{_libdir}/dblink_plus.so
58-
install -d %{buildroot}%{_datadir}
59-
install -m 755 dblink_plus.sql %{buildroot}%{_datadir}/dblink_plus.sql
60-
install -m 755 dblink_plus--1.0.5.sql %{buildroot}%{_datadir}/dblink_plus--1.0.5.sql
61-
install -m 755 dblink_plus.control %{buildroot}%{_datadir}/dblink_plus.control
62-
install -m 755 uninstall_dblink_plus.sql %{buildroot}%{_datadir}/uninstall_dblink_plus.sql
63-
install -m 755 COPYRIGHT %{buildroot}%{_datadir}/COPYRIGHT_dblink_plus
64-
install -d %{buildroot}%{_bcdir}
65-
install -m 644 dblink.bc %{buildroot}%{_bcdir}/dblink.bc
66-
install -m 644 dblink_postgres.bc %{buildroot}%{_bcdir}/dblink_postgres.bc
67-
install -m 644 dblink_oracle.bc %{buildroot}%{_bcdir}/dblink_oracle.bc
68-
install -m 644 dblink_plus.index.bc %{buildroot}%{_bc_ind_dir}/dblink_plus.index.bc
55+
USE_PGXS=1 make install MYSQL=0 SQLITE3=0 ORACLE=1 DESTDIR=%{buildroot}
56+
install -m 644 COPYRIGHT %{buildroot}%{_datadir}/COPYRIGHT_dblink_plus
6957

7058
%clean
7159
rm -rf %{buildroot}
7260

7361
%files
74-
%defattr(755,root,root)
62+
%defattr(0755,root,root)
7563
%{_libdir}/dblink_plus.so
64+
%defattr(0644,root,root)
7665
%{_datadir}/dblink_plus.sql
77-
%{_datadir}/dblink_plus--1.0.5.sql
66+
%{_datadir}/dblink_plus--1.0.6.sql
7867
%{_datadir}/dblink_plus.control
7968
%{_datadir}/uninstall_dblink_plus.sql
8069
%{_datadir}/COPYRIGHT_dblink_plus
@@ -87,6 +76,8 @@ rm -rf %{buildroot}
8776

8877
# History.
8978
%changelog
79+
* Thu Jan 07 2021 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.6-1
80+
Support PG13 and fix how to install bitcode.
9081
* Mon Nov 25 2019 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.5-1
9182
Support PG12.
9283
* Tue Jan 22 2019 - NTT OSS Center <tatsuro.yamada@lab.ntt.co.jp> 1.0.4-1

‎SPECS/dblink_plus_pg13.spec‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# SPEC file for dblink_plus
2+
# Copyright(C) 2021 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
3+
4+
%define _pgdir /usr/pgsql-13
5+
%define _bindir %{_pgdir}/bin
6+
%define _libdir %{_pgdir}/lib
7+
%define _datadir %{_pgdir}/share/extension
8+
%define _bcdir %{_libdir}/bitcode/dblink_plus
9+
%define _bc_ind_dir %{_libdir}/bitcode
10+
11+
## Set general information
12+
Summary: PostgreSQL module to connect PostgreSQL/Oracle
13+
Name: dblink_plus
14+
Version: 1.0.6
15+
Release: 1%{?dist}
16+
License: BSD
17+
Group: Applications/Databases
18+
Source0: %{name}-%{version}.tar.gz
19+
URL: https://github.com/ossc-db/dblink_plus
20+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
21+
Vendor: NIPPON TELEGRAPH AND TELEPHONE CORPORATION
22+
#Following is needed to remove auto-discovery of oci library files(not under RPM package management)
23+
AutoReqProv: no
24+
25+
## We use postgresql-devel package
26+
BuildRequires: postgresql13-devel
27+
Requires: postgresql13-libs
28+
29+
## Description
30+
%description
31+
dblink_plus is a PostgreSQL module which supports connections to other databases.
32+
It is similar to contrib/dblink except that it can connect to Oracle, MySQL and sqlite3.
33+
34+
Note that this package is available for only PostgreSQL 13.
35+
36+
%package llvmjit
37+
Requires: postgresql13-server, postgresql13-llvmjit
38+
Requires: dblink_plus = 1.0.6
39+
Summary: Just-in-time compilation support for dblink_plus
40+
41+
%description llvmjit
42+
Just-in-time compilation support for dblink_plus 1.0.6
43+
44+
## prework
45+
%prep
46+
%setup -q -n %{name}-%{version}
47+
48+
## Set variables for build environment
49+
%build
50+
USE_PGXS=1 make %{?_smp_mflags} MYSQL=0 SQLITE3=0 ORACLE=0
51+
52+
## Set variables for install
53+
%install
54+
rm -rf %{buildroot}
55+
USE_PGXS=1 make install MYSQL=0 SQLITE3=0 ORACLE=0 DESTDIR=%{buildroot}
56+
install -m 644 COPYRIGHT %{buildroot}%{_datadir}/COPYRIGHT_dblink_plus
57+
58+
%clean
59+
rm -rf %{buildroot}
60+
61+
%files
62+
%defattr(0755,root,root)
63+
%{_libdir}/dblink_plus.so
64+
%defattr(0644,root,root)
65+
%{_datadir}/dblink_plus.sql
66+
%{_datadir}/dblink_plus--1.0.6.sql
67+
%{_datadir}/dblink_plus.control
68+
%{_datadir}/uninstall_dblink_plus.sql
69+
%{_datadir}/COPYRIGHT_dblink_plus
70+
71+
%files llvmjit
72+
%defattr(0644,root,root,0755)
73+
%{_bcdir}
74+
%defattr(0644,root,root)
75+
%{_bc_ind_dir}/dblink_plus.index.bc
76+
77+
# History.
78+
%changelog
79+
* Thu Jan 07 2021 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.6-1
80+
Support PG13 and fix how to install bitcode.
81+
* Mon Nov 25 2019 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.5-1
82+
Support PG12.
83+
* Tue Jan 22 2019 - NTT OSS Center <tatsuro.yamada@lab.ntt.co.jp> 1.0.4-1
84+
Support PG11.

‎SPECS/dblink_plus_pg13_ora.spec‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# SPEC file for dblink_plus
2+
# Copyright(C) 2021 NIPPON TELEGRAPH AND TELEPHONE CORPORATION
3+
4+
%define _pgdir /usr/pgsql-13
5+
%define _bindir %{_pgdir}/bin
6+
%define _libdir %{_pgdir}/lib
7+
%define _datadir %{_pgdir}/share/extension
8+
%define _bcdir %{_libdir}/bitcode/dblink_plus
9+
%define _bc_ind_dir %{_libdir}/bitcode
10+
11+
## Set general information
12+
Summary: PostgreSQL module to connect PostgreSQL/Oracle
13+
Name: dblink_plus
14+
Version: 1.0.6
15+
Release: 1%{?dist}
16+
License: BSD
17+
Group: Applications/Databases
18+
Source0: %{name}-%{version}.tar.gz
19+
URL: https://github.com/ossc-db/dblink_plus
20+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
21+
Vendor: NIPPON TELEGRAPH AND TELEPHONE CORPORATION
22+
#Following is needed to remove auto-discovery of oci library files(not under RPM package management)
23+
AutoReqProv: no
24+
25+
## We use postgresql-devel package
26+
BuildRequires: postgresql13-devel
27+
Requires: postgresql13-libs
28+
29+
## Description
30+
%description
31+
dblink_plus is a PostgreSQL module which supports connections to other databases.
32+
It is similar to contrib/dblink except that it can connect to Oracle, MySQL and sqlite3.
33+
34+
Note that this package is available for only PostgreSQL 13.
35+
36+
%package llvmjit
37+
Requires: postgresql13-server, postgresql13-llvmjit
38+
Requires: dblink_plus = 1.0.6
39+
Summary: Just-in-time compilation support for dblink_plus
40+
41+
%description llvmjit
42+
Just-in-time compilation support for dblink_plus 1.0.6
43+
44+
## prework
45+
%prep
46+
%setup -q -n %{name}-%{version}
47+
48+
## Set variables for build environment
49+
%build
50+
USE_PGXS=1 make %{?_smp_mflags} MYSQL=0 SQLITE3=0 ORACLE=1
51+
52+
## Set variables for install
53+
%install
54+
rm -rf %{buildroot}
55+
USE_PGXS=1 make install MYSQL=0 SQLITE3=0 ORACLE=1 DESTDIR=%{buildroot}
56+
install -m 644 COPYRIGHT %{buildroot}%{_datadir}/COPYRIGHT_dblink_plus
57+
58+
%clean
59+
rm -rf %{buildroot}
60+
61+
%files
62+
%defattr(0755,root,root)
63+
%{_libdir}/dblink_plus.so
64+
%defattr(0644,root,root)
65+
%{_datadir}/dblink_plus.sql
66+
%{_datadir}/dblink_plus--1.0.6.sql
67+
%{_datadir}/dblink_plus.control
68+
%{_datadir}/uninstall_dblink_plus.sql
69+
%{_datadir}/COPYRIGHT_dblink_plus
70+
71+
%files llvmjit
72+
%defattr(0644,root,root,0755)
73+
%{_bcdir}
74+
%defattr(0644,root,root)
75+
%{_bc_ind_dir}/dblink_plus.index.bc
76+
77+
# History.
78+
%changelog
79+
* Thu Jan 07 2021 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.6-1
80+
Support PG13 and fix how to install bitcode.
81+
* Mon Nov 25 2019 - NTT OSS Center <keisuke.kuroda.3862@gmail.com> 1.0.5-1
82+
Support PG12.
83+
* Tue Jan 22 2019 - NTT OSS Center <tatsuro.yamada@lab.ntt.co.jp> 1.0.4-1
84+
Support PG11.

0 commit comments

Comments
 (0)