.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -1,8 +1,2 @@
-Tk-804.028_503.tar.gz
+SOURCES/Tk-804.034.tar.gz
-/Tk-804.029_500.tar.gz
+SOURCES/perl-Tk-debian.patch.gz
-/Tk-804.030.tar.gz
-/Tk-804.031.tar.gz
-/Tk-804.032.tar.gz
-/Tk-804.033.tar.gz
-/Tk-804.034.tar.gz
-/Tk-804.035.tar.gz

.perl-Tk.metadata

@@ -0,0 +1,2 @@
+d6b826b85053b9b0fffc2b3fd23b37ecbbc084a7 SOURCES/Tk-804.034.tar.gz
+219fc1765a7868e00ed86b6778e46c67f95ae0c1 SOURCES/perl-Tk-debian.patch.gz

SPECS/perl-Tk.spec

@@ -4,13 +4,14 @@
 %global use_x11_tests 1
 
 Name:           perl-Tk
-Version:        804.035
+Version:        804.034
-Release:        8%{?dist}
+Release:        2%{?dist}
 Summary:        Perl Graphical User Interface ToolKit
 
+Group:          Development/Libraries
 License:        (GPL+ or Artistic) and SWL
-URL:            https://metacpan.org/release/Tk
+URL:            http://search.cpan.org/dist/Tk/
-Source0:        https://cpan.metacpan.org/authors/id/S/SR/SREZIC/Tk-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/Tk-%{version}.tar.gz
 Patch0:         perl-Tk-widget.patch
 # modified version of http://ftp.de.debian.org/debian/pool/main/p/perl-tk/perl-tk_804.027-8.diff.gz
 Patch1:         perl-Tk-debian.patch.gz
@@ -19,9 +20,6 @@ Patch2:         perl-Tk-seg.patch
 
 
 # Versions before this have Unicode issues
-BuildRequires:  coreutils
-BuildRequires:  make
-BuildRequires:  gcc-c++
 BuildRequires:  perl-devel >= 3:5.8.3
 BuildRequires:  perl-generators
 BuildRequires:  freetype-devel
@@ -65,11 +63,9 @@ BuildRequires:  perl(XSLoader)
 # X11 tests:
 BuildRequires:  xorg-x11-server-Xvfb
 BuildRequires:  xorg-x11-xinit
-BuildRequires:  google-noto-sans-fonts
 BuildRequires:  font(:lang=en)
 # Specific font is needed for tests, bug #1141117, CPAN RT#98831
 BuildRequires:  liberation-sans-fonts
-BuildRequires:  perl(blib)
 BuildRequires:  perl(constant)
 BuildRequires:  perl(Data::Dumper)
 BuildRequires:  perl(Devel::Peek)
@@ -87,7 +83,6 @@ BuildRequires:  perl(MIME::Base64)
 %endif
 
 Requires:       perl(:MODULE_COMPAT_%{perlver})
-Requires:       perl(locale)
 Provides:       perl(Tk::LabRadio) = 4.004
 Provides:       perl(Tk) = %{version}
 
@@ -105,9 +100,6 @@ Provides:       perl(Tk) = %{version}
 %global __provides_exclude %__provides_exclude|perl\\(Tk::Widget\\)$
 %global __provides_exclude %__provides_exclude|perl\\(Tk::Wm\\)$
 
-# Filter modules bundled for tests
-%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_libexecdir}
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(TkTest\\)
 
 %description
 This a re-port of a perl interface to Tk8.4.
@@ -125,40 +117,19 @@ Requires: perl-Tk = %{version}-%{release}
 %description devel
 %{summary}
 
-%package tests
-Summary:        Tests for %{name}
-Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:       perl-Test-Harness
-# X11 tests:
-Requires:       xorg-x11-server-Xvfb
-Requires:       xorg-x11-xinit
-Requires:       google-noto-sans-fonts
-Requires:       font(:lang=en)
-Requires:       liberation-sans-fonts
-
-%description tests
-Tests from %{name}. Execute them
-with "%{_libexecdir}/%{name}/test".
-
 %prep
 %setup -q -n Tk-%{version}
 find . -type f -exec %{__perl} -pi -e \
 's,^(#!)(/usr/local)?/bin/perl\b,$1%{__perl}, if ($. == 1)' {} \;
 chmod -x pod/Popup.pod Tixish/lib/Tk/balArrow.xbm
 # fix for widget as docs
