rpms/kannel/F-11 gw-config,1.1,1.2 kannel.spec,1.21,1.22
Matthias Saou
thias at fedoraproject.org
Mon Dec 7 22:24:03 UTC 2009
Author: thias
Update of /cvs/extras/rpms/kannel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4625/F-11
Modified Files:
gw-config kannel.spec
Log Message:
Fix gw-config wrapper to actually have it work (#542605).
Index: gw-config
===================================================================
RCS file: /cvs/extras/rpms/kannel/F-11/gw-config,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gw-config 22 Dec 2008 15:22:44 -0000 1.1
+++ gw-config 7 Dec 2009 22:24:02 -0000 1.2
@@ -5,16 +5,16 @@
# Always prefer 64bit over 32bit, hardcode the multilib archs here
for ARCH in x86_64 ia64 s390; do
- [ -x /usr/bin/gw-config-${ARCH} ] && exec /usr/bin/gw-config-${ARCH}
+ [ -x /usr/bin/gw-config.${ARCH} ] && exec /usr/bin/gw-config.${ARCH} $*
done
# No multilib, execute the first one found (there should be only one anyway)
-CONFIGSCRIPT=$(ls -1 /usr/bin/gw-config-* 2>/dev/null | head -n 1)
+CONFIGSCRIPT=$(ls -1 /usr/bin/gw-config.* 2>/dev/null | head -n 1)
if [ -x "${CONFIGSCRIPT}" ]; then
- exec ${CONFIGSCRIPT}
+ exec ${CONFIGSCRIPT} $*
else
- echo "Not a single /usr/bin/gw-config-* script found. Please check why."
+ echo "Not a single /usr/bin/gw-config.* script found. Please check why."
exit 1
fi
Index: kannel.spec
===================================================================
RCS file: /cvs/extras/rpms/kannel/F-11/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 7 Dec 2009 22:24:03 -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: 4%{?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,27 @@ fi
%dir %{_libdir}/kannel/
%{_libdir}/kannel/*.a
+%files docs
+%defattr(-,root,root,-)
+%doc doc/*/*.pdf
+
%changelog
+* Mon Dec 7 2009 Matthias Saou <http://freshrpms.net/> 1.4.3-4
+- Fix gw-config wrapper to actually have it work (#542605).
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.4.3-3
+- rebuilt with new openssl
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* 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
More information about the fedora-extras-commits
mailing list