rpms/sqlite/devel sqlite-2.8.15-makefile.patch, NONE, 1.1 sqlite-2.8.15.rpath.patch, NONE, 1.1 sqlite.spec, 1.5, 1.6 sources, 1.2, 1.3 sqlite-2.8.3.makefile.tclsqlite.patch, 1.1, NONE
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Sun Jan 23 19:08:15 UTC 2005
Author: mschwendt
Update of /cvs/extras/rpms/sqlite/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv13864
Modified Files:
sqlite.spec sources
Added Files:
sqlite-2.8.15-makefile.patch sqlite-2.8.15.rpath.patch
Removed Files:
sqlite-2.8.3.makefile.tclsqlite.patch
Log Message:
Merge stalled update and changes, mostly from fedora.us queue, in order to update from 2.8.6 to 2.8.15.
sqlite-2.8.15-makefile.patch:
--- NEW FILE sqlite-2.8.15-makefile.patch ---
diff -Nur sqlite-2.8.15-orig/Makefile.in sqlite-2.8.15/Makefile.in
--- sqlite-2.8.15-orig/Makefile.in 2004-03-27 00:16:32.000000000 +0100
+++ sqlite-2.8.15/Makefile.in 2005-01-23 18:20:37.034194768 +0100
@@ -465,14 +465,16 @@
mv $(DOC) doc
install: sqlite libsqlite.la sqlite.h
- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib
- $(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib
+ $(INSTALL) -d $(DESTDIR)$(libdir)
+ $(LTINSTALL) libsqlite.la $(DESTDIR)$(libdir)
+ $(LTINSTALL) libtclsqlite.la $(DESTDIR)$(libdir)/sqlite-2.8.15
$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
$(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin
+ $(LTINSTALL) tclsqlite $(DESTDIR)$(exec_prefix)/bin
$(INSTALL) -d $(DESTDIR)$(prefix)/include
$(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include
- $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig;
- $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig;
+ $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig;
+ $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(libdir)/pkgconfig;
clean:
rm -f *.lo *.la *.o sqlite at TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.*
sqlite-2.8.15.rpath.patch:
--- NEW FILE sqlite-2.8.15.rpath.patch ---
--- sqlite/Makefile.in.nos 2004-06-18 14:13:40.127066236 +0200
+++ sqlite/Makefile.in 2004-06-18 14:13:56.241098295 +0200
@@ -192,7 +192,7 @@
libtclsqlite.la: tclsqlite.lo libsqlite.la
$(LTLINK) -o libtclsqlite.la tclsqlite.lo \
- libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \
+ libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite-2.8.15 \
-version-info "8:6:8"
sqlite at TARGET_EXEEXT@: $(TOP)/src/shell.c libsqlite.la sqlite.h
Index: sqlite.spec
===================================================================
RCS file: /cvs/extras/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sqlite.spec 10 Dec 2004 22:03:11 -0000 1.5
+++ sqlite.spec 23 Jan 2005 19:08:13 -0000 1.6
@@ -1,19 +1,21 @@
Name: sqlite
-Version: 2.8.6
-Release: 6
+Version: 2.8.15
+Release: 1
Epoch: 0
-Summary: An embeddable SQL engine in a C library.
+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-2.8.6.tar.gz
-Patch1: sqlite-2.8.6.norpath.patch
-Patch2: sqlite-2.8.3.makefile.tclsqlite.patch
-Patch3: sqlite-2.8.3.test.rh9.patch
+Source0: http://www.sqlite.org/sqlite-2.8.15.tar.gz
+Patch1: sqlite-2.8.15.rpath.patch
+Patch2: sqlite-2.8.15-makefile.patch
+Patch3: sqlite-2.8.3.test.rh9.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel readline-devel %{_includedir}/tcl.h
+ExclusiveArch: %{ix86}
+
%description
SQLite is a small, fast, embeddable SQL database engine that supports
most of SQL92, including transactions with atomic commit and rollback,
@@ -49,23 +51,28 @@
%prep
%setup -q -n %{name}
%patch1 -p1
-%patch2 -p0
+%patch2 -p1
%patch3 -p1
+# 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
%build
CFLAGS="$RPM_OPT_FLAGS -DNDEBUG=1"
%configure --enable-utf8
-make all tclsqlite doc test
+make
+make tclsqlite libtclsqlite.la doc
+#obs. make test doesn't like root
+make test
%install
rm -rf $RPM_BUILD_ROOT
DIRECTORY=$RPM_BUILD_ROOT%_libdir/sqlite-%version
install -d $DIRECTORY
-cp -d -p .libs/libtclsqlite.so* $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
+install -D -m 0644 sqlite.1 $RPM_BUILD_ROOT%{_mandir}/man1/sqlite.1
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
@@ -93,10 +100,27 @@
%defattr(-,root,root,-)
%doc doc/tclsqlite.html
%exclude %_bindir/tclsqlite
-%exclude %_libdir/libtclsqlite.*
+%exclude %_libdir/%{name}-%{version}/libtclsqlite.a
+%exclude %{_bindir}/tclsqlite
%_libdir/sqlite-%version
%changelog
+* 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
@@ -105,13 +129,17 @@
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
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sqlite/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 05:22:32 -0000 1.2
+++ sources 23 Jan 2005 19:08:13 -0000 1.3
@@ -1 +1 @@
-3047e24370d7e49d7bfd9728addf76cf sqlite-2.8.6.tar.gz
+0afa73e107bd106031d046c8ca6a94ab sqlite-2.8.15.tar.gz
--- sqlite-2.8.3.makefile.tclsqlite.patch DELETED ---
More information about the fedora-extras-commits
mailing list