-%patch -P0
+%patch0
 %{__perl} -pi -e \
 's,\@demopath\@,%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/demos,g' demos/widget
 # debian patch
-#%%patch -P1 -p1
+#%%patch1 -p1
 # patch to fix #235666 ... seems like caching code is broken
-%patch -P2 -p1 -b .seg
+%patch2 -p1 -b .seg
-
-# Help generators to recognize Perl scripts
-for F in t/*.t; do
-    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F"
-    chmod +x "$F"
-done
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor X11LIB=%{_libdir} XFT=1
@@ -167,7 +138,7 @@ make %{?_smp_mflags}
 
 %check
 %if %{use_x11_tests}
-    xvfb-run -d make test
+    xvfb-run -a make test
 %endif
 
 %install
@@ -182,28 +153,6 @@ mkdir __demos
 cp -pR $RPM_BUILD_ROOT%{perl_vendorarch}/Tk/demos __demos
 find __demos/ -type f -exec chmod -x {} \;
 
-# Install tests
-mkdir -p %{buildroot}%{_libexecdir}/%{name}
-cp -a t %{buildroot}%{_libexecdir}/%{name}
-rm %{buildroot}%{_libexecdir}/%{name}/t/pod.t
-mkdir -p %{buildroot}%{_libexecdir}/%{name}/demos/demos/images
-cp demos/demos/images/cursor* %{buildroot}%{_libexecdir}/%{name}/demos/demos/images
-perl -i -pe 's{-Mblib", "blib/script}{%{_bindir}}' %{buildroot}%{_libexecdir}/%{name}/t/exefiles.t
-perl -i -ne 'print $_ unless m{gedi}' %{buildroot}%{_libexecdir}/%{name}/t/exefiles.t
-
-cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
-#!/bin/bash
-set -e
-# Some tests write into temporary files/directories
-DIR=$(mktemp -d)
-pushd "$DIR"
-cp -a %{_libexecdir}/%{name}/* ./
-xvfb-run -d prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
-popd
-rm -rf "$DIR"
-EOF
-chmod +x %{buildroot}%{_libexecdir}/%{name}/test
-
 %files
 %doc Changes README README.linux ToDo pTk/*license* __demos/demos demos/widget COPYING
 %doc blib/man1/widget.1
@@ -226,58 +175,8 @@ chmod +x %{buildroot}%{_libexecdir}/%{name}/test
 %{perl_vendorarch}/Tk/install.pm
 %{perl_vendorarch}/Tk/MakeDepend.pm
 
-%files tests
-%{_libexecdir}/%{name}
 
 %changelog
-* Wed Mar 13 2024 Jitka Plesnikova <jplesnik@redhat.com> - 804.035-8
-- Enable building with FreeType support
-- Package tests
-- Resolves: RHEL-25202
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 804.035-7
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 804.035-6
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 804.035-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 804.035-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Petr Pisar <ppisar@redhat.com> - 804.035-3
-- Run-require locale module
-
-* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 804.035-2
-- Perl 5.32 rebuild
-
-* Wed Jun 17 2020 Jitka Plesnikova <jplesnik@redhat.com> - 804.035-1
-- 804.035 bump
-
-* Mon Feb 17 2020 Petr Pisar <ppisar@redhat.com> - 804.034-9
-- Build-require blib module for tests
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 804.034-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 804.034-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 804.034-6
-- Perl 5.30 rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 804.034-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 804.034-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 804.034-3
-- Perl 5.28 rebuild
-
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 804.034-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

Tk-804.032-travis-ci-test-5.20-instead-of-5.19.patch

@@ -1,29 +0,0 @@
-From 823f367d5e0952cead89646e0c7b7278a5e633b6 Mon Sep 17 00:00:00 2001
-From: Slaven Rezic <slaven@rezic.de>
-Date: Fri, 8 Aug 2014 08:56:51 +0200
-Subject: [PATCH 10/10] travis-ci: test 5.20 instead of 5.19
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- .travis.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.travis.yml b/.travis.yml
-index 8d4e90c..3cdb98f 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -15,7 +15,7 @@ before_install:
-  - (sleep 10; env DISPLAY=:123 $WINDOW_MANAGER) &
- matrix:
-  include:
--  - perl: "5.19"
-+  - perl: "5.20"
-     env: DISPLAY=:123 WINDOW_MANAGER=twm
- ## t/fbox.t fails, not reproducible on a freebsd system
- #  - perl: "5.18"
--- 
-1.9.3
-

gating.yaml

@@ -1,7 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-*
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

plans/sanity.fmf

@@ -1,5 +0,0 @@
-summary: Sanity tests
-discover:
-    how: fmf
-execute:
-    how: tmt

sources

@@ -1 +0,0 @@
-SHA512 (Tk-804.035.tar.gz) = ff6a236e7a2b25ff759a1bfdff517524ade337a03e6da8524f29b9ff958b4e01fe527e53fa7884179f3b1a15c0419a554eeedd471eb4c2f3a1baac5cc3ae1daa

tests/RHEL-25202-Enable-FreeType-support/main.fmf

@@ -1,25 +0,0 @@
-summary: Verify if FreeType support is enabled
-contact: Jitka Plesnikova <jplesnik@redhat.com>
-component:
-  - perl-Tk
-require:
-  - liberation-sans-fonts
-  - google-noto-sans-fonts
-  - perl-interpreter
-  - perl-Tk
-  - tk
-  - xorg-x11-server-Xvfb
-test: ./test.sh
-framework: beakerlib
-enabled: true
-tag:
-  - rhel-buildroot
-  - TestCaseCopy
-  - Tier1
-tier: '1'
-adjust:
-  - enabled: false
-    when: distro < rhel-8 or distro < centos-stream-8
-    continue: false
-extra-nitrate: TC#0617269
-id: eb6900f9-8efc-401d-9810-a5e9070d6005

tests/RHEL-25202-Enable-FreeType-support/test.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
-        rlRun "cp tk-test.sh tk-test.pl $tmp"
-        rlRun "pushd $tmp"
-        rlVirtualXStart "tk"
-        export DISPLAY="$( rlVirtualXGetDisplay \"tk\" )"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        # Get output from tcl/Tk test script
-	rlRun "./tk-test.sh > tcl-output.log" 0 "Running tcl/Tk test script'"
-
-	# Get output from perl-Tk test script
-	rlRun "./tk-test.pl > perl-output.log" 0 "Running perl-Tk test script'"
-
-	# Compare outputs
-	rlAssertNotDiffer "tcl-output.log" "perl-output.log"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlVirtualXStop "tk"
-        rlRun "popd"
-        rlRun "rm -r $tmp" 0 "Remove tmp directory"
-    rlPhaseEnd
-rlJournalEnd

tests/RHEL-25202-Enable-FreeType-support/tk-test.pl

@@ -1,6 +0,0 @@
-#!/usr/bin/perl
-use Tk;
-my $mw = MainWindow->new;
-foreach my $font (sort $mw->fontFamilies)
-{ print "$font\n"; }
-exit;

tests/RHEL-25202-Enable-FreeType-support/tk-test.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/tclsh
-package require Tk
-foreach font [lsort [font families]] {
-puts $font
-}
-exit

tests/upstream-tests.fmf

@@ -1,18 +0,0 @@
-summary: Upstream tests
-contact: Jitka Plesnikova <jplesnik@redhat.com>
-component: perl-Tk
-require:
-  - perl-Tk-tests
-test: /usr/libexec/perl-Tk/test
-enabled: true
-tag:
-  - rhel-buildroot
-  - TestCaseCopy
-  - Tier1
-tier: '1'
-adjust:
-  - enabled: false
-    when: distro < rhel-9 or distro < centos-stream-9
-    continue: false
-extra-nitrate: TC#0617268
-id: fe4aff5c-bfe7-4c98-9c06-84f1bdfb3fd2