[packages/iwidgets] - updated to 4.1 snapshot for itcl/itk 4 (iwidgets 4.0.x for itcl/itk 3 left on iwidgets-4.0 branch)

[qboosh]

commit 03fb249ffda86970f84c6c68272dcd0659a2da75
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Apr 20 19:48:15 2016 +0200

    - updated to 4.1 snapshot for itcl/itk 4 (iwidgets 4.0.x for itcl/itk 3 left on iwidgets-4.0 branch)
    - removed outdated standalone patch

 iwidgets-standalone.patch | 28 ----------------------
 iwidgets.spec             | 60 ++++++++++++++++++++++++++---------------------
 2 files changed, 33 insertions(+), 55 deletions(-)
---
diff --git a/iwidgets.spec b/iwidgets.spec
index a631341..48a7a4b 100644
--- a/iwidgets.spec
+++ b/iwidgets.spec
@@ -1,21 +1,28 @@
+#
+# Conditional build:
+%bcond_with	examples	# examples (not present in 4.1 snapshots)
+#
 Summary:	[incr Widgets] - object-oriented widget set based in [incr Tcl] and [incr Tk]
 Summary(pl.UTF-8):	[incr Widgets] - zbiór obiektowo zorientowanych widgetów opartych na [incr Tcl] i [incr Tk]
 Name:		iwidgets
-Version:	4.0.2
-%define snap	20080403
-Release:	1
-License:	distributable
+Version:	4.1
+%define snap	20120928
+Release:	0.%{snap}.1
+License:	BSD-like
 Group:		Development/Languages/Tcl
 #Source0:	http://downloads.sourceforge.net/incrtcl/iwidgets%{iwidgets_version}.tar.gz
-Source0:	%{name}-CVS-%{snap}.tar.bz2
-# Source0-md5:	7741d7e0b231a4875b0998d6b5c00615
-Patch0:		%{name}-standalone.patch
+# http://core.tcl.tk/iwidgets - iwidgets for itcl/itk 4
+Source0:	http://downloads.sourceforge.net/kbskit/iwidgets41.tgz
+# Source0-md5:	5a60ec284bd8095c665287215ff2a69f
 URL:		http://incrtcl.sourceforge.net/iwidgets/index.html
 BuildRequires:	autoconf >= 2.13
-BuildRequires:	tcl >= 8.4.6
-BuildRequires:	tk >= 8.4.6
-Requires:	itcl >= 3.4.1
-Requires:	itk >= 3.4
+BuildRequires:	tcl >= 8.6
+BuildRequires:	tk >= 8.6
+Requires:	itcl >= 4.0
+Requires:	itk >= 4.0
+%if %{without examples}
+Obsoletes:	iwidgets-examples
+%endif
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -61,39 +68,38 @@ Examples for iwidgets.
 Przykłady dla biblioteki iwidgets.
 
 %prep
-%setup -q -n %{name}
-%patch0 -p1
-
-%build
-%{__autoconf}
-%configure \
-	--libdir=%{_ulibdir} \
-	--with-itcl=%{_ulibdir}
+%setup -q -n %{name}%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install -d $RPM_BUILD_ROOT%{_ulibdir}/iwidgets%{version}
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+cp -p library/* $RPM_BUILD_ROOT%{_ulibdir}/iwidgets%{version}
 
 ln -sf %{_ulibdir}/iwidgets%{version} $RPM_BUILD_ROOT%{_ulibdir}/iwidgets
 
-mv -f $RPM_BUILD_ROOT%{_ulibdir}/iwidgets%{version}/demos/* \
+%if %{with examples}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+%{__mv} $RPM_BUILD_ROOT%{_ulibdir}/iwidgets%{version}/demos/* \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES ChangeLog README license.terms
+%doc README license.terms
 %{_ulibdir}/iwidgets
 %dir %{_ulibdir}/iwidgets%{version}
-%{_ulibdir}/iwidgets%{version}/*.tcl
-%{_ulibdir}/iwidgets%{version}/scripts
-%{_mandir}/mann/iwidgets_*.n*
+%{_ulibdir}/iwidgets%{version}/*.itcl
+%{_ulibdir}/iwidgets%{version}/*.itk
+%{_ulibdir}/iwidgets%{version}/unknownimage.gif
+%{_ulibdir}/iwidgets%{version}/pkgIndex.tcl
+%{_ulibdir}/iwidgets%{version}/tclIndex
 
+%if %{with examples}
 %files examples
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}-%{version}
+%endif
diff --git a/iwidgets-standalone.patch b/iwidgets-standalone.patch
deleted file mode 100644
index 6679817..0000000
--- a/iwidgets-standalone.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- iwidgets/configure.in.orig	2005-04-11 22:34:09.000000000 +0200
-+++ iwidgets/configure.in	2011-11-27 14:28:03.725046782 +0100
-@@ -35,20 +35,12 @@
- #--------------------------------------------------------------------
- 
- AC_ARG_WITH(itcl, [  --with-itcl=DIR         use Itcl 3.0 binaries from DIR],
--        itcl_search=$withval, itcl_search=`cd ${srcdir}/..; pwd`)
-+        itcl_search=$withval, itcl_search=$libdir)
- 
--ITCL_LIB_DIR=""
--if test -r $itcl_search/itcl/library/itcl.tcl \
--	-a -r $itcl_search/itk/library/itk.tcl; then
--    ITCL_LIB_DIR=$itcl_search/itcl/library
--    ITCL_SRC_DIR=$itcl_search/itcl
--    ITK_LIB_DIR=$itcl_search/itk/library
--    ITK_SRC_DIR=$itcl_search/itk
--fi
--
--if test -z "$ITCL_LIB_DIR"; then
--    AC_MSG_ERROR([Can't find Itcl source.  Use --with-itcl to specify the the toplevel [incr Tcl] directory on your system.  This directory should contain itcl/library/itcl.tcl, itk/library/itk.tcl.])
--fi
-+ITCL_LIB_DIR="$itcl_search"
-+ITCL_SRC_DIR="$itcl_search"
-+ITK_LIB_DIR="$itcl_search"
-+ITK_SRC_DIR="$itcl_search"
- 
- #--------------------------------------------------------------------
- # Handle the --prefix=... option by defaulting to what Tcl gave.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/iwidgets.git/commitdiff/03fb249ffda86970f84c6c68272dcd0659a2da75