From c3b3b35e64f85535e766e2212cd8a88277ae7596 Mon Sep 17 00:00:00 2001
From: Jan Staněk <jstanek@redhat.com>
Date: Mar 11 2014 13:26:23 +0000
Subject: Merge branch 'master' into f20


---

diff --git a/.gitignore b/.gitignore
index 38bb4e6..f5bda8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,5 @@
 /sqlite-doc-3080200.zip
 /sqlite-src-3080300.zip
 /sqlite-doc-3080300.zip
+/sqlite-src-3080400.zip
+/sqlite-doc-3080400.zip
diff --git a/sources b/sources
index 714e810..35ab589 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-bdcac4ea67646e7d5a659b635f0639be  sqlite-src-3080300.zip
-627f0a147e06be8b8205bc36151d7ae0  sqlite-doc-3080300.zip
+1b49b2d5bb05b0ed56fa1a0aa6c300c3  sqlite-src-3080400.zip
+950c4bf6576c3981a6d59f7196e1304d  sqlite-doc-3080400.zip
diff --git a/sqlite.spec b/sqlite.spec
index 0c16c70..20758ed 100644
--- a/sqlite.spec
+++ b/sqlite.spec
@@ -3,9 +3,9 @@
 %bcond_with static
 %bcond_without check
 
-%define realver 3080300
-%define docver 3080300
-%define rpmver 3.8.3
+%define realver 3080400
+%define docver 3080400
+%define rpmver 3.8.4
 
 Summary: Library that implements an embeddable SQL database engine
 Name: sqlite
@@ -14,6 +14,7 @@ Release: 1%{?dist}
 License: Public Domain
 Group: Applications/Databases
 URL: http://www.sqlite.org/
+
 Source0: http://www.sqlite.org/2013/sqlite-src-%{realver}.zip
 Source1: http://www.sqlite.org/2013/sqlite-doc-%{docver}.zip
 # Support a system-wide lemon template
@@ -39,7 +40,6 @@ BuildRequires: tcl-devel
 %{!?tcl_version: %global tcl_version 8.5}
 %{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl%{tcl_version}}
 %endif
-BuildRoot: %{_tmppath}/%{name}-root
 
 %description
 SQLite is a C library that implements an SQL database engine. A large
@@ -125,8 +125,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make DESTDIR=${RPM_BUILD_ROOT} install
 
 install -D -m0644 sqlite3.1 $RPM_BUILD_ROOT/%{_mandir}/man1/sqlite3.1
@@ -147,29 +145,24 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a}
 # XXX shell tests are broken due to loading system libsqlite3, work around...
 export LD_LIBRARY_PATH=`pwd`/.libs
 export MALLOC_CHECK_=3
-%ifarch s390 s390x ppc ppc64 %{sparc} %{arm} aarch64
+%ifarch s390 s390x ppc ppc64 %{sparc}
 make test || :
 %else
 make test
 %endif
 %endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-, root, root)
-%doc README
+%doc README.md
 %{_bindir}/sqlite3
 %{_libdir}/*.so.*
 %{_mandir}/man?/*
 
 %files devel
-%defattr(-, root, root)
 %{_includedir}/*.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
@@ -179,21 +172,25 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %files doc
-%defattr(-, root, root)
 %doc %{name}-doc-%{docver}/*
 
 %files -n lemon
-%defattr(-, root, root)
 %{_bindir}/lemon
 %{_datadir}/lemon
 
 %if %{with tcl}
 %files tcl
-%defattr(-, root, root)
 %{tcl_sitearch}/sqlite3
 %endif
 
 %changelog
+* Tue Mar 11 2014 Jan Stanek <jstanek@redhat.com> 3.8.4-1
+- Update to 3.8.4 (http://www.sqlite.org/releaselog/3_8_4.html)
+
+* Sun Feb 23 2014 Peter Robinson <pbrobinson@fedoraproject.org> 3.8.3-2
+- Re-enable check on ARM/aarch64 as failing test fixed upstream for non x86 arches
+- Modernise spec
+
 * Tue Feb 11 2014 Jan Stanek <jstanek@redhat.com> 3.8.3-1
 - Update to 3.8.3 (http://www.sqlite.org/releaselog/3_8_3.html)
 - Dropped man-page patch - included upstream