[sr-dev] git:master: pkg/kamailio/fedora/16: Updated .spec file

Module: sip-router Branch: master Commit: 113c0e63686e8d3cdca21e9a6399dce727ee866f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=113c0e6… Author: Peter Dunkley &lt;peter.dunkley(a)crocodile-rcs.com&gt; Committer: Peter Dunkley &lt;peter.dunkley(a)crocodile-rcs.com&gt; Date: Sat Oct 20 02:38:18 2012 +0100 pkg/kamailio/fedora/16: Updated .spec file - Added installation of auth.7.gz for Fedoa now that manpages are built for Fedora - Added "make utils" to build section - SCTP and STUN now included in build - Removed kamailio-tls package - tls module now in main Kamailio RPM as that has openssl as a dependency for STUN --- pkg/kamailio/fedora/16/kamailio.spec | 40 ++++++++++++++++----------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/pkg/kamailio/fedora/16/kamailio.spec b/pkg/kamailio/fedora/16/kamailio.spec index c80c989..9e0c5e9 100644 --- a/pkg/kamailio/fedora/16/kamailio.spec +++ b/pkg/kamailio/fedora/16/kamailio.spec @@ -20,7 +20,7 @@ Conflicts: kamailio-unixODBC < %ver, kamailio-bdb < %ver Conflicts: kamailio-sqlite < %ver, kamailio-utils < %ver Conflicts: kamailio-cpl < %ver, kamailio-snmpstats < %ver Conflicts: kamailio-presence < %ver, kamailio-xmpp < %ver -Conflicts: kamailio-tls < %ver, kamailio-purple < %ver, kamailio-ldap < %ver +Conflicts: kamailio-purple < %ver, kamailio-ldap < %ver Conflicts: kamailio-xmlrpc < %ver, kamailio-perl < %ver, kamailio-lua < %ver Conflicts: kamailio-python < %ver, kamailio-regex < %ver Conflicts: kamailio-dialplan < %ver, kamailio-lcr < %ver @@ -31,7 +31,8 @@ Conflicts: kamailio-radius < %ver, kamailio-carrierroute < %ver Conflicts: kamailio-redis < %ver, kamailio-json < %ver Conflicts: kamailio-mono < %ver, kamailio-GeoIP < %ver %endif -BuildRequires: bison flex gcc make redhat-rpm-config +Requires: openssl +BuildRequires: bison flex gcc make redhat-rpm-config openssl-devel %description Kamailio (former OpenSER) is an Open Source SIP Server released under GPL, able @@ -150,16 +151,6 @@ BuildRequires: expat-devel SIP/XMPP IM gateway for Kamailio. -%package tls -Summary: TLS transport for Kamailio. -Group: System Environment/Daemons -Requires: openssl, kamailio = %ver -BuildRequires: openssl-devel - -%description tls -TLS transport for Kamailio. - - %package ldap Summary: LDAP search interface for Kamailio. Group: System Environment/Daemons @@ -253,8 +244,8 @@ XML operation functions for Kamailio. %package websocket Summary: WebSocket transport for Kamailio. Group: System Environment/Daemons -Requires: openssl, libunistring, kamailio = %ver -BuildRequires: openssl-devel, libunistring-devel +Requires: libunistring, kamailio = %ver +BuildRequires: libunistring-devel %description websocket WebSocket transport for Kamailio. @@ -356,7 +347,7 @@ Max Mind GeoIP real-time query support for Kamailio. %build make FLAVOUR=kamailio cfg prefix=/usr cfg_prefix=$RPM_BUILD_ROOT\ basedir=$RPM_BUILD_ROOT cfg_target=/%{_sysconfdir}/kamailio/\ - modules_dirs="modules modules_k" + modules_dirs="modules modules_k" SCTP=1 STUN=1 make %if 0%{?fedora} make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ @@ -373,6 +364,7 @@ make every-module skip_modules="auth_identity db_cassandra iptrtpproxy\ klcr ksqlite kberkeley kwebsocket"\ include_modules="xmlrpc xmlops cdp cdp_avp corex" %endif +make utils @@ -496,6 +488,7 @@ fi %doc %{_docdir}/kamailio/modules/README.sl %doc %{_docdir}/kamailio/modules/README.sms %doc %{_docdir}/kamailio/modules/README.textopsx +%doc %{_docdir}/kamailio/modules/README.tls %doc %{_docdir}/kamailio/modules/README.tm %doc %{_docdir}/kamailio/modules/README.tmrec %doc %{_docdir}/kamailio/modules/README.topoh @@ -621,6 +614,7 @@ fi %{_libdir}/kamailio/modules/sms.so %{_libdir}/kamailio/modules/tm.so %{_libdir}/kamailio/modules/tmrec.so +%{_libdir}/kamailio/modules/tls.so %{_libdir}/kamailio/modules/textopsx.so %{_libdir}/kamailio/modules/topoh.so %{_libdir}/kamailio/modules/xhttp.so @@ -703,6 +697,9 @@ fi %{_libdir}/kamailio/kamctl/dbtextdb/dbtextdb.pyo %{_mandir}/man5/* +%if 0%{?fedora} +%{_mandir}/man7/auth.7.gz +%endif %{_mandir}/man8/* %dir %{_datadir}/kamailio @@ -820,12 +817,6 @@ fi %{_libdir}/kamailio/modules_k/xmpp.so -%files tls -%defattr(-,root,root) -%doc %{_docdir}/kamailio/modules/README.tls -%{_libdir}/kamailio/modules/tls.so - - %files purple %defattr(-,root,root) %doc %{_docdir}/kamailio/modules_k/README.purple @@ -980,6 +971,13 @@ fi %changelog * Fri Oct 20 2012 Peter Dunkley &lt;peter(a)dunkley.me.uk&gt; - Set ownership of /etc/kamailio to kamailio.kamailio + - Added installation of auth.7.gz for Fedora now that manpages are built for + Fedora + - Added "make utils" to the build section (when it's not there utils get + built during the install - which isn't right) + - SCTP and STUN now included in this build + - Removed kamailio-tls package - tls module now in main kamailio RPM as that + has openssl as a dependency for STUN * Sun Sep 17 2012 Peter Dunkley &lt;peter(a)dunkley.me.uk&gt; - Added corex module to RPM builds - Updated rel to dev4