rpms/sqlite/F-11 sources, 1.25, 1.26 sqlite.spec, 1.57, 1.58 sqlite-3.6.12-memalign.patch, 1.1, NONE sqlite-3.6.12-no-sqlite-doc.patch, 1.1, NONE
Panu Matilainen
pmatilai at fedoraproject.org
Thu Oct 29 10:50:09 UTC 2009
Author: pmatilai
Update of /cvs/pkgs/rpms/sqlite/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9570
Modified Files:
sources sqlite.spec
Removed Files:
sqlite-3.6.12-memalign.patch sqlite-3.6.12-no-sqlite-doc.patch
Log Message:
Update to satisfy new xulrunner requirements
- xulrunner needs sqlite >= 3.6.16 (#531232), sync with known good
F-12 package to get version 3.6.17
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/F-11/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- sources 3 Apr 2009 09:49:27 -0000 1.25
+++ sources 29 Oct 2009 10:50:09 -0000 1.26
@@ -1 +1,2 @@
-13600865a69a3f54d2ac42a0d6b743db sqlite-3.6.12.tar.gz
+f89f62afc765e08b3f0e47cdc47a15d4 sqlite-3.6.17.tar.gz
+a9081064aecf1a512aa0ca442803460c sqlite_docs_3_6_17.zip
Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/F-11/sqlite.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- sqlite.spec 9 Apr 2009 14:58:48 -0000 1.57
+++ sqlite.spec 29 Oct 2009 10:50:09 -0000 1.58
@@ -3,21 +3,27 @@
%bcond_with static
%bcond_without check
+# upstream doesn't provide separate -docs sources for all minor releases
+%define basever 3.6.17
+%define docver %(echo %{basever}|sed -e "s/\\./_/g")
+
Summary: Library that implements an embeddable SQL database engine
Name: sqlite
-Version: 3.6.12
-Release: 3%{?dist}
+Version: %{basever}
+Release: 1%{?dist}
License: Public Domain
-Group: Applications/Databases
+Group: Applications/Databases
URL: http://www.sqlite.org/
-Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
+Source0: http://www.sqlite.org/sqlite-%{version}.tar.gz
+Source1: http://www.sqlite.org/sqlite_docs_%{docver}.zip
# Fix build with --enable-load-extension, upstream ticket #3137
Patch1: sqlite-3.6.12-libdl.patch
# Avoid insecure sprintf(), use a system path for lempar.c, patch from Debian
Patch2: sqlite-3.6.6.2-lemon-snprintf.patch
-Patch3: sqlite-3.6.12-no-sqlite-doc.patch
-Patch4: sqlite-3.6.12-memalign.patch
-Obsoletes: sqlite3 sqlite3-devel
+# Fixup io-test fsync expectations wrt SQLITE_DISABLE_DIRSYNC
+Patch3: sqlite-3.6.13-iotest-nodirsync.patch
+# Disable two tests failing on at least on x86_64, ticket #3951
+Patch4: sqlite-3.6.17-tkt3951.patch
BuildRequires: ncurses-devel readline-devel glibc-devel
# libdl patch needs
BuildRequires: autoconf
@@ -39,7 +45,7 @@ supporting a separate database server.
are named to permit each to be installed on a single host
%package devel
-Summary: Development tools for the sqlite3 embeddable SQL database engine.
+Summary: Development tools for the sqlite3 embeddable SQL database engine
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
@@ -49,6 +55,15 @@ This package contains the header files a
for %{name}. If you like to develop programs using %{name}, you will need
to install %{name}-devel.
+%package doc
+Summary: Documentation for sqlite
+Group: Documentation
+
+%description doc
+This package contains most of the static HTML files that comprise the
+www.sqlite.org website, including all of the SQL Syntax and the
+C/C++ interface specs and other miscellaneous documentation.
+
%package -n lemon
Summary: A parser generator
Group: Development/Tools
@@ -66,7 +81,7 @@ embedded controllers.
%if %{with tcl}
%package tcl
-Summary: Tcl module for the sqlite3 embeddable SQL database engine.
+Summary: Tcl module for the sqlite3 embeddable SQL database engine
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
Requires: tcl(abi) = %{tcl_version}
@@ -76,11 +91,11 @@ This package contains the tcl modules fo
%endif
%prep
-%setup -q
+%setup -q -a1
%patch1 -p1 -b .libdl
%patch2 -p1 -b .lemon-sprintf
-%patch3 -p1 -b .no-sqlite-doc
-%patch4 -p1 -b .align
+%patch3 -p1 -b .nodirsync
+%patch4 -p1 -b .tkt3951
%build
autoconf
@@ -89,10 +104,13 @@ export CFLAGS="$RPM_OPT_FLAGS -DSQLITE_E
--enable-threadsafe \
--enable-threads-override-locks \
--enable-load-extension \
- %{?with_tcl:TCLLIBDIR=%{tcl_sitearch}/sqlite3}
+ %{?with_tcl:TCLLIBDIR=%{tcl_sitearch}/sqlite3}
+
+# rpath removal
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
-make doc
%install
rm -rf $RPM_BUILD_ROOT
@@ -115,7 +133,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a
%if %{with check}
%check
# let this fail for now:
-# - io-4.1 and io-4.2.3 fail everywhere
# - five nan-test broken on PPC (upstream ticket #3404)
# - bunch of rtree-tests failing on PPC atm
make test ||:
@@ -145,6 +162,10 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_libdir}/*.la
%endif
+%files doc
+%defattr(-, root, root)
+%doc %{name}-%{docver}-docs/*
+
%files -n lemon
%defattr(-, root, root)
%{_bindir}/lemon
@@ -157,6 +178,31 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Aug 21 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.17-1
+- update to 3.6.17 (http://www.sqlite.org/releaselog/3_6_17.html)
+- disable to failing tests until upstream fixes
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.14.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jun 12 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.14.2-1
+- update to 3.6.14.2 (#505229)
+
+* Mon May 18 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.14-2
+- disable rpath
+- add -doc subpackage instead of patching out reference to it
+
+* Thu May 14 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.14-1
+- update to 3.6.14 (http://www.sqlite.org/releaselog/3_6_14.html)
+- merge-review cosmetics (#226429)
+ - drop ancient sqlite3 obsoletes
+ - fix tab vs space whitespace issues
+ - remove commas from summaries
+- fixup io-test fsync expectations wrt SQLITE_DISABLE_DIRSYNC
+
+* Wed Apr 15 2009 Panu Matilainen <pmatilai at redhat.com> - 3.6.13-1
+- update to 3.6.13
+
* Thu Apr 09 2009 Dennis Gilmore <dennis at ausil.us> - 3.6.12-3
- apply upstream patch for memory alignment issue (#494906)
--- sqlite-3.6.12-memalign.patch DELETED ---
--- sqlite-3.6.12-no-sqlite-doc.patch DELETED ---
More information about the fedora-extras-commits
mailing list