Browse Source

updated 2 packages

bind-9.11.31-1

postgresql-13.3-1
Tomohiro "Tomo-p" KATO 2 years ago
parent
commit
c8c731fe91
2 changed files with 36 additions and 32 deletions
  1. 5 2
      b/bind/bind-vl.spec
  2. 31 30
      p/postgresql/postgresql-vl.spec

+ 5 - 2
b/bind/bind-vl.spec

@@ -9,9 +9,9 @@
 %define sname bind
 %define pname bind
 # example: 9.9.13.P1
-%define pversion 9.11.28
+%define pversion 9.11.31
 # example: 9.9.13-P1
-%define sversion 9.11.28
+%define sversion 9.11.31
 %define bind_epoch 1
 # fixed <BTS:VineLinux:1139>
 %define old_bind_version 1:9.9.2p2-1vl7
@@ -387,6 +387,9 @@ exit 0
 %{_bindir}/isc-config.sh
 
 %changelog
+* Fri May 14 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.11.31-1
+- updated to 9.11.31.
+
 * Sat Feb 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.11.28-1
 - updated to 9.11.28.
 

+ 31 - 30
p/postgresql/postgresql-vl.spec

@@ -12,18 +12,16 @@
 %define nls 1
 %define pam 1
 
-%define pgver 12
-
 Summary: PostgreSQL client programs
 Summary(ja): PostgreSQL のクライアントプログラム群
 Name: postgresql
-Version: 13.2
-Release: 3%{?_dist_release}%{?with_systemd:.systemd}
+Version: 13.3
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: office
 Vendor: Project Vine
 Distribution: Vine Linux
 
-%global pgver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
+%global pgver %(echo %{version} | cut -d . -f 1)
 # Conventions for PostgreSQL Global Development Group RPM releases:
 #
 # Official PostgreSQL Development Group RPMS have a PGDG after the release number.
@@ -84,13 +82,13 @@ BuildRequires: pam-devel
 %endif
 %endif
 
-Obsoletes: postgresql-clients
-Obsoletes: postgresql-python
-Obsoletes: postgresql7
-Conflicts: postgresql8
-Conflicts: postgresql8-jdbc
+Obsoletes: postgresql-clients < 9.0.0
+Obsoletes: postgresql-python < 9.0.0
+Obsoletes: postgresql7 < 8.0.0
+Conflicts: postgresql8 < 9.0.0
+Conflicts: postgresql8-jdbc < 9.0.0
 Conflicts: postgresql-jdbc < %{pgver}
-Obsoletes: postgresql7-plperl
+Obsoletes: postgresql7-plperl < 8.0.0
 
 # This is the PostgreSQL Global Development Group Official RPMset spec file,
 # or a derivative thereof.
