1.1 --- a/opensips/opensips.spec Tue Aug 28 18:31:20 2012 +0200 1.2 +++ b/opensips/opensips.spec Tue Aug 28 18:31:35 2012 +0200 1.3 @@ -34,8 +34,8 @@ 1.4 Class: PLUS 1.5 Group: VoIP 1.6 License: GPL 1.7 -Version: 1.7.2 1.8 -Release: 20120208 1.9 +Version: 1.8.1 1.10 +Release: 20120800 1.11 1.12 # package options 1.13 %option with_cons yes 1.14 @@ -70,12 +70,10 @@ 1.15 Patch5: opensips.patch.rtpproxy 1.16 1.17 # build information 1.18 -Prefix: %{l_prefix} 1.19 -BuildRoot: %{l_buildroot} 1.20 -BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc, flex, bison, sed 1.21 -PreReq: OpenPKG, openpkg >= 20060823, bash 1.22 -BuildPreReq: libxml, expat, curl, pkgconfig 1.23 -PreReq: libxml, expat, curl 1.24 +BuildPreReq: OpenPKG, openpkg >= 20100101, make, gcc, flex, bison, sed 1.25 +PreReq: OpenPKG, openpkg >= 20100101, bash 1.26 +BuildPreReq: libxml, expat, curl, ncurses, pkgconfig 1.27 +PreReq: libxml, expat, curl, ncurses 1.28 %if "%{with_cons}" == "yes" 1.29 PreReq: perl-dbi, perl-term 1.30 %endif 1.31 @@ -135,8 +133,6 @@ 1.32 BuildPreReq: geoip 1.33 PreReq: geoip 1.34 %endif 1.35 -AutoReq: no 1.36 -AutoReqProv: no 1.37 1.38 %description 1.39 OpenSIPS is (beside Kamailio) a successor to OpenSER, which in 1.40 @@ -206,8 +202,7 @@ 1.41 -e 's;\(-DF_MALLOC\);#\1;' \ 1.42 -e 's;#\(-DDBG_QM_MALLOC\);\1;' \ 1.43 %endif 1.44 - -e 's;\(#define PKG_MEM_POOL_SIZE\) \(1024\*1024\);\1 4*\2;' \ 1.45 - Makefile.defs \ 1.46 + -e 's;\(#define PKG_MEM_SIZE\) 2;\1 4;' \ 1.47 config.h 1.48 %{l_shtool} subst \ 1.49 %if "%{with_fsl}" == "yes" 1.50 @@ -236,6 +231,7 @@ 1.51 -e 's;\(s#/usr/local/sbin\)#;\1/*#;g' \ 1.52 -e 's;\(s#/usr/share/doc/$(NAME)/#$(doc-target)\)#;\1/#;g' \ 1.53 -e 's;\(\$(MAKE).*\) \(install_module_custom\);\1 makefile_defs=0 \2;' \ 1.54 + -e 's#\(cd menuconfig;\)\$(MAKE) proper;#\1 CC="%{l_cc}" CPPFLAGS="%{l_cppflags ncurses}" LDFLAGS="%{l_ldflags}" LIBS="-lncurses" #' \ 1.55 Makefile 1.56 %{l_shtool} subst \ 1.57 -e 's;^\(LIBS=\).*;\1-L`%{l_prefix}/bin/pkg-config --libs db`;' \ 1.58 @@ -258,7 +254,7 @@ 1.59 -e 's;\(my \$fifo_reply_path\) = "/tmp/";\1 = "%{l_prefix}/var/opensips/";' \ 1.60 -e 's;\(my \$HISTORY_FILE\) = "/tmp/osipsconsole_history";\1 = "%{l_prefix}/var/opensips/osipsconsole_history";' \ 1.61 scripts/opensipsctl \ 1.62 - scripts/osipsconsole \ 1.63 + scripts/osipsconsole 1.64 %{l_shtool} subst \ 1.65 -e 's;/usr/local;;g' \ 1.66 -e 's;\(/etc/opensips/\)\.\(opensipsctlrc\);%{l_prefix}\1\2;g' \ 1.67 @@ -492,10 +488,21 @@ 1.68 prefix=%{l_prefix} \ 1.69 modules 1.70 1.71 + # build menuconfig 1.72 + %{l_make} %{l_mflags} \ 1.73 + prefix=%{l_prefix} \ 1.74 + cfg-prefix=$RPM_BUILD_ROOT%{l_prefix}/etc \ 1.75 + data-prefix=$RPM_BUILD_ROOT%{l_prefix}/share \ 1.76 + opensipsmc 1.77 + 1.78 # build rtpproxy extension 1.79 ( cd rtpproxy-%{V_rtpproxy} 1.80 export CC="%{l_cc}" 1.81 export CFLAGS="%{l_cflags -O}" 1.82 + export CPPFLAGS="" 1.83 + case "%{l_platform -t}" in 1.84 + *-sunos5.11 ) CPPFLAGS="$CPPFLAGS -DGE_SOL11" ;; 1.85 + esac 1.86 export LIBS="" 1.87 case "%{l_platform -t}" in 1.88 *-sunos* ) LIBS="$LIBS -lsocket -lnsl -lrt" ;; 1.89 @@ -506,9 +513,6 @@ 1.90 ) || exit $? 1.91 1.92 %install 1.93 - # clean build cruft 1.94 - rm -rf $RPM_BUILD_ROOT 1.95 - 1.96 # select modules 1.97 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' 1.98 %if "%{with_croute}" == "yes" 1.99 @@ -612,7 +616,6 @@ 1.100 %files -f files 1.101 1.102 %clean 1.103 - rm -rf $RPM_BUILD_ROOT 1.104 1.105 %post 1.106 # on install, setup database (osipsconsole db create /pfx/var/opensips/db)