rpms/tix/devel tix-8.4.2-tcl8.5.patch,NONE,1.1 tix.spec,1.21,1.22

[Vitezslav Crhonek (vcrhonek)]

Author: vcrhonek

Update of /cvs/extras/rpms/tix/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24859

Modified Files:
	tix.spec 
Added Files:
	tix-8.4.2-tcl8.5.patch 
Log Message:
fix for build with tcl8.5

tix-8.4.2-tcl8.5.patch:

--- NEW FILE tix-8.4.2-tcl8.5.patch ---
diff -up Tix8.4.2/generic/tixWidget.c_old Tix8.4.2/generic/tixWidget.c
--- Tix8.4.2/generic/tixWidget.c_old	2005-03-25 21:15:53.000000000 +0100
+++ Tix8.4.2/generic/tixWidget.c	2008-01-08 10:12:36.000000000 +0100
@@ -231,6 +231,10 @@ TIX_DEFINE_CMD(Tix_CreateWidgetCmd)
 	    Tcl_SetVar2(interp, "errorCode", NULL, oldErrorCode,
 		TCL_GLOBAL_ONLY);
 	}
+/* ERR_IN_PROGRESS isn't defined in tcl8.5 */
+#ifndef ERR_IN_PROGRESS
+#define ERR_IN_PROGRESS 0
+#endif
 	iPtr->flags |= ERR_IN_PROGRESS;
     }
     if (widCmd) {


Index: tix.spec
===================================================================
RCS file: /cvs/extras/rpms/tix/devel/tix.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- tix.spec	28 Aug 2007 08:17:24 -0000	1.21
+++ tix.spec	8 Jan 2008 09:36:16 -0000	1.22
@@ -1,3 +1,5 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %define tixmajor 8.4
 %define tcltkver 8.4.13
 
@@ -5,13 +7,15 @@
 Name: tix
 Epoch: 1
 Version: %{tixmajor}.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Group: Development/Languages
 URL: http://tix.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/tix/Tix%{version}-src.tar.gz
 Patch0: tix-8.4.2-link.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Patch1: tix-8.4.2-tcl8.5.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: tcl(abi) = 8.5
 Requires: tcl >= %{tcltkver}, tk >= %{tcltkver}
 Buildrequires: tcl-devel >= %{tcltkver}, tk-devel >= %{tcltkver}
 BuildRequires: libX11-devel
@@ -52,22 +56,25 @@
 %prep
 %setup -q -n Tix%{version}
 %patch0 -p1 -b .link
+%patch1 -p1 -b .err
 
 %build
-%configure
-make all %{?_smp_mflags} PKG_LIB_FILE=libTix%{tixmajor}.so
+%configure --libdir=%{tcl_sitearch}
+make all %{?_smp_mflags} PKG_LIB_FILE=libTix.so
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PKG_LIB_FILE=libTix%{tixmajor}.so
+make install DESTDIR=$RPM_BUILD_ROOT PKG_LIB_FILE=libTix.so
 
-# move shared lib
-mv $RPM_BUILD_ROOT%{_libdir}/Tix%{version}/libTix%{tixmajor}.so \
-	$RPM_BUILD_ROOT%{_libdir}
-ln -sf ../libTix%{tixmajor}.so \
-	$RPM_BUILD_ROOT%{_libdir}/Tix%{version}/libTix%{tixmajor}.so
-ln -sf libTix%{tixmajor}.so $RPM_BUILD_ROOT%{_libdir}/libTix.so
-ln -sf libTix%{tixmajor}.so $RPM_BUILD_ROOT%{_libdir}/libtix.so
+# move shared lib to tcl sitearch
+mv $RPM_BUILD_ROOT%{tcl_sitearch}/Tix%{version}/libTix.so \
+	$RPM_BUILD_ROOT%{tcl_sitearch}
+pwd
+# make links
+ln -sf ../libTix.so \
+	$RPM_BUILD_ROOT%{tcl_sitearch}/Tix%{version}/libTix.so
+ln -sf libTix.so $RPM_BUILD_ROOT%{_libdir}/libTix.so
+ln -sf libTix.so $RPM_BUILD_ROOT%{_libdir}/libtix.so
 
 # install demo scripts
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/Tix%{tixmajor}
@@ -76,7 +83,6 @@
 # the header and man pages were in the previous package, keeping for now...
 mkdir -p $RPM_BUILD_ROOT%{_includedir}
 install -m 0644 generic/tix.h $RPM_BUILD_ROOT%{_includedir}/tix.h
-
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/mann
 cp man/*.n $RPM_BUILD_ROOT%{_mandir}/mann
 
@@ -97,8 +103,8 @@
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/libTix%{tixmajor}.so
-%{_libdir}/Tix%{version}
+%{tcl_sitearch}/libTix.so
+%{tcl_sitearch}/Tix%{version}
 %{_datadir}/Tix%{tixmajor}
 %doc *.txt *.html license.terms
 
@@ -114,6 +120,12 @@
 %doc docs/*
 
 %changelog
+* Mon Jan  7 2008 Marcela Maslanova <mmaslano at redhat.com> - 1:8.4.2-3
+- fix for build with tcl8.5
+- change the installing paths
+- remove unusued variable
+- fix BuildRoot
+
 * Tue Aug 28 2007 Vitezslav Crhonek <vcrhonek at redhat.com> - 1:8.4.2-2
 - Rebuild