diff -r 7894123eadbf -r 1c75a8bb0fec opensips/opensips.spec --- a/opensips/opensips.spec Tue Aug 28 18:31:20 2012 +0200 +++ b/opensips/opensips.spec Tue Aug 28 18:31:35 2012 +0200 @@ -34,8 +34,8 @@ Class: PLUS Group: VoIP License: GPL -Version: 1.7.2 -Release: 20120208 +Version: 1.8.1 +Release: 20120800 # package options %option with_cons yes @@ -70,12 +70,10 @@ Patch5: opensips.patch.rtpproxy # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc, flex, bison, sed -PreReq: OpenPKG, openpkg >= 20060823, bash -BuildPreReq: libxml, expat, curl, pkgconfig -PreReq: libxml, expat, curl +BuildPreReq: OpenPKG, openpkg >= 20100101, make, gcc, flex, bison, sed +PreReq: OpenPKG, openpkg >= 20100101, bash +BuildPreReq: libxml, expat, curl, ncurses, pkgconfig +PreReq: libxml, expat, curl, ncurses %if "%{with_cons}" == "yes" PreReq: perl-dbi, perl-term %endif @@ -135,8 +133,6 @@ BuildPreReq: geoip PreReq: geoip %endif -AutoReq: no -AutoReqProv: no %description OpenSIPS is (beside Kamailio) a successor to OpenSER, which in @@ -206,8 +202,7 @@ -e 's;\(-DF_MALLOC\);#\1;' \ -e 's;#\(-DDBG_QM_MALLOC\);\1;' \ %endif - -e 's;\(#define PKG_MEM_POOL_SIZE\) \(1024\*1024\);\1 4*\2;' \ - Makefile.defs \ + -e 's;\(#define PKG_MEM_SIZE\) 2;\1 4;' \ config.h %{l_shtool} subst \ %if "%{with_fsl}" == "yes" @@ -236,6 +231,7 @@ -e 's;\(s#/usr/local/sbin\)#;\1/*#;g' \ -e 's;\(s#/usr/share/doc/$(NAME)/#$(doc-target)\)#;\1/#;g' \ -e 's;\(\$(MAKE).*\) \(install_module_custom\);\1 makefile_defs=0 \2;' \ + -e 's#\(cd menuconfig;\)\$(MAKE) proper;#\1 CC="%{l_cc}" CPPFLAGS="%{l_cppflags ncurses}" LDFLAGS="%{l_ldflags}" LIBS="-lncurses" #' \ Makefile %{l_shtool} subst \ -e 's;^\(LIBS=\).*;\1-L`%{l_prefix}/bin/pkg-config --libs db`;' \ @@ -258,7 +254,7 @@ -e 's;\(my \$fifo_reply_path\) = "/tmp/";\1 = "%{l_prefix}/var/opensips/";' \ -e 's;\(my \$HISTORY_FILE\) = "/tmp/osipsconsole_history";\1 = "%{l_prefix}/var/opensips/osipsconsole_history";' \ scripts/opensipsctl \ - scripts/osipsconsole \ + scripts/osipsconsole %{l_shtool} subst \ -e 's;/usr/local;;g' \ -e 's;\(/etc/opensips/\)\.\(opensipsctlrc\);%{l_prefix}\1\2;g' \ @@ -492,10 +488,21 @@ prefix=%{l_prefix} \ modules + # build menuconfig + %{l_make} %{l_mflags} \ + prefix=%{l_prefix} \ + cfg-prefix=$RPM_BUILD_ROOT%{l_prefix}/etc \ + data-prefix=$RPM_BUILD_ROOT%{l_prefix}/share \ + opensipsmc + # build rtpproxy extension ( cd rtpproxy-%{V_rtpproxy} export CC="%{l_cc}" export CFLAGS="%{l_cflags -O}" + export CPPFLAGS="" + case "%{l_platform -t}" in + *-sunos5.11 ) CPPFLAGS="$CPPFLAGS -DGE_SOL11" ;; + esac export LIBS="" case "%{l_platform -t}" in *-sunos* ) LIBS="$LIBS -lsocket -lnsl -lrt" ;; @@ -506,9 +513,6 @@ ) || exit $? %install - # clean build cruft - rm -rf $RPM_BUILD_ROOT - # select modules modslist='b2b_entities b2b_logic cpl-c db_http identity jabber perl perlvdb presence presence_dialoginfo presence_mwi presence_xml pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp regex rls tlsops xcap_client xmpp' %if "%{with_croute}" == "yes" @@ -612,7 +616,6 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT %post # on install, setup database (osipsconsole db create /pfx/var/opensips/db)