Browse Source

updated 2 packages

tcl-8.6.10-1

tk-8.6.10-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12419 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 3 years ago
parent
commit
57e8a6e382
2 changed files with 31 additions and 30 deletions
  1. 22 23
      t/tcl/tcl-vl.spec
  2. 9 7
      t/tk/tk-vl.spec

+ 22 - 23
t/tcl/tcl-vl.spec

@@ -1,31 +1,29 @@
-%define majorver 8.6
-%define minorver 9
-%define version %{majorver}.%{minorver}
-%define htmlver %{majorver}.%{minorver}
-
-%global itcl_version 4.1.2
-%global tdbc_version 1.1.0
-%global thread_version 2.8.4
+%global itcl_version 4.2.0
+%global tdbc_version 1.1.1
+%global thread_version 2.8.5
 
 
 %{!?sdt:%define sdt 0}
 %{!?sdt:%define sdt 0}
 
 
 Summary: A Tcl/Tk development environment: tcl
 Summary: A Tcl/Tk development environment: tcl
 Summary(ja): Tcl/Tk 開発環境: tcl
 Summary(ja): Tcl/Tk 開発環境: tcl
 Name: tcl
 Name: tcl
-Version: %{version}
+Version: 8.6.10
+%global majorver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+%global minorver %(echo %{version} | sed -e 's/^.*\.//')
+%global htmlver %{version}
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Group: Development/Languages
 Group: Development/Languages
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: TCL
 License: TCL
 URL:     http://tcl.sourceforge.net/
 URL:     http://tcl.sourceforge.net/
-
 Source0: https://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
 Source0: https://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
 Source1: https://prdownloads.sourceforge.net/tcl/%{name}%{htmlver}-html.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
-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
+Patch0: tcl-8.6.10-autopath.patch
+Patch1: tcl-8.6.10-conf.patch
+Patch2: tcl-8.6.10-hidden.patch
+Patch3: tcl-8.6.10-tcltests-path-fix.patch
 
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Buildrequires: autoconf
 Buildrequires: autoconf
@@ -34,9 +32,6 @@ BuildRequires: zlib-devel
 BuildRequires: systemtap-sdt-devel
 BuildRequires: systemtap-sdt-devel
 %endif
 %endif
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 %description
 Tcl is a simple scripting language designed to be embedded into
 Tcl is a simple scripting language designed to be embedded into
 other applications.  Tcl is designed to be used with Tk, a widget
 other applications.  Tcl is designed to be used with Tk, a widget
@@ -129,9 +124,10 @@ capabilities.
 %setup -n %{name}%{version} -q -a 1
 %setup -n %{name}%{version} -q -a 1
 mv tcl%{htmlver}/html .
 mv tcl%{htmlver}/html .
 
 
-%patch100 -p1 -b .autopath
-%patch102 -p1 -b .hidden
-%patch103 -p1 -b .parallel-make-fix
+%patch0 -p1 -b .autopath
+%patch1 -p1 -b .conf
+%patch2 -p1 -b .hidden
+%patch3 -p1 -b .tcltests-path-fix
 
 
 pushd unix
 pushd unix
 sed -i -e 's/@SHLIB_LD@/@SHLIB_LD@ -fPIC -Wl,-soname,libtcl%{majorver}.so/' Makefile.in
 sed -i -e 's/@SHLIB_LD@/@SHLIB_LD@ -fPIC -Wl,-soname,libtcl%{majorver}.so/' Makefile.in
@@ -141,7 +137,6 @@ popd
 pushd unix
 pushd unix
 autoconf
 autoconf
 %configure \
 %configure \
---disable-rpath \
 %if %sdt
 %if %sdt
 --enable-dtrace \
 --enable-dtrace \
 %endif
 %endif
@@ -279,6 +274,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Wed Jul 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.10-1
+- new upstream release.
+- replaced all patches to the newest rawhide's.
+
 * Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.9-1
 * Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.9-1
 - new upstream release.
 - new upstream release.
 - dropped Patch101: get same effects by sed and configure options.
 - dropped Patch101: get same effects by sed and configure options.

+ 9 - 7
t/tk/tk-vl.spec

@@ -1,11 +1,14 @@
-%define majorver	8.6
-%define minorver	9
 Summary: A Tcl/Tk development environment: tk
 Summary: A Tcl/Tk development environment: tk
 Summary(ja): Tcl/Tk 開発環境: tk
 Summary(ja): Tcl/Tk 開発環境: tk
 Name: tk
 Name: tk
-Version: %{majorver}.%{minorver}
+Version: 8.6.10
+%global majorver %(echo %{version} | sed -e 's/\.[0-9]*$//')
+%global minorver %(echo %{version} | sed -e 's/^.*\.//')
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Group: Development/Languages
 Group: Development/Languages
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: TCL
 License: TCL
 URL: https://tcl.sourceforge.net/
 URL: https://tcl.sourceforge.net/
 Source0: https://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
 Source0: https://prdownloads.sourceforge.net/tcl/%{name}%{version}-src.tar.gz
@@ -18,10 +21,6 @@ BuildRequires: tcl-devel = %{version}
 Requires: tcl >= %{majorver}
 Requires: tcl >= %{majorver}
 Provides: libtk%{majorver}.so
 Provides: libtk%{majorver}.so
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
-
 %description 
 %description 
 Tk is a X Windows widget set designed to work closely with the tcl
 Tk is a X Windows widget set designed to work closely with the tcl
 scripting language. It allows you to write simple programs with full
 scripting language. It allows you to write simple programs with full
@@ -124,6 +123,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 %{_mandir}/man3/*
 
 
 %changelog
 %changelog
+* Wed Jul 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.10-1
+- new upstream release.
+
 * Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.9-1
 * Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.6.9-1
 - new upstream release.
 - new upstream release.
 - dropped Patch102: get same effects by sed and configure options.
 - dropped Patch102: get same effects by sed and configure options.