[gnokii] Update to 0.6.30 and added SQLite subpackage (#466880, #735717)

[Robert Scheck]

commit aad35bbc4e2008a5a189fc7897f1baad469ca3ca
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Sun Oct 9 02:02:33 2011 +0200

    Update to 0.6.30 and added SQLite subpackage (#466880, #735717)

 .gitignore                                         |    1 +
 ...libgnokii-compile-with-libpcsc-lite-1.6.0.patch |   26 -------------
 gnokii.spec                                        |   39 ++++++++++++++------
 sources                                            |    2 +-
 4 files changed, 29 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 49c00c3..69c4253 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gnokii-0.6.28.tar.bz2
 /gnokii-0.6.29.tar.bz2
+/gnokii-0.6.30.tar.bz2
diff --git a/gnokii.spec b/gnokii.spec
index 591aa84..a624fc0 100644
--- a/gnokii.spec
+++ b/gnokii.spec
@@ -1,8 +1,8 @@
 # TODO: merge patches upstream where applicable
 
 Name:           gnokii
-Version:        0.6.29
-Release:        3%{?dist}
+Version:        0.6.30
+Release:        1%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -28,6 +28,7 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	ImageMagick
 BuildRequires:	postgresql-devel
 BuildRequires:	mysql-devel
+BuildRequires:	sqlite-devel
 BuildRequires:	zlib-devel
 BuildRequires:	bluez-libs-devel
 BuildRequires:	libusb-devel
@@ -39,9 +40,6 @@ BuildRequires:	readline-devel
 BuildRequires:	perl(XML::Parser) intltool
 Requires(pre):  %{_sbindir}/groupadd
 
-# From upstream
-Patch2:		0001-Make-libgnokii-compile-with-libpcsc-lite-1.6.0.patch
-
 %description
 Gnokii provides tools and a user space driver for use with mobile
 phones under Linux, various unices and Win32. With gnokii you can do
@@ -52,7 +50,7 @@ depending on the phone you have.
 %package     -n xgnokii
 Summary:        Graphical Linux/Unix tool suite for various mobile phones
 Group:          Applications/Communications
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description -n xgnokii
 Xgnokii is graphical Linux/Unix tool suite for various mobile
@@ -62,7 +60,7 @@ from/in computer and more other features.
 %package        smsd
 Summary:        Gnokii SMS daemon
 Group:          System Environment/Daemons
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires(pre):  %{_sbindir}/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -73,7 +71,7 @@ The Gnokii SMS daemon receives and sends SMS messages.
 %package        smsd-pgsql
 Summary:        PostgreSQL support for Gnokii SMS daemon
 Group:          System Environment/Daemons
-Requires:       %{name}-smsd = %{version}-%{release}
+Requires:       %{name}-smsd%{?_isa} = %{version}-%{release}
 Obsoletes:      %{name}-smsd-postgresql < 0.6.4-0.lvn.2
 
 %description    smsd-pgsql
@@ -82,15 +80,23 @@ Obsoletes:      %{name}-smsd-postgresql < 0.6.4-0.lvn.2
 %package        smsd-mysql
 Summary:        MySQL support for Gnokii SMS daemon
 Group:          System Environment/Daemons
-Requires:       %{name}-smsd = %{version}-%{release}
+Requires:       %{name}-smsd%{?_isa} = %{version}-%{release}
 
 %description    smsd-mysql
 %{summary}.
 
+%package        smsd-sqlite
+Summary:        SQLite support for Gnokii SMS daemon
+Group:          System Environment/Daemons
+Requires:       %{name}-smsd%{?_isa} = %{version}-%{release}
+
+%description    smsd-sqlite
+%{summary}.
+
 %package        devel
 Summary:        Gnokii development files
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       pkgconfig
 
 %description    devel
@@ -101,12 +107,13 @@ Requires:       pkgconfig
 %setup -q
 #%patch0 -p0
 %patch1 -p0
-%patch2 -p1 -b .pcsc
 install -pm 644 %{SOURCE5} smsd2mail.sh
 install -pm 644 %{SOURCE6} README.smsd2mail
 
 %build
-%configure --enable-security --disable-rpath --disable-static
+%configure --enable-security --disable-static
+sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' -i libtool
+sed -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' -i libtool
 make %{?_smp_mflags}
 
 
@@ -223,6 +230,11 @@ fi
 %doc smsd/sms.tables.mysql.sql
 %{_libdir}/smsd/libsmsd_mysql.so
 
+%files smsd-sqlite
+%defattr(-,root,root,-)
+# %doc smsd/sms.tables.sqlite.sql
+%{_libdir}/smsd/libsmsd_sqlite.so
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/gnokii*
@@ -231,6 +243,9 @@ fi
 %{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Sun Oct 09 2011 Robert Scheck <robert at fedoraproject.org> 0.6.30-1
+- Update to 0.6.30 and added SQLite subpackage (#466880, #735717)
+
 * Wed Mar 23 2011 Dan Horák <dan at danny.cz> - 0.6.29-3
 - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
 
diff --git a/sources b/sources
index bd9fcda..60b3fd1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6111e0158a1129062bda6420db67c313  gnokii-0.6.29.tar.bz2
+c90137d403febbc16712d64f0eb196de  gnokii-0.6.30.tar.bz2