rpms/blt/devel blt2.4-tk8.5.patch,NONE,1.1 blt.spec,1.16,1.17

[Sergio Pascual (sergiopr)]

Author: sergiopr

Update of /cvs/pkgs/rpms/blt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16223

Modified Files:
	blt.spec 
Added Files:
	blt2.4-tk8.5.patch 
Log Message:
* Fri Jan 04 2008 Sergio Pascual <sergiopr at fedoraproject.org> 2.4-20
- Rebuilt for tk 8.5 (added patch)
- Following PackagingDrafts/Tcl


blt2.4-tk8.5.patch:

--- NEW FILE blt2.4-tk8.5.patch ---
diff -ur blt2.4z/src/bltNsUtil.h blt2.4z.new/src/bltNsUtil.h
--- blt2.4z/src/bltNsUtil.h	2002-07-18 08:35:32.000000000 +0200
+++ blt2.4z.new/src/bltNsUtil.h	2008-01-04 14:59:22.000000000 +0100
@@ -46,9 +46,8 @@
 #define TCL_NAMESPACE_ONLY TCL_GLOBAL_ONLY
 #endif
 
-
-EXTERN Tcl_Command Tcl_FindCommand _ANSI_ARGS_((Tcl_Interp *interp,
-	char *name, Tcl_Namespace *nsPtr, int flags));
+/*EXTERN Tcl_Command Tcl_FindCommand _ANSI_ARGS_((Tcl_Interp *interp,
+	char *name, Tcl_Namespace *nsPtr, int flags));*/
 
 #define NS_SEARCH_NONE		(0)
 #define NS_SEARCH_CURRENT	(1<<0)
@@ -64,7 +63,7 @@
 EXTERN Tcl_Namespace *Tcl_GetGlobalNamespace _ANSI_ARGS_((Tcl_Interp *interp));
 
 #if (TCL_MAJOR_VERSION >= 8)
-EXTERN Tcl_Namespace *Tcl_CreateNamespace _ANSI_ARGS_((Tcl_Interp *interp,
+/*EXTERN Tcl_Namespace *Tcl_CreateNamespace _ANSI_ARGS_((Tcl_Interp *interp,
 	char *name, ClientData clientData, Tcl_NamespaceDeleteProc *nsDelProc));
 
 EXTERN void Tcl_DeleteNamespace _ANSI_ARGS_((Tcl_Namespace *nsPtr));
@@ -85,6 +84,7 @@
 
 extern Tcl_HashTable *Blt_GetArrayVariableTable _ANSI_ARGS_((
 	Tcl_Interp *interp, CONST char *varName, int flags));
+*/
 
 #endif /* TCL_MAJOR_VERSION >= 8 */
 


Index: blt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blt/devel/blt.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- blt.spec	15 Nov 2007 07:29:08 -0000	1.16
+++ blt.spec	4 Jan 2008 14:34:39 -0000	1.17
@@ -1,17 +1,26 @@
+%{!?tcl_version: %define tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitearch: %define tcl_sitearch %{_libdir}/tcl%{tcl_version}}
+
 Summary: BLT widget extension to Tcl/Tk scripting language development
 Name: blt
 Version: 2.4
-Release: 19%{?dist}
+Release: 20%{?dist}
 
 License: MIT
 Group: Development/Libraries
-Source: http://download.sourceforge.net/blt/BLT2.4z.tar.gz
+URL: http://sourceforge.net/projects/blt/
+Source0: http://download.sourceforge.net/blt/BLT2.4z.tar.gz
 Patch0: http://download.sourceforge.net/blt/blt2.4z-patch-2
 Patch1: http://jfontain.free.fr/blt2.4z-patch-64
-URL: http://sourceforge.net/projects/blt/
+Patch2: blt2.4-tk8.5.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
+
+Provides: tk-blt = %{version}-%{release}
 BuildRequires: tk-devel >= 8.4.7
+
 Requires: tk >= 8.4.7
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%__id_u -n)
+Requires: tcl(abi) = 8.5
+
 
 %description
 BLT is a very powerful extension to Tk. It adds plotting widgets
@@ -41,6 +50,7 @@
 %setup -q -n %{name}%{version}z
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --with-tcl=%{_libdir} --with-tk=%{_libdir}
@@ -49,7 +59,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-DIRECTORY=$RPM_BUILD_ROOT%{_libdir}/%{name}%{version}
+DIRECTORY=$RPM_BUILD_ROOT%{tcl_sitearch}/%{name}%{version}
 install -d $DIRECTORY
 install -m 755 -p src/shared/libBLT24.so src/shared/libBLTlite24.so $DIRECTORY
 install -m 644 -p library/*.{pro,tcl,xbm} library/tclIndex $DIRECTORY
@@ -60,7 +70,7 @@
 rm -f html/Makefile.vc
 # File in /etc/ld.so.conf.d
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
-echo "%{_libdir}/blt2.4" >> $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+echo "%{tcl_sitearch}/%{name}%{version}" >> $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,13 +83,17 @@
 %defattr(-,root,root,0755)
 %doc README INSTALL PROBLEMS html/
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/*
-%{_libdir}/%{name}%{version}/
+%{tcl_sitearch}/%{name}%{version}/
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/blt/*
 
 %changelog
+* Fri Jan 04 2008 Sergio Pascual <sergiopr at fedoraproject.org> 2.4-20
+- Rebuilt for tk 8.5 (added patch)
+- Following PackagingDrafts/Tcl
+
 * Thu Nov 15 2007 Sergio Pascual <sergiopr at fedoraproject.org> 2.4-19
 - Renaming the file in /etc/ld.so.conf.d to %%name