public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Filipe Rosset <filiperosset@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/tklib] f44: fixes FTBFS on rawhide rhbz#2435153 and rhbz#2385698
Date: Tue, 14 Jul 2026 04:57:37 GMT [thread overview]
Message-ID: <178400505713.1.7504906056104455155.rpms-tklib-55944a9d9f2f@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/tklib
Branch : f44
Commit : 55944a9d9f2ff8062df9c8cb303efcb80931cc3d
Author : Filipe Rosset <filiperosset@fedoraproject.org>
Date : 2026-07-13T15:10:12-03:00
Stats : +30/-8 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/tklib/c/55944a9d9f2ff8062df9c8cb303efcb80931cc3d?branch=f44
Log:
fixes FTBFS on rawhide rhbz#2435153 and rhbz#2385698
Signed-off-by: Filipe Rosset <filiperosset@fedoraproject.org>
---
diff --git a/tklib-0.5-tcl9-encoding.patch b/tklib-0.5-tcl9-encoding.patch
new file mode 100644
index 0000000..0a5a9b0
--- /dev/null
+++ b/tklib-0.5-tcl9-encoding.patch
@@ -0,0 +1,17 @@
+--- tklib-0.5/sak.tcl.orig 2008-01-27 15:00:00.000000000 -0300
++++ tklib-0.5/sak.tcl 2008-01-27 15:00:00.000000000 -0300
+@@ -2,6 +2,14 @@
+ # -*- tcl -*- \
+ exec tclsh "$0" ${1+"$@"}
+
++# Override open command to force iso8859-1 encoding to prevent Tcl 9 encoding errors
++rename open _original_open
++proc open {args} {
++ set fh [uplevel 1 [list _original_open {*}$args]]
++ catch {fconfigure $fh -encoding iso8859-1}
++ return $fh
++}
++
+ # --------------------------------------------------------------
+ # Perform various checks and operations on the distribution.
+ # SAK = Swiss Army Knife.
diff --git a/tklib.spec b/tklib.spec
index 8449a52..42cd47f 100644
--- a/tklib.spec
+++ b/tklib.spec
@@ -1,17 +1,19 @@
-%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
-%{!?tcl_sitelib: %define tcl_sitelib %{_datadir}/tcl%{tcl_version}}
+%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitelib: %global tcl_sitelib %{_datadir}/tcl%{tcl_version}}
Summary: Collection of widgets and other packages for Tk
Name: tklib
Version: 0.5
-Release: 33%{?dist}
+Release: 34%{?dist}
License: TCL
Source: http://downloads.sourceforge.net/tcllib/tklib-0.5.tar.gz
+Patch0: tklib-0.5-tcl9-encoding.patch
URL: http://tcllib.sourceforge.net/
BuildArch: noarch
Requires: tcl(abi) = 8.6 tk tcllib
-BuildRequires: make
-BuildRequires: tk >= 0:8.3.1 tcllib
+BuildRequires: make
+BuildRequires: tcllib
+BuildRequires: tk >= 0:8.3.1
%description
This package is intended to be a collection of Tcl packages that provide
@@ -19,7 +21,8 @@ Tk utility functions and widgets useful to a large collection of Tcl/Tk
programmers.
%prep
-%setup -q
+%autosetup -p1
+
# Remove some execute permission bits on files that aren't executable
# to suppress some rpmlint warnings.
chmod a-x modules/plotchart/*.tcl
@@ -40,8 +43,7 @@ mv -f modules/ctext/ctext.man.new modules/ctext/ctext.man
# Don't bother running 'make' because there's nothing to build.
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
%check
make check
@@ -52,6 +54,9 @@ make check
%{_mandir}/*/*
%changelog
+* Mon Jul 13 2026 Filipe Rosset <filiperosset@fedoraproject.org> - 0.5-34
+- fixes FTBFS on rawhide rhbz#2435153 and rhbz#2385698
+
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.5-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
reply other threads:[~2026-07-14 4:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178400505713.1.7504906056104455155.rpms-tklib-55944a9d9f2f@fedoraproject.org \
--to=filiperosset@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox