.gitignore

@@ -1,2 +1,2 @@
-SOURCES/Tk-804.034.tar.gz
+SOURCES/Tk-804.035.tar.gz
 SOURCES/perl-Tk-debian.patch.gz

.perl-Tk.metadata

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

SPECS/perl-Tk.spec

@@ -4,14 +4,13 @@
 %global use_x11_tests 1
 
 Name:           perl-Tk
-Version:        804.034
-Release:        2%{?dist}
+Version:        804.035
+Release:        8%{?dist}
 Summary:        Perl Graphical User Interface ToolKit
 
-Group:          Development/Libraries
 License:        (GPL+ or Artistic) and SWL
-URL:            http://search.cpan.org/dist/Tk/
-Source0:        http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/Tk-%{version}.tar.gz
+URL:            https://metacpan.org/release/Tk
+Source0:        https://cpan.metacpan.org/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
@@ -20,6 +19,9 @@ 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
@@ -63,9 +65,11 @@ 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)
@@ -83,6 +87,7 @@ BuildRequires:  perl(MIME::Base64)
 %endif
 
 Requires:       perl(:MODULE_COMPAT_%{perlver})
+Requires:       perl(locale)
 Provides:       perl(Tk::LabRadio) = 4.004
 Provides:       perl(Tk) = %{version}
 
@@ -100,6 +105,9 @@ 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.
@@ -117,19 +125,40 @@ 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
-%patch0
+%patch -P0
 %{__perl} -pi -e \
 's,\@demopath\@,%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/demos,g' demos/widget
 # debian patch
-#%%patch1 -p1
+#%%patch -P1 -p1
 # patch to fix #235666 ... seems like caching code is broken
-%patch2 -p1 -b .seg
+%patch -P2 -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
@@ -138,7 +167,7 @@ make %{?_smp_mflags}
 
 %check
 %if %{use_x11_tests}
-    xvfb-run -a make test
+    xvfb-run -d make test
 %endif
 
 %install
@@ -153,6 +182,28 @@ 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
@@ -175,8 +226,58 @@ find __demos/ -type f -exec chmod -x {} \;
 %{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