dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: sqlite
-# $Id: Makefile,v 1.1 2005/03/09 20:01:47 jbj Exp $
-NAME := sqlite
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

sqlite-3.5.9-nan-ix86-fix.patch

@@ -0,0 +1,13 @@
+diff -up sqlite-3.5.9/src/util.c.nan-ix86-fix sqlite-3.5.9/src/util.c
+--- sqlite-3.5.9/src/util.c.nan-ix86-fix	2008-05-13 19:41:50.000000000 +0300
++++ sqlite-3.5.9/src/util.c	2009-01-17 12:30:30.000000000 +0200
+@@ -35,7 +35,8 @@ int sqlite3IsNaN(double x){
+   **      rules/specifications for math functions.
+   */
+   volatile double y = x;
+-  return x!=y;
++  volatile double z = y;
++  return y!=z;
+ }
+ 
+ /*

sqlite-3.5.9-tclver.patch

@@ -0,0 +1,11 @@
+--- 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

sqlite.spec

@@ -6,7 +6,7 @@
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
 Version: 3.5.9
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: 	Applications/Databases
 URL: http://www.sqlite.org/
@@ -16,11 +16,17 @@ Patch1: sqlite-3.5.8-pkgconfig-version.patch
 Patch2: sqlite-3.5.9-libdl.patch
 # Upstream fix for http://www.sqlite.org/cvstrac/tktview?tn=3201
 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 readline-devel glibc-devel
+BuildRequires: ncurses-devel%{?_isa} readline-devel glibc-devel%{?_isa}
 BuildRequires: /usr/bin/tclsh
 %if %{with tcl}
-BuildRequires: tcl-devel
+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
 
@@ -37,6 +43,7 @@ are named to permit each to be installed on a single host
 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 
@@ -48,6 +55,7 @@ to install %{name}-devel.
 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}.
@@ -58,6 +66,8 @@ This package contains the tcl modules for %{name}.
 %patch1 -p1 -b .pkgconf
 %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"
@@ -72,7 +82,7 @@ make doc
 %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
 
@@ -80,6 +90,11 @@ make DESTDIR=${RPM_BUILD_ROOT} install
 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
@@ -109,13 +124,24 @@ rm -rf $RPM_BUILD_ROOT
 %{_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@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@redhat.com> - 3.5.9-3
+- Floating point handling fix on x86 (#474260)
+
 * Mon Sep 22 2008 Panu Matilainen <pmatilai@redhat.com> - 3.5.9-2
 - Remove references to temporary registers from cache on release (#463061)
 - Enable loading of external extensions (#457433)