rpms/kannel/devel gateway-1.4.3-ssldetect.patch, NONE, 1.1 kannel.spec, 1.21, 1.22 gateway-1.4.1-ssl64bit.patch, 1.1, NONE

Thu Jun 25 19:48:46 UTC 2009

Author: scop

Update of /cvs/pkgs/rpms/kannel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7076

Modified Files:
	kannel.spec 
Added Files:
	gateway-1.4.3-ssldetect.patch 
Removed Files:
	gateway-1.4.1-ssl64bit.patch 
Log Message:
* Wed Jun 24 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 1.4.3-1
- Update to 1.4.3 (#495891).
- Provide -static in -devel.
- Split PDFs into -docs, noarch where applicable.
- Patch to use pkg-config at build time for SSL detection.


gateway-1.4.3-ssldetect.patch:

--- NEW FILE gateway-1.4.3-ssldetect.patch ---
diff -up gateway-1.4.3/configure~ gateway-1.4.3/configure
--- gateway-1.4.3/configure~	2008-08-06 17:22:43.000000000 +0300
+++ gateway-1.4.3/configure	2009-06-25 21:10:01.000000000 +0300
@@ -10957,28 +10957,8 @@ fi
 
 
 if test "$ssl" = "yes" ; then
-    if test "x$ssllib" = "x" && test "x$sslinc" = "x"; then
-    for loc in /usr/lib /usr/lib64 /usr/local/ssl/lib /usr/local/openssl/lib; do
-      if test -f "$loc/libssl.a" -o -f "$loc/libssl.dylib" ; then
-        ssllib="$loc"
-      fi
-    done
-    for loc in /usr/include/ssl /usr/include/openssl /usr/local/ssl/include \
-               /usr/local/openssl/include; do
-      if test -d "$loc"; then
-        sslinc="$loc"
-      fi
-    done
-  fi
-  { $as_echo "$as_me:$LINENO: result: trying $ssllib $sslinc" >&5
-$as_echo "trying $ssllib $sslinc" >&6; }
-fi
-
-
-
-if test "x$ssllib" != "x" && test "x$sslinc" != "x"; then
-  CFLAGS="$CFLAGS -I$sslinc"
-  LIBS="$LIBS -L$ssllib"
+  CFLAGS="$CFLAGS ${sslinc:+-I$sslinc}${sslinc:-`pkg-config openssl --cflags`}"
+  LIBS="$LIBS ${ssllib:+-L$ssllib}${ssllib:-`pkg-config openssl --libs`}"
 
   # Extract the first word of "openssl", so it can be a program name with args.
 set dummy openssl; ac_word=$2


Index: kannel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kannel/devel/kannel.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- kannel.spec	25 Feb 2009 10:10:37 -0000	1.21
+++ kannel.spec	25 Jun 2009 19:48:12 -0000	1.22
@@ -1,7 +1,7 @@
 Summary: WAP and SMS gateway
 Name: kannel
-Version: 1.4.1
-Release: 11
+Version: 1.4.3
+Release: 1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.kannel.org/
@@ -10,7 +10,8 @@ Source1: kannel.logrotate
 Source2: kannel.init
 Source3: kannel.conf
 Source4: gw-config
-Patch0: gateway-1.4.1-ssl64bit.patch
+# TODO: a corresponding configure.in patch could be upstreamable?
+Patch0: gateway-1.4.3-ssldetect.patch
 Patch1: gateway-1.4.1-typesh.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: bison, byacc, flex, ghostscript
@@ -32,9 +33,10 @@ forms. Only the data call bearer (UDP) i
 
 
 %package devel
-Summary: Development files for the kannel WAP and SMS gateway
+Summary: Development files for the Kannel WAP and SMS gateway
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Provides: %{name}-static = %{version}-%{release}
 
 %description devel
 The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
@@ -45,24 +47,42 @@ files via HTTP works, including compilat
 forms. Only the data call bearer (UDP) is supported, not SMS.
 
 Install this package if you need to develop or recompile applications that
-use the kannel WAP and SMS gateway.
+use the Kannel WAP and SMS gateway.
+
+
+%package docs
+Summary: Documentation for the Kannel WAP and SMS gateway
+Group: Documentation
+%if 0%{?fedora} > 9
+BuildArch: noarch
+%endif
+
+%description docs
+The Kannel Open Source WAP and SMS gateway works as both an SMS gateway, for
+implementing keyword based services via GSM text messages, and a WAP gateway,
+via UDP. The SMS part is fairly mature, the WAP part is early in its
+development. In this release, the GET request for WML pages and WMLScript
+files via HTTP works, including compilation for WML and WMLScript to binary
+forms. Only the data call bearer (UDP) is supported, not SMS.
+
+This package contains documentation for the Kannel WAP and SMS gateway.
 
 
 %prep
 %setup -q -n gateway-%{version}
-%patch0 -p1 -b .ssl64bit
+%patch0 -p1 -b .ssldetect
 %patch1 -p1 -b .typesh
+%{__chmod} -c -x gwlib/html-entities.def # for -debuginfo, as of 1.4.3
 
 
 %build
 %configure \
     --enable-pcre \
-    --enable-docs \
     --enable-start-stop-daemon \
     --with-sqlite3 \
     %{?_with_mysql} \
     %{?_with_pgsql}
-# Remove %{?_smp_mflags} since the docs fail to build with it
+# Remove %{?_smp_mflags} since the docs fail to build with it as of 1.4.3
 %{__make}
 
 
@@ -82,8 +102,8 @@ use the kannel WAP and SMS gateway.
 # Rename start-stop-daemon to start-stop-kannel
 %{__mv} %{buildroot}%{_sbindir}/start-stop-daemon \
         %{buildroot}%{_sbindir}/start-stop-kannel
-# Remove executable bit from man pages (as of 1.4.1)
-%{__chmod} -x %{buildroot}%{_mandir}/man?/*
+# Remove executable bit from man pages (as of 1.4.3)
+%{__chmod} -c -x %{buildroot}%{_mandir}/man?/*
 # Multilib fix : Replace the gw-config with our wrapper script
 %{__mv} %{buildroot}%{_bindir}/gw-config \
         %{buildroot}%{_bindir}/gw-config.%{_arch}
@@ -117,7 +137,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README STATUS doc/*/*.pdf
+%doc AUTHORS COPYING ChangeLog NEWS README STATUS
 %attr(0640,kannel,kannel) %config(noreplace) %{_sysconfdir}/kannel.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/kannel
 %{_sysconfdir}/rc.d/init.d/kannel
@@ -131,7 +151,6 @@ fi
 %{_mandir}/man?/*
 %attr(0750,kannel,kannel) %dir %{_var}/log/kannel/
 
-
 %files devel
 %defattr(-,root,root,-)
 %{_bindir}/gw-config*
@@ -139,8 +158,18 @@ fi
 %dir %{_libdir}/kannel/
 %{_libdir}/kannel/*.a
 
+%files docs
+%defattr(-,root,root,-)
+%doc doc/*/*.pdf
+
 
 %changelog
+* Wed Jun 24 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 1.4.3-1
+- Update to 1.4.3 (#495891).
+- Provide -static in -devel.
+- Split PDFs into -docs, noarch where applicable.
+- Patch to use pkg-config at build time for SSL detection.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- gateway-1.4.1-ssl64bit.patch DELETED ---


