rpms/sqlite/F-10 sqlite-3.5.9-tclver.patch, NONE, 1.1 sqlite.spec, 1.42, 1.43

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/sqlite/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31372

Modified Files:
	sqlite.spec 
Added Files:
	sqlite-3.5.9-tclver.patch 
Log Message:
- fix tcl module version so it gets loaded properly (#469129)
- pull bunch of other tcl-module related fixes from devel:
  - require tcl(abi) in sqlite-tcl subpackage (#474034)
  - move tcl extensions to arch-specific location
  - enable dependency extraction on the tcl dso
- require pkgconfig in sqlite-devel


sqlite-3.5.9-tclver.patch:

--- NEW FILE sqlite-3.5.9-tclver.patch ---
--- sqlite-3.5.9/Makefile.in	2008-05-12 10:10:26.000000000 -0700
+++ sqlite-3.5.9/Makefile.in.new	2008-12-12 23:45:15.000000000 -0800
@@ -703,7 +703,7 @@
 	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig; 
 
 tcl_install:	libtclsqlite3.la
-	$(TCLSH_CMD) $(TOP)/tclinstaller.tcl $(VERSION)
+	$(TCLSH_CMD) $(TOP)/tclinstaller.tcl $(RELEASE)
 
 clean:	
 	rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la


Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/F-10/sqlite.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sqlite.spec	17 Jan 2009 17:05:41 -0000	1.42
+++ sqlite.spec	30 Jan 2009 18:56:46 -0000	1.43
@@ -6,7 +6,7 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.5.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -18,11 +18,15 @@
 Patch3: sqlite-3.5.9-remove-temporary.patch
 # Upstream fix http://www.sqlite.org/cvstrac/chngview?cn=5396
 Patch4: sqlite-3.5.9-nan-ix86-fix.patch
+# Fixed upstream somewhere between 3.5.9 and 3.6.6.2
+Patch5: sqlite-3.5.9-tclver.patch
 Obsoletes: sqlite3 sqlite3-devel
 BuildRequires: ncurses-devel%{?_isa} readline-devel glibc-devel%{?_isa}
 BuildRequires: /usr/bin/tclsh
 %if %{with tcl}
 BuildRequires: tcl-devel%{_isa}
+%{!?tcl_version: %global tcl_version 8.5}
+%{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %endif
 BuildRoot: %{_tmppath}/%{name}-root
 
@@ -39,6 +43,7 @@
 Summary: Development tools for the sqlite3 embeddable SQL database engine.
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 This package contains the header files and development documentation 
@@ -50,6 +55,7 @@
 Summary: Tcl module for the sqlite3 embeddable SQL database engine.
 Group: Development/Languages
 Requires: %{name} = %{version}-%{release}
+Requires: tcl(abi) = %{tcl_version}
 
 %description tcl
 This package contains the tcl modules for %{name}.
@@ -61,6 +67,7 @@
 %patch2 -p1 -b .libdl
 %patch3 -p1 -b .remove-temp
 %patch4 -p1 -b .nan-ix86-fix
+%patch5 -p1 -b .tclver
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_DISABLE_DIRSYNC=1 -Wall"
@@ -75,7 +82,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make DESTDIR=${RPM_BUILD_ROOT} install
+make DESTDIR=${RPM_BUILD_ROOT} %{?with_tcl:TCLLIBDIR=%{tcl_sitearch}} install
 
 %{__install} -D -m0644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
 
@@ -83,6 +90,11 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a}
 %endif
 
+%if %{with tcl}
+# fix up permissions to enable dep extraction
+chmod 0755 ${RPM_BUILD_ROOT}/%{tcl_sitearch}/sqlite3/*.so
+%endif
+
 %if %{with check}
 %check
 make test
@@ -112,13 +124,21 @@
 %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %endif
+
 %if %{with tcl}
 %files tcl
 %defattr(-, root, root)
-%{_datadir}/tcl*/sqlite3
+%{tcl_sitearch}/sqlite3
 %endif
 
 %changelog
+* Fri Jan 30 2009 Panu Matilainen <pmatilai at redhat.com> - 3.5.9-4
+- fix tcl module version so it gets loaded properly (#469129)
+- require tcl(abi) in sqlite-tcl subpackage (#474034)
+- move tcl extensions to arch-specific location
+- enable dependency extraction on the tcl dso
+- require pkgconfig in sqlite-devel
+
 * Sat Jan 17 2009 Panu Matilainen <pmatilai at redhat.com> - 3.5.9-3
 - Floating point handling fix on x86 (#474260)