From 68026d0a938f8829e26bb9935339fd59a093326b Mon Sep 17 00:00:00 2001 From: Paul Nasrat Date: Sep 29 2007 14:09:23 +0000 Subject: Update from devel --- diff --git a/sources b/sources index 529a97f..6f87c5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2cb1fafad5c2587e513dcbd18ace097 sqlite-3.3.6.tar.gz +2feec9b429f9298c9f288420c8b449f8 sqlite-3.4.2.tar.gz diff --git a/sqlite.spec b/sqlite.spec index 8ce3c95..f08e5c2 100644 --- a/sqlite.spec +++ b/sqlite.spec @@ -1,23 +1,20 @@ -# Note, this is an RPM built based off of the CentOS Spec Files. Before doing -# any updates please ensure you do not conflict with the other Centos -# package. -# --with-tcl enables sqlite-tcl subpackage, and also makes %%check possible. -%define tcl 0%{?_with_tcl:1} -# --with static enables static library in -devel subpackage -%define static 0%{?_with_static:1} +# bcond default logic is nicely backwards... +%bcond_without tcl +%bcond_with static +%bcond_with check Summary: Library that implements an embeddable SQL database engine Name: sqlite -Version: 3.3.6 -Release: 0.3%{?dist} +Version: 3.4.2 +Release: 3%{?dist} License: Public Domain Group: Applications/Databases URL: http://www.sqlite.org/ Source: http://www.sqlite.org/sqlite-%{version}.tar.gz Obsoletes: sqlite3 sqlite3-devel -BuildRequires: ncurses-devel readline-devel +BuildRequires: ncurses-devel readline-devel glibc-devel BuildRequires: /usr/bin/tclsh -%if %{tcl} +%if %{with tcl} BuildRequires: tcl-devel %endif BuildRoot: %{_tmppath}/%{name}-root @@ -41,7 +38,7 @@ This package contains the header files, static libraries and development documentation for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. -%if %{tcl} +%if %{with tcl} %package tcl Summary: Tcl module for the sqlite3 embeddable SQL database engine. Group: Development/Languages @@ -55,9 +52,10 @@ This package contains the tcl modules for %{name}. %setup -q %build -%configure %{!?_with_tcl:--disable-tcl} \ +export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_DISABLE_DIRSYNC=1 -Wall" +%configure %{!?with_tcl:--disable-tcl} \ --enable-threadsafe \ - --enable-threads-override-locks + --enable-threads-override-locks make %{?_smp_mflags} make doc @@ -68,11 +66,11 @@ make DESTDIR=${RPM_BUILD_ROOT} install %{__install} -D -m0644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1 -%if ! %{static} +%if ! %{with static} rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a} %endif -%if %{tcl} +%if %{with check} %check make test %endif @@ -97,23 +95,46 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/*.h %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%if %{static} +%if %{with static} %{_libdir}/*.a %exclude %{_libdir}/*.la %endif -%if %{tcl} +%if %{with tcl} %files tcl %defattr(-, root, root) %{_datadir}/tcl*/sqlite3 %endif %changelog -* Fri Aug 17 2007 Mike McGrath - 3.3.6-0.3 -- Official EPEL build +* Fri Sep 28 2007 Panu Matilainen - 3.4.2-3 +- Add another build conditional for enabling %%check -* Wed Jul 25 2007 Jeff Sheltren - 3.3.6-0.2 -- Prepend 0 to release -- Rebuild for EPEL +* Fri Sep 28 2007 Panu Matilainen - 3.4.2-2 +- Use bconds for the spec build conditionals +- Enable -tcl subpackage again (#309041) + +* Wed Aug 15 2007 Paul Nasrat - 3.4.2-1 +- Update to 3.4.2 + +* Sat Jul 21 2007 Paul Nasrat - 3.4.1-1 +- Update to 3.4.1 + +* Sun Jun 24 2007 Paul Nasrat - 3.4.0-2 +- Disable load for now (#245486) + +* Tue Jun 19 2007 Paul Nasrat - 3.4.0-1 +- Update to 3.4.0 + +* Fri Jun 01 2007 Paul Nasrat - 3.3.17-2 +- Enable load +- Build fts1 and fts2 +- Don't sync on dirs (#237427) + +* Tue May 29 2007 Paul Nasrat - 3.3.17-1 +- Update to 3.3.17 + +* Mon Mar 19 2007 Paul Nasrat - 3.3.13-1 +- Update to 3.3.13 * Fri Aug 11 2006 Paul Nasrat - 3.3.6-2 - Fix conditional typo (patch from Gareth Armstrong)