Browse Source

updated 8 packages

expect-5.45.4-1

postgresql-12.0-1

python-2.7.16-4

python3-3.5.7-3

rp-pppoe-3.13-3

tcl-8.6.9-1

tix-8.4.3-4

tk-8.6.9-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12236 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
18f8d65f97

+ 20 - 5
e/expect/expect-vl.spec

@@ -1,20 +1,20 @@
 %{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
 %{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 
-%define tcl_major 8.4
+%define tcl_major 8.6
 %define majorver 5.45
 
 Summary: A Tcl/Tk development environment: expect 
 Summary(ja): Tcl/Tk 開発環境: expect
 Name: expect
-Version: %{majorver}
-Release: 2%{?_dist_release}
+Version: %{majorver}.4
+Release: 1%{?_dist_release}
 License: Public Domain
 Group: Development/Languages
 # URL: probably more useful is http://sourceforge.net/projects/expect/
-URL: http://expect.nist.gov/
+URL: https://core.tcl-lang.org/expect/index
 
-Source: http://downloads.sourceforge.net/%{name}/%{name}%{version}.tar.gz
+Source: https://downloads.sourceforge.net/%{name}/%{name}%{version}.tar.gz
 # Patch0: fixes change log file permissions
 Patch0: expect-5.43.0-log_file.patch
 # Patch1: fixes install location, change pkgIndex
@@ -32,6 +32,10 @@ Patch5: expect-5.45-exp-log-buf-overflow.patch
 Patch6: expect-5.45-segfault-with-stubs.patch
 # Patch7: fixes leaked fd, patch by Matej Mužila, rhbz#1001220
 Patch7: expect-5.45-fd-leak.patch
+# Patch8: unificates usage message of expect binary and man page, adds -h flag
+Patch8: expect-5.45.4-unification-of-usage-and-man-page.patch
+# Patch9: fixes issues detected by static analysis
+Patch9: expect-5.45.4-covscan-fixes.patch
 # examples patches
 # Patch100: changes random function
 Patch100: expect-5.32.2-random.patch
@@ -44,6 +48,8 @@ Patch102: expect-5.45-check-telnet.patch
 Patch103: expect-5.45-passmass-su-full-path.patch
 # Patch104: rhbz 963889, fixes inaccuracy in mkpasswd man page
 Patch104: expect-5.45-mkpasswd-man.patch
+# Patch105: Fix error with -Werror=format-security
+Patch105: expect-5.45-format-security.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: tk-devel >= %{tcl_major}
@@ -98,12 +104,15 @@ of expectk.
 %patch5 -p1 -b .exp-log-buf-overflow
 %patch6 -p1 -b .segfault-with-stubs
 %patch7 -p1 -b .fd-leak
+%patch8 -p1 -b .unification-of-usage-and-man-page
+%patch9 -p1 -b .covscan-fixes
 # examples fixes
 %patch100 -p1 -b .random
 %patch101 -p1 -b .mkpasswd-dash
 %patch102 -p1 -b .check-telnet
 %patch103 -p1 -b .passmass-su-full-path
 %patch104 -p1 -b .mkpasswd-man
+%patch105 -p0 -b .format-security
 # -pkgpath.patch touch configure.in
 aclocal
 autoconf
@@ -192,6 +201,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.45.4-1
+- new upstream release.
+- built with tcl/tk-8.6.9.
+- updated patches.
+- imported Patch8, 9 and 105 from rawhide.
+
 * Sat Dec 5 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.45-2
 - fixed a symlink.
 - fixed BR:.

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

@@ -15,13 +15,14 @@
 %define nls 1
 %define pam 1
 
-%define pgver 10
+%define pgver 12
 
-Summary: PostgreSQL client programs and libraries.
-Summary(ja): PostgreSQL のクライアントプログラム群およびライブラリ
+Summary: PostgreSQL client programs
+Summary(ja): PostgreSQL のクライアントプログラム群
 Name: postgresql
-Version: %{pgver}.3
+Version: 12.0
 Release: 1%{?_dist_release}
+%global pgver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
 # Conventions for PostgreSQL Global Development Group RPM releases:
 #
 # Official PostgreSQL Development Group RPMS have a PGDG after the release number.
@@ -44,9 +45,9 @@ Release: 1%{?_dist_release}
 
 License: BSD
 Group: Applications/Databases
-Source0: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
+Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
 Source3: postgresql.init
-Source5: ftp://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2.sha256
+Source5: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2.sha256
 Source6: README.rpm-dist
 Source15: postgresql-bashprofile
 Patch2: postgresql-8.3.3-nls.patch
@@ -124,15 +125,15 @@ Distribution: Vine Linux
 PostgreSQL is an advanced Object-Relational database management system
 (DBMS) that supports almost all SQL constructs (including
 transactions, subselects and user-defined types and functions). The
-postgresql package includes the client programs and libraries that
-you'll need to access a PostgreSQL DBMS server.  These PostgreSQL
-client programs are programs that directly manipulate the internal
-structure of PostgreSQL databases on a PostgreSQL server. These client
-programs can be located on the same machine with the PostgreSQL
-server, or may be on a remote machine which accesses a PostgreSQL
-server over a network connection. This package contains the docs
-in HTML for the whole package, as well as command-line utilities for
-managing PostgreSQL databases on a PostgreSQL server. 
+postgresql package includes the client programs that you'll need
+to access a PostgreSQL DBMS server.  These PostgreSQL client programs
+are programs that directly manipulate the internal structure of
+PostgreSQL databases on a PostgreSQL server. These client programs
+can be located on the same machine with the PostgreSQL server,
+or may be on a remote machine which accesses a PostgreSQL server
+over a network connection. This package contains the docs in HTML
+for the whole package, as well as command-line utilities for managing
+PostgreSQL databases on a PostgreSQL server. 
 
 If you want to manipulate a PostgreSQL database on a remote PostgreSQL
 server, you need this package. You also need to install this package
@@ -143,13 +144,13 @@ PostgreSQLはSQLの構成要素(トランザクション、副問い合わせお
 定義型やユーザ定義関数など)のほとんどすべてをサポートした、先進的なオブ
 ジェクト指向のデータベース管理システム(DBMS)です。postgresqlのパッケー
 ジにはPostgreSQL DBMS サーバにアクセスするために必要なクライアントプロ
-グラムおよびライブラリを収録しています。PostgreSQLクライアントプログラ
-ムは、PostgreSQLサーバ上のPostgreSQLデータベースの内部構造を直接操作す
-るためのプログラムです。これらのクライアントプログラムは、PostgreSQLサ
-ーバと同じマシン上で動いていてもよいですし、ネットワークコネクションの
-向こう側にあるリモートマシン上にあっても構いません。このパッケージには
-PostgreSQLサーバ上のPostgreSQLデータベースを管理するためのユーティリテ
-ィに加え、全パッケージのドキュメントがHTML形式で収録されています。
+グラムを収録しています。PostgreSQLクライアントプログラムは、PostgreSQL
+サーバ上のPostgreSQLデータベースの内部構造を直接操作するためのプログラ
+ムです。これらのクライアントプログラムは、PostgreSQLサーバと同じマシン
+上で動いていてもよいですし、ネットワークコネクションの向こう側にあるリ
+モートマシン上にあっても構いません。このパッケージにはPostgreSQLサーバ
+上のPostgreSQLデータベースを管理するためのユーティリティに加え、全パッ
+ケージのドキュメントがHTML形式で収録されています。
 
 リモートにあるPostgreSQLサーバ上のPostgreSQLデータベースを操作する場合
 はこのパッケージが必要です。またpostgresql-serverパッケージをインスト
@@ -442,6 +443,7 @@ install -m 644 ./doc/src/sgml/man7/* $RPM_BUILD_ROOT/%{_mandir}/man7
 %find_lang initdb-%{pgver}
 %find_lang pg_archivecleanup-%{pgver}
 %find_lang pg_basebackup-%{pgver}
+%find_lang pg_checksums-%{pgver}
 %find_lang pg_config-%{pgver}
 %find_lang pg_controldata-%{pgver}
 %find_lang pg_ctl-%{pgver}
@@ -468,10 +470,11 @@ cat psql-%{pgver}.lang pg_dump-%{pgver}.lang > main.lst
 cat pg_config-%{pgver}.lang > devel.lst
 cat initdb-%{pgver}.lang pg_archivecleanup-%{pgver}.lang \
 	pg_basebackup-%{pgver}.lang pg_controldata-%{pgver}.lang \
-	pg_ctl-%{pgver}.lang pg_resetwal-%{pgver}.lang \
-	pg_rewind-%{pgver}.lang pg_test_fsync-%{pgver}.lang \
-	pg_test_timing-%{pgver}.lang pg_upgrade-%{pgver}.lang \
-	pg_waldump-%{pgver}.lang postgres-%{pgver}.lang \
+	pg_checksums-%{pgver}.lang pg_ctl-%{pgver}.lang \
+	pg_resetwal-%{pgver}.lang pg_rewind-%{pgver}.lang \
+	pg_test_fsync-%{pgver}.lang pg_test_timing-%{pgver}.lang \
+	pg_upgrade-%{pgver}.lang pg_waldump-%{pgver}.lang \
+	postgres-%{pgver}.lang \
 	> server.lst
 %ifarch !x86_64
 cat scripts-%{pgver}.lang >> server.lst
@@ -571,8 +574,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f main.lst
 %defattr(-,root,root)
+%license COPYRIGHT
 %doc doc/KNOWN_BUGS doc/MISSING_FEATURES
-%doc COPYRIGHT README HISTORY INSTALL doc/bug.template
+%doc README HISTORY INSTALL doc/bug.template
 %doc README.rpm-dist
 ##doc doc/html
 %{_bindir}/clusterdb
@@ -619,7 +623,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/postgresql/bloom.so
 %{_libdir}/postgresql/btree_gin.so
 %{_libdir}/postgresql/btree_gist.so
-%{_libdir}/postgresql/chkpass.so
+#%{_libdir}/postgresql/chkpass.so
 %{_libdir}/postgresql/citext.so
 %{_libdir}/postgresql/cube.so
 %{_libdir}/postgresql/dblink.so
@@ -652,7 +656,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/postgresql/tablefunc.so
 %{_libdir}/postgresql/tcn.so
 %{_libdir}/postgresql/test_decoding.so
-%{_libdir}/postgresql/timetravel.so
+#%{_libdir}/postgresql/timetravel.so
 %{_libdir}/postgresql/unaccent.so
 %{_bindir}/oid2name
 %{_bindir}/pg_standby
@@ -680,6 +684,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/initdb
 %{_bindir}/pg_archivecleanup
 %{_bindir}/pg_basebackup
+%{_bindir}/pg_checksums
 %{_bindir}/pg_controldata
 %{_bindir}/pg_ctl
 %{_bindir}/pg_isready
@@ -697,6 +702,7 @@ rm -rf $RPM_BUILD_ROOT
 ##{_mandir}/man1/ipcclean.*
 %{_mandir}/man1/pg_archivecleanup.*
 %{_mandir}/man1/pg_basebackup.*
+%{_mandir}/man1/pg_checksums.*
 %{_mandir}/man1/pg_controldata.*
 %{_mandir}/man1/pg_ctl.*
 %{_mandir}/man1/pg_isready.*
@@ -710,6 +716,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/pg_waldump.*
 %{_mandir}/man1/postgres.*
 %{_mandir}/man1/postmaster.*
+%dir %{_libdir}/postgresql
 %{_libdir}/postgresql/dict_snowball.so
 %{_libdir}/postgresql/libpqwalreceiver.so
 %{_libdir}/postgresql/pg_prewarm.so
@@ -718,6 +725,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/postgresql/euc2004_sjis2004.so
 %{_libdir}/postgresql/tsm_system_rows.so
 %{_libdir}/postgresql/tsm_system_time.so
+%dir %{_datadir}/pgsql
+%{_datadir}/pgsql/errcodes.txt
 %{_datadir}/pgsql/extension
 %{_datadir}/pgsql/*.sql
 %{_datadir}/pgsql/postgres.bki
@@ -728,8 +737,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pgsql/timezone
 %{_datadir}/pgsql/timezonesets
 %{_datadir}/pgsql/tsearch_data
-%dir %{_libdir}/postgresql
-%dir %{_datadir}/pgsql
 %attr(700,postgres,postgres) %dir /var/lib/pgsql
 %attr(700,postgres,postgres) %dir /var/lib/pgsql/data
 %attr(700,postgres,postgres) %dir /var/lib/pgsql/backups
@@ -744,8 +751,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files static
 %{_libdir}/libpgcommon.a
+%{_libdir}/libpgcommon_shlib.a
 %{_libdir}/libpgfeutils.a
 %{_libdir}/libpgport.a
+%{_libdir}/libpgport_shlib.a
 
 %if %tcl
 %files tcl -f tcl.lst
@@ -758,6 +767,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %plperl
 %{_libdir}/postgresql/plperl.so
 %{_libdir}/postgresql/hstore_plperl.so
+%{_libdir}/postgresql/jsonb_plperl.so
 %endif
 %if %pltcl
 %{_libdir}/postgresql/pltcl.so
@@ -767,6 +777,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/postgresql/plpython2.so
 %{_libdir}/postgresql/hstore_plpython2.so
 %{_libdir}/postgresql/ltree_plpython2.so
+%{_libdir}/postgresql/jsonb_plpython2.so
 %endif
 %endif
 
@@ -778,6 +789,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 12.0-1
+- new upstream release.
+
 * Fri Mar 02 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.3-1
 - new upstream release.
 

+ 10 - 7
p/python/python-vl.spec

@@ -2,8 +2,8 @@
 %define run_test %{?_run_test:1}%{!?_run_test:0}
 %define unicode ucs4
 %define bsddb_ver 4.8
-%define tcl_major 8.5
-%define tk_major 8.5
+%define tcl_major 8.6
+%define tk_major 8.6
 %define tix_major 8.4
 %define pybasever 2.7
 %define python_lib %{_libdir}/python%{pybasever}
@@ -12,14 +12,14 @@ Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向言語 Python インタプリタ
 Name: python
 Version: %{pybasever}.16
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 License: PSF
 Group: Development/Languages
-URL: http://www.python.org/%{pybasever}/
+URL: https://www.python.org/%{pybasever}/
 
-Source0: http://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
-Source1: http://docs.python.org/2/archives/python-%{version}-docs-html.tar.bz2
-Source2: http://python-doc-ja.googlecode.com/files/python-doc-%{pybasever}ja1-html.zip
+Source0: https://www.python.org/ftp/python/%{version}/Python-%{version}.tar.xz
+Source1: https://docs.python.org/2/archives/python-%{version}-docs-html.tar.bz2
+Source2: https://python-doc-ja.googlecode.com/files/python-doc-%{pybasever}ja1-html.zip
 Source6: shmmodule.c
 
 Patch0: python-2.7.1-config.patch
@@ -480,6 +480,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.7.16-4
+- rebuilt with tcl/tk-8.6.9.
+
 * Sat Aug 31 2019 Toshiaki Ara <ara_t@384.jp> 2.7.16-3
 - rebuild with readline-8.0 and ncurses-6.1
 

+ 4 - 1
p/python3/python3-vl.spec

@@ -8,7 +8,7 @@ Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向 Python3 インタプリタ
 Name: python3
 Version: 3.5.7
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: PSF
 Group: Development/Languages
 URL: http://www.python.org/download/releases/%{version}
@@ -292,6 +292,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.7-3
+- rebuilt with tcl/tk-8.6.9.
+
 * Sat Aug 31 2019 Toshiaki Ara <ara_t@384.jp> 3.5.7-2
 - rebuild with readline-8.0 and ncurses-6.1
 

+ 10 - 5
r/rp-pppoe/rp-pppoe-vl.spec

@@ -1,12 +1,12 @@
 Summary: PPP Over Ethernet (xDSL support)
 Name: rp-pppoe
-Version: 3.11
+Version: 3.13
 Release: 3%{?_dist_release}
 Group: System Environment/Daemons
 License: GPL
-URL: http://www.roaringpenguin.com/pppoe/
+URL: https://dianne.skoll.ca/projects/rp-pppoe/
 
-Source0: http://www.roaringpenguin.com/pppoe/%{name}-%{version}.tar.gz
+Source0: https://dianne.skoll.ca/projects/rp-pppoe/download/%{name}-%{version}.tar.gz
 Source1: tkpppoe.desktop
 Source2: rp-pppoe-3.5-ja.msg
 Source3: tkpppoe-html_ja.tar.gz
@@ -27,7 +27,8 @@ Distribution: Vine Linux
 Summary: GUI wrapper around the rp-pppoe PPPoE client
 Summary(ja): rp-pppoe GUIラッパー
 Group: Applications/Internet 
-Requires: %{name} >= 3.0, tk >= 8.4.1
+Requires: %{name} = %{version}-%{release}
+Requires: tk >= 8.6
 
 %description
 PPPoE (Point-to-Point Protocol over Ethernet) is a protocol used by
@@ -103,7 +104,8 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE
+%license doc/LICENSE
+%doc doc/CHANGES doc/HOW-TO-CONNECT doc/KERNEL-MODE-PPPOE
 %doc doc/PROBLEMS README
 %config %{_sysconfdir}/rc.d/init.d/pppoe
 %config(noreplace) %{_sysconfdir}/ppp/pppoe.conf
@@ -135,6 +137,9 @@ fi
 %config(missingok) %{_datadir}/applications/tkpppoe.desktop
 
 %changelog
+* Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.13-1
+- new upstream release.
+
 * Fri Nov  2 2012 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 3.11-1
 - new upstream release 
 - update patch10

+ 159 - 12
t/tcl/tcl-vl.spec

@@ -1,7 +1,11 @@
-%define majorver 8.5
-%define minorver 15
+%define majorver 8.6
+%define minorver 9
 %define version %{majorver}.%{minorver}
-%define htmlver %{majorver}.15
+%define htmlver %{majorver}.%{minorver}
+
+%global itcl_version 4.1.2
+%global tdbc_version 1.1.0
+%global thread_version 2.8.4
 
 %{!?sdt:%define sdt 0}
 
@@ -9,17 +13,19 @@ Summary: A Tcl/Tk development environment: tcl
 Summary(ja): Tcl/Tk 開発環境: tcl
 Name: tcl
 Version: %{version}
-Release: 3%{?_dist_release}
+Release: 1%{?_dist_release}
 Group: Development/Languages
 License: TCL
 URL:     http://tcl.sourceforge.net/
 
-Source0: http://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
-Source1: http://prdownloads.sourceforge.net/tcl/%{name}%{htmlver}-html.tar.gz
+Source0: https://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
+Source1: https://prdownloads.sourceforge.net/tcl/%{name}%{htmlver}-html.tar.gz
 # patches from Red Hat Enterprise Linux tcl-8.5.7-6.el6
 Patch100: tcl-8.5.1-autopath.patch
-Patch101: tcl-8.5.15-conf.patch
 Patch102: tcl-8.5.0-hidden.patch
+# Upstream ticket:
+# https://core.tcl.tk/tcl/tktview/7d0db7c388f52de81faf12da332bc97a24f7b9e5
+Patch103: tcl-8.6.5-parallel-make-fix.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Buildrequires: autoconf
@@ -58,18 +64,84 @@ tclsh, a simple example of a Tcl application.
 The package contains the development files and man pages for tcl.
 
 
+%package itcl
+Summary: Object oriented extensions to Tcl and Tk
+Summary(ja): Tcl/Tk のオブジェクト指向拡張
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Provides: itcl = %{itcl_version}
+Obsoletes: itcl < 4.0.0
+
+%description itcl
+[incr Tcl] is Tcl extension that provides object-oriented features that are
+missing from the Tcl language.
+
+
+%package itcl-devel
+Summary: Development headers and libraries for linking against tcl-itcl
+Summary(ja): tcl-itclとリンクするためのヘッダ・ライブラリ
+Group: Development/Libraries
+Requires: %{name}-itcl = %{version}-%{release}
+Provides: itcl-devel = %{itcl_version}
+Obsoletes: itcl-devel < 4.0.0
+
+%description itcl-devel
+Development headers and libraries for linking against itcl.
+
+
+%package tdbc
+Summary: database extensions to Tcl and Tk
+Summary(ja): Tcl/Tk のデータベース拡張
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Provides: tdbc = %{tdbc_version}
+
+%description tdbc
+tdbc is Tcl extension that provides database features to tcl/tk.
+
+
+%package tdbc-devel
+Summary: Development headers and libraries for linking against tcl-tdbc
+Summary(ja): tcl-tdbcとリンクするためのヘッダ・ライブラリ
+Group: Development/Libraries
+Requires: %{name}-tdbc = %{version}-%{release}
+Requires: sqlite3-tcl
+Provides: tdbc-devel = %{tdbc_version}
+
+%description tdbc-devel
+Development headers and libraries for linking against tdbc.
+
+
+%package thread
+Summary: thread extensions to Tcl and Tk
+Summary(ja): Tcl/Tk のスレッド拡張
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Provides: thread = %{thread_version}
+Obsoletes: thread < 2.8.0
+
+%description thread
+ You can use this extension to gain script-level access to Tcl threading
+capabilities.
+
+
 %prep
 %setup -n %{name}%{version} -q -a 1
 mv tcl%{htmlver}/html .
 
 %patch100 -p1 -b .autopath
-%patch101 -p1 -b .conf
 %patch102 -p1 -b .hidden
+%patch103 -p1 -b .parallel-make-fix
+
+pushd unix
+sed -i -e 's/@SHLIB_LD@/@SHLIB_LD@ -fPIC -Wl,-soname,libtcl%{majorver}.so/' Makefile.in
+popd
 
 %build
 pushd unix
 autoconf
 %configure \
+--disable-rpath \
 %if %sdt
 --enable-dtrace \
 %endif
@@ -77,7 +149,7 @@ autoconf
 --enable-symbols \
 --enable-shared
 
-make %{?_smp_mflags} TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
+make %{?_smp_mflags} CFLAGS="%{optflags} -fPIC" TCL_LIBRARY=%{_datadir}/%{name}%{majorver}
 
 
 %install
@@ -97,17 +169,22 @@ ln -s %{_libdir}/%{name}Config.sh $RPM_BUILD_ROOT/%{_libdir}/%{name}%{majorver}/
 
 mkdir -p $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/{generic,unix}
 find generic unix -name "*.h" -exec cp -p '{}' $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/'{}' ';'
-( cd $RPM_BUILD_ROOT/%{_includedir}
+pushd $RPM_BUILD_ROOT/%{_includedir}
 	for i in *.h ; do
 		[ -f $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic/$i ] && ln -sf ../../$i $RPM_BUILD_ROOT/%{_includedir}/%{name}-private/generic ;
 	done
-)
+popd
 
 # remove buildroot traces
 sed -i -e "s|$PWD/unix|%{_libdir}|; s|$PWD|%{_includedir}/%{name}-private|" $RPM_BUILD_ROOT/%{_libdir}/%{name}Config.sh
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/tclAppInit.c
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/%{name}%{majorver}/ldAix
 
+
+# sqlite3 extension is provided by sqlite3-tcl
+rm -rf %{buildroot}%{_libdir}/sqlite3*
+rm -f %{buildroot}%{_mandir}/mann/sqlite3*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -117,8 +194,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%license license.terms
 %doc README changes 
-%doc license.terms
 %doc html/*
 %{_bindir}/tclsh*
 %{_libdir}/libtcl%{majorver}.so
@@ -127,17 +204,87 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/tcl%{majorver}
 %{_mandir}/man1/*
 %{_mandir}/mann/*
+# itcl
+%exclude %{_mandir}/mann/body.n*
+%exclude %{_mandir}/mann/class.n*
+%exclude %{_mandir}/mann/code.n*
+%exclude %{_mandir}/mann/configbody.n*
+%exclude %{_mandir}/mann/delete.n*
+%exclude %{_mandir}/mann/ensemble.n*
+%exclude %{_mandir}/mann/find.n*
+%exclude %{_mandir}/mann/is.n*
+%exclude %{_mandir}/mann/itcl*.n*
+%exclude %{_mandir}/mann/local.n*
+%exclude %{_mandir}/mann/scope.n*
+# tdbc
+%exclude %{_mandir}/mann/tdbc*
+# thread
+%exclude %{_mandir}/mann/thread.n*
+%exclude %{_mandir}/mann/tpool.n*
+%exclude %{_mandir}/mann/tsv.n*
+%exclude %{_mandir}/mann/ttrace.n*
+
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
+%{_libdir}/pkgconfig/tcl.pc
 %{_libdir}/libtcl.so
 %{_libdir}/libtclstub%{majorver}.a
 %{_libdir}/tclConfig.sh
+%{_libdir}/tclooConfig.sh
 %{_libdir}/tcl%{majorver}/tclConfig.sh
 %{_mandir}/man3/*
 
+%files itcl
+%{_libdir}/itcl*
+%exclude %{_libdir}/itcl*/itclConfig.sh
+%exclude %{_libdir}/itcl*/libitclstub*.a
+%{_mandir}/mann/body.n*
+%{_mandir}/mann/class.n*
+%{_mandir}/mann/code.n*
+%{_mandir}/mann/configbody.n*
+%{_mandir}/mann/delete.n*
+%{_mandir}/mann/ensemble.n*
+%{_mandir}/mann/find.n*
+%{_mandir}/mann/is.n*
+%{_mandir}/mann/itcl*.n*
+%{_mandir}/mann/local.n*
+%{_mandir}/mann/scope.n*
+
+%files itcl-devel
+%{_libdir}/itcl*/itclConfig.sh
+%{_libdir}/itcl*/libitclstub*.a
+%{_includedir}/itcl*.h
+
+%files tdbc
+%{_libdir}/tdbc*
+%exclude %{_libdir}/tdbc*/libtdbcstub*.a
+%exclude %{_libdir}/tdbc*/tdbcConfig.sh
+%{_bindir}/sqlite3_analyzer
+%{_libdir}/tcl8/%{majorver}/tdbc/sqlite3-*.tm
+%{_mandir}/mann/tdbc*
+
+%files tdbc-devel
+%{_libdir}/tdbc*/libtdbcstub*.a
+%{_libdir}/tdbc*/tdbcConfig.sh
+%{_includedir}/tdbc*.h
+
+%files thread
+%{_libdir}/thread*
+%{_mandir}/mann/thread.n*
+%{_mandir}/mann/tpool.n*
+%{_mandir}/mann/tsv.n*
+%{_mandir}/mann/ttrace.n*
+
+
 %changelog
+* Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.9-1
+- new upstream release.
+- dropped Patch101: get same effects by sed and configure options.
+- imported Patch103.
+- added subpackages: itcl{,-devel}, tdbc{,-devel} and thread.
+
 * Mon Jan 26 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 8.5.15-3
 - split development files into devel subpackage
 

+ 23 - 13
t/tix/tix-vl.spec

@@ -1,6 +1,6 @@
-%define tcl_major	8.5
-%define tk_major	8.5
-%define thread_major	2.7
+%define tcl_major	8.6
+%define tk_major	8.6
+%define thread_major	2.8
 %define tix_major	8.4
 %define tixversion	%{tix_major}.3
 ## can't find all provides
@@ -10,23 +10,27 @@ Summary: A Tcl/Tk development environment: tix
 Summary(ja): Tcl/Tk 開発環境: tix
 Name: tix
 Version: %{tixversion}
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 Group: Development/Languages
 License: BSD
-URL: http://tix.sourceforge.net/
+Vendor: Project Vine
+Distribution: Vine Linux
 
+URL: http://tix.sourceforge.net/
 Source0: Tix%{tixversion}-src.tar.gz
-Patch20: tix-8.1.4-perf.patch
-Patch22: tix-8.2.0b1-dirtree.patch
+#  0: Fixes BZ#81297 (soname of libraries)
+Patch0: tix-8.4.2-link.patch
+Patch1: tix-8.4.3-tcl86.patch
+Patch2: tix-8.4.3-covscan-fixes.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: tcl >= %{tcl_major}
-BuildRequires: tk >= %{tk_major}
-BuildRequires: thread >= %{thread_major}
+BuildRequires: tcl-devel >= %{tcl_major}
+BuildRequires: tk-devel >= %{tk_major}
+BuildRequires: tcl-thread
 BuildRequires: libX11-devel
 Requires: tcl >= %{tcl_major}
 Requires: tk >= %{tk_major}
-Requires: thread >= %{thread_major}
+Requires: tcl-thread
 
 %description
 Tix (Tk Interface Extension), an add-on for the Tk widget set, is an
@@ -53,8 +57,9 @@ Tk で、より複雑ななウィジェットを試したい時には、tix パ
 
 %prep
 %setup -q -n Tix%{tixversion}
-#patch20 -p1 -b .perf
-#patch22 -p1 -b .dirtree
+%patch0 -p1 -b .link
+%patch1 -p1 -b .tcl86
+%patch2 -p1 -b .covscan-fixes
 
 %build
 # make the libraries reentrant
@@ -155,6 +160,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.4.3-4
+- rebuilt with tcl/tk-8.6.9.
+- dropped all patches.
+- imported Patch0-2 from rawhide.
+
 * Wed Dec 31 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 8.4.3-3
 - rebuilt with tcl/tk 8.5.15 and thread 2.7.1
 

+ 22 - 18
t/tk/tk-vl.spec

@@ -1,21 +1,14 @@
-%define majorver	8.5
-%define minorver	15
+%define majorver	8.6
+%define minorver	9
 Summary: A Tcl/Tk development environment: tk
 Summary(ja): Tcl/Tk 開発環境: tk
 Name: tk
 Version: %{majorver}.%{minorver}
-Release: 2%{?_dist_release}
+Release: 1%{?_dist_release}
 Group: Development/Languages
 License: TCL
-URL: http://tcl.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
-# patches from Red Hat Enterprise Linux tk-8.5.7-6.el6
-Patch101: tk8.5-make.patch
-Patch102: tk8.5-conf.patch
-# this patch isn't needed since tk8.6b1
-Patch103: tk-seg_input.patch
-# fixes sigsegv if there is no font seen by fontconfig (#606671)
-Patch105: tk-8.5.7-nofont-sigsegv.patch
+URL: https://tcl.sourceforge.net/
+Source0: https://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf
@@ -65,15 +58,17 @@ The package contains the development files and man pages for tk.
 %prep
 %setup -n %{name}%{version} -q
 
-%patch101 -p1 -b .make
-%patch102 -p1 -b .conf
-%patch103 -p1 -b .seg
-%patch105 -p1 -b .nofont-sigsegv
+sed -i -e 's/555/755/g' unix/Makefile.in
+sed -i -e 's/@SHLIB_LD@/@SHLIB_LD@ -fPIC -Wl,-soname,libtk%{majorver}.so/' unix/Makefile.in
 
 %build
 cd unix
 autoconf
-%configure
+
+export CFLAGS="%{optflags} -fPIC"
+%configure \
+--disable-rpath
+
 make %{?_smp_mflags} TK_LIBRARY=%{_datadir}/%{name}%{majorver}
 
 %install
@@ -109,7 +104,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README changes license.terms
+%license license.terms
+%doc README changes
 %{_bindir}/wish*
 %{_datadir}/tk%{majorver}
 %{_libdir}/libtk%{majorver}.so
@@ -124,9 +120,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libtk.so
 %{_libdir}/libtkstub%{majorver}.a
 %{_libdir}/tkConfig.sh
+%{_libdir}/pkgconfig/tk.pc
 %{_mandir}/man3/*
 
 %changelog
+* Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.9-1
+- new upstream release.
+- dropped Patch102: get same effects by sed and configure options.
+- dropped Patch101: get same effects by sed.
+- dropped Patch103: fixed in upstream.
+- dropped Patch105: fixed in upstream.
+
 * Mon Jan 26 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 8.5.15-2
 - split development files into devel subpackage
 - added BR: libXft-devel