@@ -158,7 +156,7 @@ PostgreSQLはSQLの構成要素(トランザクション、副問い合わせお
 Summary: The shared libraries required for any PostgreSQL clients.
 Summary(ja): PostgreSQL クライアントに必要な共有ライブラリ
 Group: system
-Obsoletes: postgresql7-libs
+Obsoletes: postgresql7-libs < 8.0.0
 Conflicts: postgresql8-libs
 Conflicts: postgresql-libs >= 9.3.0
 
@@ -191,8 +189,8 @@ Requires(post): chkconfig
 Requires(preun): chkconfig, /sbin/service
 Requires(postun): chkconfig, /sbin/service
 %endif
-Obsoletes: postgresql7-server
-Conflicts: postgresql8-server
+Obsoletes: postgresql7-server < 8.0.0
+Conflicts: postgresql8-server < 9.0.0
 
 %description server
 The postgresql-server package includes the programs needed to create
@@ -238,8 +236,8 @@ goal of accelerating analytics queries.
 Summary: Extra documentation for PostgreSQL
 Summary(ja): PostgreSQL に関するその他の文書
 Group: documentation
-Obsoletes: postgresql7-docs
-Conflicts: postgresql8-docs
+Obsoletes: postgresql7-docs < 8.0.0
+Conflicts: postgresql8-docs < 9.0.0
 
 %description docs
 The postgresql-docs package includes the SGML source for the documentation
@@ -253,8 +251,8 @@ Summary: Contributed source and binaries distributed with PostgreSQL
 Summary(ja): PostgreSQL と一緒に配布される、寄贈されたソースとバイナリ
 Group: Applications/Databases
 Requires: %{name} = %{version} perl-DBD-Pg
-Obsoletes: postgresql7-contrib
-Conflicts: postgresql8-contrib
+Obsoletes: postgresql7-contrib < 8.0.0
+Conflicts: postgresql8-contrib < 9.0.0
 
 %description contrib
 The postgresql-contrib package contains contributed packages that are
@@ -269,8 +267,8 @@ Requires: %{name}-static = %{version}
 Requires: libicu-devel
 Requires: clang-devel
 Requires: llvm-devel
-Obsoletes: postgresql7-devel
-Conflicts: postgresql8-devel
+Obsoletes: postgresql7-devel < 8.0.0
+Conflicts: postgresql8-devel < 9.0.0
 Conflicts: libpq-devel >= 9.3.0
 
 %description devel
@@ -286,8 +284,8 @@ postgresql-devel パッケージには、PostgreSQL サーバサイド C / C++ 
 Summary: PostgreSQL development libraries.
 Summary(ja): PostgreSQL のサーバサイド開発用ライブラリ
 Group: programming
-Obsoletes: postgresql7-devel
-Conflicts: postgresql8-devel
+Obsoletes: postgresql7-devel < 8.0.0
+Conflicts: postgresql8-devel < 9.0.0
 Conflicts: libpq-devel >= 9.3.0
 
 %description static
@@ -305,8 +303,8 @@ Summary: The Perl procedural languages for PostgreSQL.
 Summary(ja): PostgreSQL用の手続き言語PL/Perl
 Group: programming
 Requires: %{name} = %{version}
-Obsoletes: postgresql7-pl
-Conflicts: postgresql8-pl
+Obsoletes: postgresql7-pl < 8.0.0
+Conflicts: postgresql8-pl < 9.0.0
 
 %description plperl
 The postgresql-plperl package contains the PL/Perl procedural language,
@@ -321,8 +319,8 @@ Summary: The Tcl procedural languages for PostgreSQL.
 Summary(ja): PostgreSQL用の手続き言語PL/Tcl
 Group: programming
 Requires: %{name} = %{version}
-Obsoletes: postgresql7-pl
-Conflicts: postgresql8-pl
+Obsoletes: postgresql7-pl < 8.0.0
+Conflicts: postgresql8-pl < 9.0.0
 
 %description pltcl
 The postgresql-pltcl package contains the PL/Tcl procedural language,
@@ -337,8 +335,8 @@ Summary: The Python3 procedural languages for PostgreSQL.
 Summary(ja): PostgreSQL用の手続き言語PL/Python
 Group: programming
 Requires: %{name} = %{version}
-Obsoletes: postgresql7-pl
-Conflicts: postgresql8-pl
+Obsoletes: postgresql7-pl < 8.0.0
+Conflicts: postgresql8-pl < 9.0.0
 
 %description plpython3
 The postgresql-plpython3 package contains the PL/Python3 procedural language,
@@ -353,8 +351,8 @@ Summary: The test suite distributed with PostgreSQL.
 Summary(ja): PostgreSQL と共に配布されるテストスート
 Group: other
 Requires: postgresql = %{version}
-Obsoletes: postgresql7-test
-Conflicts: postgresql8-test
+Obsoletes: postgresql7-test < 8.0.0
+Conflicts: postgresql8-test < 9.0.0
 
 %description test
 PostgreSQL is an advanced Object-Relational database management
@@ -840,6 +838,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri May 14 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 13.3-1
+- new upstream release.
+
 * Sat Apr 17 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 13.2-3
 - rebuilt with llvm-12.