rpms/kannel/FC-5 .cvsignore, 1.3, 1.4 kannel.init, 1.1, 1.2 kannel.spec, 1.10, 1.11 sources, 1.3, 1.4 kannel-1.4.0-depend.patch, 1.1, NONE

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/kannel/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23673/FC-5

Modified Files:
	.cvsignore kannel.init kannel.spec sources 
Removed Files:
	kannel-1.4.0-depend.patch 
Log Message:
Update FC5 kannel to 1.4.1 and make sure we keep sqlite2 support for FC5.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kannel/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jan 2005 18:06:30 -0000	1.3
+++ .cvsignore	16 Oct 2006 14:38:51 -0000	1.4
@@ -1 +1 @@
-gateway-1.4.0.tar.bz2
+gateway-1.4.1.tar.bz2


Index: kannel.init
===================================================================
RCS file: /cvs/extras/rpms/kannel/FC-5/kannel.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kannel.init	17 Nov 2005 12:25:54 -0000	1.1
+++ kannel.init	16 Oct 2006 14:38:51 -0000	1.2
@@ -34,6 +34,10 @@
 	RETVAL_BEARER=$?
 	echo
 
+	# It seems like the bearerbox may need to settle before accepting
+	# connections from wapbox and smsbox
+	sleep 3s
+
 	# Starting wap and sms only makes sense if bearerbox is running
 	if [ $RETVAL_BEARER -eq 0 ]; then
 	  if grep "^group = wapbox" $config &>/dev/null; then


Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/FC-5/kannel.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kannel.spec	6 Mar 2006 15:30:21 -0000	1.10
+++ kannel.spec	16 Oct 2006 14:38:51 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
-Version: 1.4.0
-Release: 8%{?dist}
+Version: 1.4.1
+Release: 2%{?dist}
 License: Kannel
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -9,15 +9,20 @@
 Source1: kannel.logrotate
 Source2: kannel.init
 Source3: kannel.conf
-Patch: kannel-1.4.0-depend.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: bison, byacc, flex, ImageMagick
-BuildRequires: libxml2-devel, openssl-devel, zlib-devel
-BuildRequires: pcre-devel
-# DB backends
+BuildRequires: bison, byacc, flex
+BuildRequires: libxml2-devel, openssl-devel, zlib-devel, pcre-devel
+# DB backends - Use sqlite2 up to FC5 and sqlite3 for FC6+ and non-Fedora
+%if %{!?fedora:6}%{?fedora} >= 6
+BuildRequires: sqlite-devel
+%else
 BuildRequires: sqlite2-devel
-# For the docs... I think we need transfig too, so disable for now.
-#BuildRequires: jadetex, tetex-dvips, docbook-dtds, docbook-style-dsssl
+%endif
+%{?_with_mysql:Buildrequires: mysql-devel}
+%{?_with_pgsql:Buildrequires: postgresql-devel}
+# For the docs...
+BuildRequires: jadetex, tetex-dvips, docbook-dtds, docbook-style-dsssl
+BuildRequires: ImageMagick, transfig
 
 %description
 The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
@@ -47,15 +52,22 @@
 
 %prep
 %setup -n gateway-%{version}
-%patch -p0 -b .depend
 
 
 %build
 %configure \
-    --enable-start-stop-daemon \
     --enable-pcre \
-    --with-sqlite
-%{__make} %{?_smp_mflags}
+    --enable-docs \
+    --enable-start-stop-daemon \
+%if %{!?fedora:6}%{?fedora} >= 6
+    --with-sqlite3 \
+%else
+    --with-sqlite \
+%endif
+    %{?_with_mysql} \
+    %{?_with_pgsql}
+# Remove %{?_smp_mflags} since the docs fail to build with it
+%{__make}
 
 
 %install
@@ -103,7 +115,7 @@
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog NEWS README STATUS
+%doc AUTHORS COPYING ChangeLog NEWS README STATUS doc/*/*.pdf
 %attr(0640, kannel, kannel) %config(noreplace) %{_sysconfdir}/kannel.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/kannel
 %config %{_sysconfdir}/rc.d/init.d/kannel
@@ -121,6 +133,20 @@
 
 
 %changelog
+* Mon Oct 16 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-2
+- Make sure we keep sqlite2 support for FC5 and below.
+
+* Mon Oct  2 2006 Matthias Saou <http://freshrpms.net/> 1.4.1-1
+- Update to 1.4.1.
+- Remove obsolete depend patch.
+- Add 3s sleep sfter bearerbox start to let it settle before connections.
+- Switch sqlite backend from sqlite2 to new sqlite3.
+- Add conditional --with mysql and pgsql rebuild support.
+- Re-enable building the doc since transfig is now available and include PDFs.
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.4.0-9
+- FC6 rebuild.
+
 * Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 1.4.0-8
 - FC5 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kannel/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Jan 2005 18:06:30 -0000	1.3
+++ sources	16 Oct 2006 14:38:51 -0000	1.4
@@ -1 +1 @@
-2ef0544002be48669d7f0f29f9f470de  gateway-1.4.0.tar.bz2
+ae78aec906931e2af73f5a6245520cca  gateway-1.4.1.tar.bz2


--- kannel-1.4.0-depend.patch DELETED ---