Browse code

pkg/kamailio/centos: moved stun from it's own RPM to the main RPM

- stun no longer has external dependencies and doesn't need to be in its own
RPM

Peter Dunkley authored on 12/09/2013 21:54:35
Showing 1 changed files
... ...
@@ -24,11 +24,11 @@ Conflicts:	kamailio-perl < %ver, kamailio-postgresql < %ver
24 24
 Conflicts:	kamailio-presence < %ver, kamailio-purple < %ver
25 25
 Conflicts:	kamailio-python < %ver, kamailio-regex < %ver
26 26
 Conflicts:	kamailio-sctp < %ver, kamailio-snmpstats < %ver
27
-Conflicts:	kamailio-sqlite < %ver, kamailio-stun < %ver
28
-Conflicts:	kamailio-tls < %ver, kamailio-unixODBC < %ver
29
-Conflicts:	kamailio-utils < %ver, kamailio-websocket < %ver
30
-Conflicts:	kamailio-xhttp-pi < %ver, kamailio-xmlops < %ver
31
-Conflicts:	kamailio-xmlrpc < %ver, kamailio-xmpp < %ver
27
+Conflicts:	kamailio-sqlite < %ver, kamailio-tls < %ver
28
+Conflicts:	kamailio-unixODBC < %ver, kamailio-utils < %ver
29
+Conflicts:	kamailio-websocket < %ver, kamailio-xhttp-pi < %ver
30
+Conflicts:	kamailio-xmlops < %ver, kamailio-xmlrpc < %ver
31
+Conflicts:	kamailio-xmpp < %ver
32 32
 BuildRequires:	bison, flex, gcc, make, redhat-rpm-config
33 33
 
34 34
 %description
... ...
@@ -256,17 +256,6 @@ BuildRequires:	sqlite-devel
256 256
 SQLite database connectivity for Kamailio.
257 257
 
258 258
 
259
-%package	stun
260
-Summary:	Limited STUN (RFC 5389) support for Kamailio.
261
-Group:		System Environment/Daemons
262
-Requires:	openssl, kamailio = %ver
263
-BuildRequires:	openssl-devel
264
-
265
-%description	stun
266
-Limited RFC 5389, "Session Traversal Utilities for NAT (STUN)" support for
267
-Kamailio.
268
-
269
-
270 259
 %package	tls
271 260
 Summary:	TLS transport for Kamailio.
272 261
 Group:		System Environment/Daemons
... ...
@@ -362,7 +351,7 @@ make every-module skip_modules="app_java db_cassandra db_oracle dnssec \
362 351
 	group_include="kstandard kmysql kpostgres kcpl kxml kunixodbc \
363 352
 	kperl ksnmpstats kxmpp kberkeley kldap kutils kpurple \
364 353
 	ktls kwebsocket kpresence klua kpython ksqlite \
365
-	kims koutbound ksctp kstun kautheph"
354
+	kims koutbound ksctp kautheph"
366 355
 make utils
367 356
 
368 357
 
... ...
@@ -376,7 +365,7 @@ make install-modules-all skip_modules="db_cassandra iptrtpproxy db_oracle \
376 365
 	group_include="kstandard kmysql kpostgres kcpl kxml kunixodbc \
377 366
 	kperl ksnmpstats kxmpp kberkeley kldap kutils kpurple \
378 367
 	ktls kwebsocket kpresence klua kpython ksqlite \
379
-	kims koutbound ksctp kstun kautheph"
368
+	kims koutbound ksctp kautheph"
380 369
 
381 370
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d
382 371
 install -m755 pkg/kamailio/centos/%{?centos}/kamailio.init \
... ...
@@ -506,6 +495,7 @@ fi
506 495
 %doc %{_docdir}/kamailio/modules/README.sqlops
507 496
 %doc %{_docdir}/kamailio/modules/README.sst
508 497
 %doc %{_docdir}/kamailio/modules/README.statistics
498
+%doc %{_docdir}/kamailio/modules/README.stun
509 499
 %doc %{_docdir}/kamailio/modules/README.textops
510 500
 %doc %{_docdir}/kamailio/modules/README.textopsx
511 501
 %doc %{_docdir}/kamailio/modules/README.timer
... ...
@@ -643,6 +633,7 @@ fi
643 633
 %{_libdir}/kamailio/modules/sqlops.so
644 634
 %{_libdir}/kamailio/modules/sst.so
645 635
 %{_libdir}/kamailio/modules/statistics.so
636
+%{_libdir}/kamailio/modules/stun.so
646 637
 %{_libdir}/kamailio/modules/textops.so
647 638
 %{_libdir}/kamailio/modules/textopsx.so
648 639
 %{_libdir}/kamailio/modules/timer.so
... ...
@@ -924,12 +915,6 @@ fi
924 915
 %{_datadir}/kamailio/db_sqlite/*
925 916
 
926 917
 
927
-%files		stun
928
-%defattr(-,root,root)
929
-%doc %{_docdir}/kamailio/modules/README.stun
930
-%{_libdir}/kamailio/modules/stun.so
931
-
932
-
933 918
 %files		tls
934 919
 %defattr(-,root,root)
935 920
 %doc %{_docdir}/kamailio/modules/README.tls
... ...
@@ -982,6 +967,9 @@ fi
982 967
 
983 968
 
984 969
 %changelog
970
+* Thu Sep 12 2013 Peter Dunkley <peter.dunkley@crocodilertc.net>
971
+  - stun no longer depends on OpenSSL so it has been moved to the standard
972
+    module set
985 973
 * Wed Sep 11 2013 Peter Dunkley <peter.dunkley@crocodilertc.net>
986 974
   - Removed Fedora stuff as I am only maintaining this for CentOS now
987 975
   - Updated rel to dev8