[arch-commits] Commit in sqlite3/repos (3 files)

[Jan de Groot]

    Date: Saturday, June 21, 2008 @ 17:52:00
  Author: jgc
Revision: 3291

Merged revisions 2915-3290 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/sqlite3/trunk

........
  r3290 | jgc | 2008-06-21 21:51:48 +0000 (Sat, 21 Jun 2008) | 2 lines
  
  upgpkg: sqlite3 3.5.9-2
      Add patch to include full version number in pkgconfig file. Should allow xulrunner to use system sqlite
........

Added:
  sqlite3/repos/extra-i686/sqlite-3.5.8-pkgconfig-version.patch
    (from rev 3290, sqlite3/trunk/sqlite-3.5.8-pkgconfig-version.patch)
Modified:
  sqlite3/repos/extra-i686/	(properties)
  sqlite3/repos/extra-i686/PKGBUILD

--------------------------------------+
 PKGBUILD                             |   14 ++++++++------
 sqlite-3.5.8-pkgconfig-version.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)


Property changes on: sqlite3/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /sqlite3/trunk:1-2914
   + /sqlite3/trunk:1-3290

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-21 21:51:48 UTC (rev 3290)
+++ extra-i686/PKGBUILD	2008-06-21 21:52:00 UTC (rev 3291)
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 pkgname=sqlite3
 pkgver=3.5.9
-pkgrel=1
+pkgrel=2
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -11,17 +11,21 @@
 depends=('readline')
 conflicts=('sqlite')
 replaces=('sqlite')
-source=(http://www.sqlite.org/sqlite-$pkgver.tar.gz license.txt)
+source=(http://www.sqlite.org/sqlite-$pkgver.tar.gz
+	sqlite-3.5.8-pkgconfig-version.patch
+	license.txt)
 options=(!libtool)
 md5sums=('b58412904b42fe49e5a281e99da0fd72'
+	 '025965a176173eaf21877f6daed088d4'
          'c1cdbc5544034d9012e421e75a5e4890')
 
 build() {
   cd $startdir/src/sqlite-$pkgver
-  ./configure --prefix=/usr --enable-threadsafe
+  patch -Np1 -i ${startdir}/src/sqlite-3.5.8-pkgconfig-version.patch || return 1
+  ./configure --prefix=/usr --enable-threadsafe || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$startdir/pkg install || return 1
 
   # license
-  install -Dm644 $startdir/src/license.txt ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt
-}
\ No newline at end of file
+  install -Dm644 $startdir/src/license.txt ${startdir}/pkg/usr/share/licenses/${pkgname}/license.txt || return 1
+}

Copied: sqlite3/repos/extra-i686/sqlite-3.5.8-pkgconfig-version.patch (from rev 3290, sqlite3/trunk/sqlite-3.5.8-pkgconfig-version.patch)
===================================================================
--- extra-i686/sqlite-3.5.8-pkgconfig-version.patch	                        (rev 0)
+++ extra-i686/sqlite-3.5.8-pkgconfig-version.patch	2008-06-21 21:52:00 UTC (rev 3291)
@@ -0,0 +1,12 @@
+diff -up sqlite-3.5.8/sqlite3.pc.in.release sqlite-3.5.8/sqlite3.pc.in
+--- sqlite-3.5.8/sqlite3.pc.in.release	2008-04-23 09:11:38.000000000 +0300
++++ sqlite-3.5.8/sqlite3.pc.in	2008-04-23 09:11:48.000000000 +0300
+@@ -7,7 +7,7 @@ includedir=@includedir@
+ 
+ Name: SQLite
+ Description: SQL database engine
+-Version: @VERSION@
++Version: @RELEASE@
+ Libs: -L${libdir} -lsqlite3
+ Libs.private: @LIBS@
+ Cflags: -I${includedir}