From d856fa0e4ef1bd6eba41907801a5c15808d301b4 Mon Sep 17 00:00:00 2001 From: Dmitrij S. Kryzhevich Date: Jul 03 2015 04:02:44 +0000 Subject: Potential fix for rhbz #1238627 --- diff --git a/blt.spec b/blt.spec index 47ec1c1..4d45397 100644 --- a/blt.spec +++ b/blt.spec @@ -5,7 +5,7 @@ Summary: Widget extension to the Tcl/Tk scripting language Name: blt Version: 2.4 -Release: 45.z%{?dist} +Release: 46.z%{?dist} License: MIT Group: Development/Libraries @@ -22,14 +22,18 @@ Patch6: blt2.4z-zoomstack.patch Patch7: blt2.4z-tk8.5.6-patch Patch8: blt2.4z-tcl8.6.patch Patch9: blt2.4z-tk8.6.patch -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Provides: tk-blt = %{version}-%{release} BuildRequires: tk-devel >= 8.4.7 Requires: tk >= 8.4.7 -Requires: tcl(abi) = 8.6 itcl +Requires: itcl +%if 0%{?rhel} +Requires: tcl(abi) = 8.5 +%else +Requires: tcl(abi) = 8.6 +%endif %description @@ -74,8 +78,11 @@ This package provides the html documentation for BLT %patch5 -p0 %patch6 -p0 %patch7 -p1 + +%if 0%{?fedora} >= 21 %patch8 -p1 %patch9 -p1 +%endif # Fix bad interpreter path sed -i -e 's#/usr/local/bin/tclsh#/usr/bin/tclsh#' demos/scripts/page.tcl @@ -99,27 +106,22 @@ done sed -i -e 's#../bltwish#/usr/bin/wish#' demos/scripts/xcolors.tcl %install -rm -rf $RPM_BUILD_ROOT -make install INSTALL_ROOT=$RPM_BUILD_ROOT +make install INSTALL_ROOT=%{buildroot} # Fedora policy is not to generate new shells for Tcl extensions -rm -f $RPM_BUILD_ROOT%{_bindir}/bltsh* -rm -f $RPM_BUILD_ROOT%{_bindir}/bltwish* +rm -f %{buildroot}%{_bindir}/bltsh* +rm -f %{buildroot}%{_bindir}/bltwish* # Remove static libraries -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +rm -f %{buildroot}%{_libdir}/*.a # Remove some doc files from the script area -rm -f $RPM_BUILD_ROOT%{tcl_sitelib}/%{name}%{version}/{README,NEWS,PROBLEMS} +rm -f %{buildroot}%{tcl_sitelib}/%{name}%{version}/{README,NEWS,PROBLEMS} # Remove man pages. HTML documentation is already available. -rm -rf $RPM_BUILD_ROOT%{_mandir}/ - -%clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot}%{_mandir}/ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,0755) %doc README INSTALL PROBLEMS %{_libdir}/*.so %{tcl_sitelib}/%{name}%{version} @@ -130,14 +132,16 @@ rm -rf $RPM_BUILD_ROOT #%{_mandir}/mann/* %files doc -%defattr(-,root,root,0755) %doc html/ %files devel -%defattr(-,root,root,-) %{_includedir}/%{name} %changelog +* Fri Jul 03 2015 Dmitrij S. Kryzhevich - 2.4-46.z +- Fix requiers for EPEL (RHBZ #1238627). +- Clean spec (buildroot tag, clean section, rm buildroot). + * Tue Jun 30 2015 Dmitrij S. Kryzhevich - 2.4-45.z - Fix for RHBZ #1105266.