rpms/sqlite/FC-3 sqlite-3.1.2-doc.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 sqlite.spec, 1.8, 1.9 sqlite-2.8.15-arch-double-differences.patch, 1.1, NONE sqlite-2.8.15-makefile.patch, 1.2, NONE sqlite-2.8.15.rpath.patch, 1.2, NONE sqlite-2.8.3.test.rh9.patch, 1.1, NONE sqlite-64bit-fixes.patch, 1.1, NONE
Ignacio Vazquez-Abrams (ivazquez)
fedora-extras-commits at redhat.com
Tue Apr 19 05:34:00 UTC 2005
Author: ivazquez
Update of /cvs/extras/rpms/sqlite/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17218/FC-3
Modified Files:
.cvsignore sources sqlite.spec
Added Files:
sqlite-3.1.2-doc.patch
Removed Files:
sqlite-2.8.15-arch-double-differences.patch
sqlite-2.8.15-makefile.patch sqlite-2.8.15.rpath.patch
sqlite-2.8.3.test.rh9.patch sqlite-64bit-fixes.patch
Log Message:
auto-import sqlite-3.1.2-0.3 on branch FC-3 from sqlite-3.1.2-0.3.src.rpm
sqlite-3.1.2-doc.patch:
--- NEW FILE sqlite-3.1.2-doc.patch ---
--- sqlite/Makefile.in.jbj 2005-02-16 09:50:51.000000000 -0500
+++ sqlite/Makefile.in 2005-02-16 09:53:43.000000000 -0500
@@ -561,7 +561,7 @@
#
DOC = \
arch.html \
- arch.png \
+ www/arch.png \
autoinc.html \
c_interface.html \
capi3.html \
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sqlite/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 16 Feb 2005 20:20:44 -0000 1.3
+++ .cvsignore 19 Apr 2005 05:33:58 -0000 1.4
@@ -1 +1 @@
-sqlite-2.8.16.tar.gz
+sqlite-3.1.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sqlite/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 16 Feb 2005 20:20:44 -0000 1.4
+++ sources 19 Apr 2005 05:33:58 -0000 1.5
@@ -1 +1 @@
-9c79b461ff30240a6f9d70dd67f8faea sqlite-2.8.16.tar.gz
+d9c52489aa95d618842bf97778c17f04 sqlite-3.1.2.tar.gz
Index: sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/sqlite/FC-3/sqlite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sqlite.spec 16 Feb 2005 20:20:44 -0000 1.8
+++ sqlite.spec 19 Apr 2005 05:33:58 -0000 1.9
@@ -1,164 +1,131 @@
-Name: sqlite
-Version: 2.8.16
-Release: 1
-Epoch: 0
-Summary: An embeddable SQL engine in a C library
-Group: System Environment/Libraries
-License: Public Domain
-URL: http://www.sqlite.org/
-Source0: http://www.sqlite.org/sqlite-%{version}.tar.gz
-Patch1: sqlite-2.8.15.rpath.patch
-Patch2: sqlite-2.8.15-makefile.patch
-Patch3: sqlite-2.8.3.test.rh9.patch
-Patch4: sqlite-64bit-fixes.patch
-Patch5: sqlite-2.8.15-arch-double-differences.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ncurses-devel readline-devel %{_includedir}/tcl.h
+Summary: Library that implements an embeddable SQL database engine
+Name: sqlite
+Version: 3.1.2
+Release: 0.3
+License: Public Domain
+Group: Applications/Databases
+URL: http://www.sqlite.org/
+Source: http://www.sqlite.org/sqlite-%{version}.tar.gz
+Patch0: sqlite-3.1.2-doc.patch
+Obsoletes: sqlite3 sqlite3-devel
+BuildRequires: ncurses-devel readline-devel
+BuildRoot: %{_tmppath}/%{name}-root
%description
-SQLite is a small, fast, embeddable SQL database engine that supports
-most of SQL92, including transactions with atomic commit and rollback,
-subqueries, compound queries, triggers, and views. A complete database
-is stored in a single cross-platform disk file. The native C/C++ API
-is simple and easy to use. Bindings for other languages are also
-available.
-
-%package devel
-Summary: Development files for SQLite
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: pkgconfig
-
-%description devel
-SQLite is a small, fast, embeddable SQL database engine that supports
-most of SQL92, including transactions with atomic commit and rollback,
-subqueries, compound queries, triggers, and views.
-This package contains static library and header files for developing
-applications using sqlite.
-
-%package tcl
-Summary: Tcl bindings for sqlite
-Group: System Environment/Libraries
-Requires: tcl >= 0:8.3.3, %{name} = %{epoch}:%{version}-%{release}
-
-%description tcl
-SQLite is a small, fast, embeddable SQL database engine that supports
-most of SQL92, including transactions with atomic commit and rollback,
-subqueries, compound queries, triggers, and views.
-This package contains tcl bindings for sqlite.
+SQLite is a C library that implements an SQL database engine. A large
+subset of SQL92 is supported. A complete database is stored in a
+single disk file. The API is designed for convenience and ease of use.
+Applications that link against SQLite can enjoy the power and
+flexiblity of an SQL database without the administrative hassles of
+supporting a separate database server. Version 2 and version 3 binaries
+are named to permit each to be installed on a single host
+
+%package devel
+Summary: Development tools for the sqlite3 embeddable SQL database engine.
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+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.
+
+%package tcl
+Summary: Tcl module for the sqlite3 embeddable SQL database engine.
+Group: Development/Languages
+Requires: %{name} = %{version}-%{release}
+
+%description tcl
+This package contains the tcl modules for %{name}.
%prep
-%setup -q
-%patch1 -p1 -b .rpath
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-sed -i.rpath 's!__VERSION__!%{version}!g' Makefile.in
-# Patch additional /usr/lib locations where we don't have $(libdir)
-# to substitute with.
-sed -i.lib 's!@exec_prefix@/lib!%_libdir!g' Makefile.in
+%setup -q -n sqlite
+
+%patch0 -p1 -b .jbj
+
+%{__perl} -pi.orig -e '
+ s|\$\(exec_prefix\)/lib|\$(libdir)|g;
+ s|/usr/lib|\$(libdir)|g;
+ ' Makefile* */Makefile* */*/Makefile*
+
+%ifarch x86_64
+%{__libtoolize} --force
+%{__aclocal}
+%{__autoconf}
+%endif
+CFLAGS="%{optflags} -DNDEBUG=1 -fno-strict-aliasing" \
+CXXFLAGS="%{optflags} -DNDEBUG=1 -fno-strict-aliasing" \
+TARGET_EXEEXT='.so' \
+%configure --enable-utf8 --disable-tcl
+
+perl -pi -e 's/\@VERSION_NUMBER\@/3001002/' Makefile
%build
-CFLAGS="$RPM_OPT_FLAGS -DNDEBUG=1"
-%configure --enable-utf8
-make
-make tclsqlite libtclsqlite.la doc
-#obs. make test doesn't like root
-make test
+make %{?_smp_mflags}
+%{__make} doc
%install
rm -rf $RPM_BUILD_ROOT
-DIRECTORY=$RPM_BUILD_ROOT%_libdir/sqlite-%version
-install -d $DIRECTORY
-echo 'package ifneeded sqlite 2 [list load [file join $dir libtclsqlite.so]]' > $DIRECTORY/pkgIndex.tcl
-%makeinstall
-install -D -m 0644 sqlite.1 $RPM_BUILD_ROOT%{_mandir}/man1/sqlite.1
+%{__make} DESTDIR=${RPM_BUILD_ROOT} install
+
+mv sqlite.1 sqlite3.1 || :
+%{__install} -D -m0644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+%check
+# XXX sqlite-3.0.8 on x86: 56 errors out of 14885 tests
+# XXX sqlite-3.1.2 on x86: 1 errors out of 19710 tests
+make test || :
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
+
%postun -p /sbin/ldconfig
-%files
-%defattr(-,root,root,-)
-%{_bindir}/sql*
-%{_libdir}/libsql*.so.*
-%{_mandir}/man1/*
+%files
+%defattr(-, root, root)
+%doc README
+%{_bindir}/*
+%{_libdir}/*.so.*
+%{_mandir}/man?/*
%files devel
-%defattr(-,root,root,-)
-%doc README doc/*
-%{_libdir}/libsql*.a
-%{_libdir}/libsql*.so
-%{_includedir}/*
-%{_libdir}/pkgconfig/*
+%defattr(-, root, root)
+%doc doc/
+%{_includedir}/*.h
+%{_libdir}/*.a
+%{_libdir}/*.la
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%if 0
%files tcl
-%defattr(-,root,root,-)
-%doc doc/tclsqlite.html
-%exclude %_bindir/tclsqlite
-%exclude %_libdir/%{name}-%{version}/libtclsqlite.a
-%exclude %{_bindir}/tclsqlite
-%_libdir/sqlite-%version
+%defattr(-, root, root)
+%{_datadir}/tcl*/sqlite3
+%endif
%changelog
-* Wed Feb 16 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:2.8.16-1
-- Update to 2.8.16 bug-fix release + update patches.
+* Tue Apr 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 3.1.2-0.3
+- Release drop
+
+* Sat Apr 9 2005 Warren Togami <wtogami at redhat.com> - 3.1.2-3
+- fix buildreqs (#154298)
+
+* Mon Apr 4 2005 Jeremy Katz <katzj at redhat.com> - 3.1.2-2
+- disable tcl subpackage
+
+* Wed Mar 9 2005 Jeff Johnson <jbj at redhat.com> 3.1.2-1
+- rename to "sqlite" from "sqlite3" (#149719, #150012).
+
+* Wed Feb 16 2005 Jeff Johnson <jbj at jbj.org> 3.1.2-1
+- upgrade to 3.1.2.
+- add sqlite3-tcl sub-package.
-* Tue Feb 15 2005 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 2.8.15-2
-- add sqlite-64bit-fixes.patch and sqlite-2.8.15-arch-double-differences.patch
- fixes x86_64; Both were found in a mandrake srpm
-- remove exclusive arch ix86; hopefully this fixes ppc also
-
-* Sun Jan 23 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:2.8.15-1
-- Add exclusive arch ix86 for now (make test segfaults on x86_64).
-- Update makefile patch, $(exec_prefix)/lib -> $(libdir), and
- substitute additional /usr/lib locations in %%prep for multilib
- people to play with.
-
-* Sun Sep 26 2004 Adrian Reber <adrian at lisas.de> - 0:2.8.15-0.fdr.1
-- Update to 2.8.15
-- Update patches
-
-* Fri Jun 19 2004 Nils O. Selåsdal <NOS at Utel.no> - 0:2.8.14-0.fdr.1
-- Update to 2.8.14
-- Update patches
-- --enable-releasemode
-- small spec file tweaks
-
-* Sat Dec 27 2003 Jean-Luc Fontaine <jfontain at free.fr> - 0:2.8.6-0.fdr.6
-- in tcl rpm, removed tclsqlite, moved shared library in own sqlite
- sub-directory add added pkgIndex.tcl file to make package dynamically
- loadable in a Tcl interpreter
-- in build requirements, work around tcl-devel and tk-devel packages non
- existence in RH 8.0 and 9
-- in tcl rpm, added tcl package requirement
-- in tcl rpm, post ldconfig is not necessary
-
-* Wed Nov 12 2003 Nils O. Selåsdal <NOS at Utel.no> - 0:2.8.6-0.fdr.5
-- BuildRequires tcl-devel
-- small .spec tweaks
-
-* Tue Oct 28 2003 Nils O. Selåsdal <NOS at Utel.no> - 0:2.8.6-0.fdr.4
-- exclude libtclsqlite.a
-
-* Mon Oct 27 2003 Nils O. Selåsdal <NOS at Utel.no> - 0:2.8.6-0.fdr.3
-- Fix readme -> README
-
-* Mon Oct 27 2003 Nils O. Selåsdal <NOS at Utel.no> - 0:2.8.6-0.fdr.2
-- Better summary/description
-- Add patch for not using rpath
-- Add patch that builds tclsqlite (From Anvil's package)
-- Add patch that fixes the tests (From Anvil's package)
-- New tcl subpackage
-- Also make the tests during build
-- Build docs, and include them in -devel
+* Sat Feb 5 2005 Jeff Johnson <jbj at jbj.org> 3.0.8-3
+- repackage for fc4.
-* Fri Oct 10 2003 Nils O. Selåsdal <NOS at Utel.no> - 0:2.8.6-0.fdr.1
-- Initial RPM release.
+* Mon Jan 17 2005 R P Herrold <info at owlriver.com> 3.0.8-2orc
+- fix a man page nameing conflict when co-installed with sqlite-2, as
+ is permissible
--- sqlite-2.8.15-arch-double-differences.patch DELETED ---
--- sqlite-2.8.15-makefile.patch DELETED ---
--- sqlite-2.8.15.rpath.patch DELETED ---
--- sqlite-2.8.3.test.rh9.patch DELETED ---
--- sqlite-64bit-fixes.patch DELETED ---
More information about the fedora-extras-commits
mailing list