[iwidgets] Fix itcl/itc version requirement

Dmitrij S. Kryzhevich krege at fedoraproject.org
Fri Aug 29 05:38:12 UTC 2014


commit f0dfb927395eb52947a9191c17a2f95f1f7fbd9c
Author: Dmitrij S. Kryzhevich <krege at land.ru>
Date:   Fri Aug 29 12:38:13 2014 +0700

    Fix itcl/itc version requirement

 iwidgets.spec |   50 ++++++++++++++++++++++++--------------------------
 1 files changed, 24 insertions(+), 26 deletions(-)
---
diff --git a/iwidgets.spec b/iwidgets.spec
index 0477e72..3df9f3c 100644
--- a/iwidgets.spec
+++ b/iwidgets.spec
@@ -3,7 +3,7 @@
 
 Name:           iwidgets
 Version:        4.0.2
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        A set of useful widgets based on itcl and itk
 
 Group:          Development/Libraries
@@ -12,7 +12,6 @@ URL:            http://incrtcl.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/sourceforge/incrtcl/iwidgets4.0.1.tar.gz
 Patch0:         iwidgets-4.0.2-tkversion.patch
 Patch1:         iwidgets4.0.1-wish85.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 Requires:       tcl(abi) = 8.6 itk
@@ -31,45 +30,40 @@ A set of useful widgets based on itcl and itk.
 # Installation is simple enough that it's easier to manually install the
 # files than try to patch the configure script and Makefile to work.
 
-sed -e "s#@ITCL_VERSION@#3.2#" -e "s#@VERSION@#%{version}#" < iwidgets.tcl.in > iwidgets.tcl
+sed -e "s#@ITCL_VERSION@#4.0#" -e "s#@VERSION@#%{version}#" < iwidgets.tcl.in > iwidgets.tcl
 sed -e "s#@VERSION@#%{version}#" < pkgIndex.tcl.in > pkgIndex.tcl
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}
-install -p -m 644 generic/*.* $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}
-install -p -m 644 generic/tclIndex $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}
-install -p -m 644 iwidgets.tcl $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}
-install -p -m 644 pkgIndex.tcl $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}
-
-mkdir -p $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos
+mkdir -p %{buildroot}/%{tcl_sitelib}/%{name}%{version}
+install -p -m 644 generic/*.* %{buildroot}/%{tcl_sitelib}/%{name}%{version}
+install -p -m 644 generic/tclIndex %{buildroot}/%{tcl_sitelib}/%{name}%{version}
+install -p -m 644 iwidgets.tcl %{buildroot}/%{tcl_sitelib}/%{name}%{version}
+install -p -m 644 pkgIndex.tcl %{buildroot}/%{tcl_sitelib}/%{name}%{version}
+
+mkdir -p %{buildroot}/%{tcl_sitelib}/%{name}%{version}/demos
 for i in demos/* ; do
     if [ -f $i ] ; then
-        install -p -m 644 $i $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos
+        install -p -m 644 $i %{buildroot}/%{tcl_sitelib}/%{name}%{version}/demos
     fi
 done
-chmod 755 $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos/catalog
+chmod 755 %{buildroot}/%{tcl_sitelib}/%{name}%{version}/demos/catalog
 # Remove rpmlint warning.
-chmod 755 $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos/scopedobject
+chmod 755 %{buildroot}/%{tcl_sitelib}/%{name}%{version}/demos/scopedobject
 
-mkdir -p $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos/images
-install -p -m 644 demos/images/*.* $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos/images
+mkdir -p %{buildroot}/%{tcl_sitelib}/%{name}%{version}/demos/images
+install -p -m 644 demos/images/*.* %{buildroot}/%{tcl_sitelib}/%{name}%{version}/demos/images
 
 # These html pages are part of the demonstration scripts, so they aren't
 # packaged with the rest of the documentation.
-mkdir -p $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos/html
-install -p -m 644 demos/html/*.html $RPM_BUILD_ROOT/%{tcl_sitelib}/%{name}%{version}/demos/html
+mkdir -p %{buildroot}/%{tcl_sitelib}/%{name}%{version}/demos/html
+install -p -m 644 demos/html/*.html %{buildroot}/%{tcl_sitelib}/%{name}%{version}/demos/html
 
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/mann
-install -p -m 644 doc/*.n $RPM_BUILD_ROOT/%{_mandir}/mann/
+mkdir -p %{buildroot}/%{_mandir}/mann
+install -p -m 644 doc/*.n %{buildroot}/%{_mandir}/mann/
 # This file conflicts with the one from tk-devel
-rm $RPM_BUILD_ROOT/%{_mandir}/mann/panedwindow.n
+rm %{buildroot}/%{_mandir}/mann/panedwindow.n
 # This file conflicts with the one from tklib
-rm $RPM_BUILD_ROOT/%{_mandir}/mann/datefield.n
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+rm %{buildroot}/%{_mandir}/mann/datefield.n
 
 %files
 %{tcl_sitelib}/iwidgets%{version}
@@ -77,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc README license.terms doc/iwidgets.ps
 
 %changelog
+* Fri Aug 29 2014 Dmitrij S. Kryzhevich <krege at land.ru> - 4.0.2-14
+- Fix itcl/itk verstion requirement.
+- Some cleanup of spec (clean section, buildroot tag).
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0.2-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list