rpms/sems/F-10 sems--gcc44.diff, NONE, 1.1 sems--makefile_defs_removal.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 sems.spec, 1.1, 1.2 sources, 1.2, 1.3

Peter Lemenkov peter at fedoraproject.org
Sat Jul 11 14:43:20 UTC 2009 

Author: peter

Update of /cvs/pkgs/rpms/sems/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv724/F-10

Modified Files:
	.cvsignore import.log sems.spec sources 
Added Files:
	sems--gcc44.diff sems--makefile_defs_removal.diff 
Log Message:
Ver. 1.1.1

sems--gcc44.diff:

--- NEW FILE sems--gcc44.diff ---
--- ./apps/diameter_client/ServerConnection.h~	2009-01-19 20:11:43.000000000 +0300
+++ ./apps/diameter_client/ServerConnection.h	2009-04-19 21:08:09.048458437 +0400
@@ -38,6 +38,7 @@
 #include <vector>
 #include <map>
 #include <utility>
+#include <stdint.h>
 using std::string;
 using std::vector;
 using std::map;

sems--makefile_defs_removal.diff:

--- NEW FILE sems--makefile_defs_removal.diff ---
--- Makefile.defs~	2009-01-20 21:02:34.000000000 +0300
+++ Makefile.defs	2009-04-19 20:45:30.208412422 +0400
@@ -1,10 +1,3 @@
-ifeq ($(makefile_defs), 1)
-else
-makefile_defs=1
-export makefile_defs
-
-SVN_REV?=r$(shell svnversion -n .)
-
 #version number
 VERSION = 1
 PATCHLEVEL = 1
@@ -14,153 +7,19 @@
 REL_VERSION=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)
 RELEASE=$(REL_VERSION)$(EXTRAVERSION)
 
-CPPFLAGS += -D_DEBUG \
-	  -D_THREAD_SAFE -D_REENTRANT \
-	  -DSEMS_VERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"'\
-	  -DOS='"$(OS)"' 	\
-#         -DMAX_RTP_SESSIONS=8192 \
-#         -DOpenSER \
-#	  -DSUPPORT_IPV6 \
-#	  -DNO_THREADID_LOG \
-
-# compile with spandsp DTMF detection? see soft-switch.org
-#   this needs a fairly new version of spandsp - tested with 0.0.4pre11
-#   will not work with spandsp 0.0.2 .
-#   (which means that current debian and gentoo packages don't work)
-#   
-#USE_SPANDSP    = yes
-# statically link spandsp library? 
-#   (might need adjusting spandsp lib path LIBSPANDSP_LDIR - may be /usr/lib)
-#LIBSPANDSP_STATIC = yes
-#LIBSPANDSP_LDIR = /usr/local/lib/
-
-
-# compile with sample rate conversion from secret rabbit code? 
-# (see http://www.mega-nerd.com/SRC/)
-#
-#USE_LIBSAMPLERATE = yes
-
-#
-# ZRTP support? (see zfoneproject.com)
-#WITH_ZRTP = yes
-
-#
-# exclude some modules from compilation?
-# e.g. python modules:
-#exclude_modules ?= py_sems ivr mailbox pin_collect conf_auth mp3 examples
-
 LDFLAGS += -lm
 
 OS     = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
 
-ifdef USE_SPANDSP
-ifneq ($(spandsp_defs), 1)
-spandsp_defs=1
-export spandsp_defs
-CPPFLAGS += -DUSE_SPANDSP -D__STDC_LIMIT_MACROS
-endif
-endif
-
-ifdef USE_LIBSAMPLERATE
-ifneq ($(libsrc_defs), 1)
-libsrc_defs=1
-export libsrc_defs
-CPPFLAGS += -DUSE_LIBSAMPLERATE
-endif
-endif
-
-# Additions for Solaris support.
-ifeq ($(OS),solaris)
-	GETARCH=uname -p
-	CPPFLAGS += -DHAVE_SYS_SOCKIO_H -DBSD_COMP -fPIC -include compat/solaris.h
-        CFLAGS += -DHAVE_SYS_SOCKIO_H -DBSD_COMP -fPIC -include compat/solaris.h
-        # For nanosleep.
-        LDFLAGS += -lrt
-        # For inet_aton.
-        LDFLAGS += -lresolv
-
-	# I don't have libspeex installed.
-	# binrpcctrl does some really weird header stuff that doesn't work.
-	exclude_modules += binrpcctrl ilbc speex
-else
-	GETARCH=uname -m
-endif
-
-ARCH ?= $(shell $(GETARCH) |sed -e s/i.86/i386/ -e s/sun4u/sparc64/  \
-			-e s/armv4l/arm/ -e "s/Power Macintosh/ppc/" \
-			-e "s/cobalt/mips2/" \
-			-e s/amd64/x86_64/ )
-
-# fix sparc -> sparc64
-ifeq ($(ARCH),sparc)
-	ifeq ($(shell uname -m),sun4u)
-		ARCH := sparc64
-	endif
-endif
-
 # need OS specific for this ?
 CXX = g++
 CC = gcc
 LD = $(CC)
 
-
-CXXFLAGS += -Wall -Wno-reorder -fPIC -g \
-	    -O2 $(EXTRA_CXXFLAGS)
-         
-CFLAGS += -Wall -fPIC -g -O2 $(EXTRA_CFLAGS)
-
-ifeq ($(DEBUG_PLAYOUT), yes)
-CPPFLAGS +=  -DDEBUG_PLAYOUTBUF
-endif
-
-ifdef WITH_ZRTP
-CPPFLAGS += -DWITH_ZRTP \
-	    -DBUILD_ZRTP_MUTEXES \
-	    -DBUILD_DEFAULT_CACHE -DBUILD_DEFAULT_TIMER -DUNIX -DBUILD_ZRTP_MUTEXES \
-	    -I/usr/local/include/zrtp 
-endif
-
 TARGET =
 LIB_LDFLAGS = -shared
 
-ifeq ($(OS), linux)
-	LDFLAGS +=  -ldl -rdynamic -lpthread
-else
-ifeq ($(OS), freebsd)
-	LDFLAGS += -rdynamic -pthread
-else
-ifeq ($(OS), openbsd)
-	LDFLAGS += -rdynamic -pthread
-else
-ifeq ($(OS), netbsd)
-	LDFLAGS += -rdynamic -pthread
-else
-ifeq ($(OS), darwin)
-	LDFLAGS += -rdynamic -pthread
-	LIB_LDFLAGS = -flat_namespace -undefined suppress -bundle
-	CXXFLAGS += -fno-common
-	CFLAGS += -fno-common
-
-	#necessary for sa_len|ss_len|sin_len
-	# may be needed on other *BSD
-	CPPFLAGS += -DBSD44SOCKETS
-
-	# add the DarwinPorts directory
-	ifneq ($(ARCH), iphone)
-	      CPPFLAGS += -D__DARWIN_UNIX03
-	      CPPFLAGS += -I /opt/local/include
-	      LDFLAGS += -L/opt/local/lib
-	endif	      
-
-	override exclude_modules += binrpcctrl mp3 examples py_sems
-else
-	LDFLAGS+= -fPIC -ldl -lsocket -lnsl -lpthread
-	TARGET=solaris
-endif
-endif
-endif
-endif
-endif
+LDFLAGS +=  -ldl -rdynamic -lpthread
 
 LIB_LDFLAGS += $(LDFLAGS)
 
@@ -201,28 +60,8 @@
 
 ser-cfg-dir = etc/ser/
 
-ifeq ($(OS), linux)
-	doc-dir = share/doc/sems/
-	man-dir = share/man/
-else
-ifeq ($(OS), freebsd)
-	doc-dir = share/doc/sems/
-	man-dir = man/
-else
-ifeq ($(OS), openbsd)
-	doc-dir = share/doc/sems/
-	man-dir = man/
-else
-ifeq ($(OS), netbsd)
-	doc-dir = share/doc/sems
-	man-dir = man/
-else
-	doc-dir = doc/sems/
-	man-dir = man/
-endif
-endif
-endif
-endif
+doc-dir = share/doc/sems/
+man-dir = share/man/
 
 # target dirs for various stuff
 bin-target = $(prefix)/$(bin-dir)
@@ -232,14 +71,8 @@
 ser-cfg-target =$(ser-prefix)/$(ser-cfg-dir)
 lib-target = $(prefix)/$(lib-dir)
 
-ifeq ($(OS), solaris)
-#use GNU versions
-INSTALL ?= ginstall
-TAR ?= gtar
-else
 INSTALL ?= install 
 TAR ?= tar
-endif
 
 INSTALL-TOUCH = touch          # used to create the file first (good to 
                                #  make solaris install work)
@@ -251,7 +84,7 @@
 
 #export stuff to sub-makes
 export REL_VERSION RELEASE OS
-export CPPFLAGS CXXFLAGS LDFLAGS CFLAGS LIB_LDFLAGS
+export LDFLAGS LIB_LDFLAGS
 export CXX CC LD
 export DESTDIR PREFIX prefix basedir ser-prefix
 export start-script
@@ -260,12 +93,6 @@
 export bin-target cfg-target modules-target audio-target ser-cfg-target lib-target
 export INSTALL TAR INSTALL-TOUCH INSTALL-CFG INSTALL-BIN INSTALL-MODULES INSTALL-DOC INSTALL-AUDIO
 
-export USE_SPANDSP LIBSPANDSP_STATIC LIBSPANDSP_LDIR
-export USE_LIBSAMPLERATE
-export WITH_ZRTP
-
-endif  # ifeq ($(makefile_defs, 1)
-
 mk-install-dirs: $(DESTDIR)$(cfg-target) \
 		 $(DESTDIR)$(bin-prefix)/$(bin-dir) \
 		 $(DESTDIR)$(modules-prefix)/$(modules-dir) \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	11 Apr 2009 03:29:02 -0000	1.2
+++ .cvsignore	11 Jul 2009 14:42:49 -0000	1.3
@@ -1 +1 @@
-sems-1.1.0.w_o_ilbc_sources.tar.gz
+sems-1.1.1.w_o_ilbc_sources.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-10/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	11 Apr 2009 03:29:02 -0000	1.1
+++ import.log	11 Jul 2009 14:42:49 -0000	1.2
@@ -1 +1,2 @@
 sems-1_1_0-5_fc10:F-10:sems-1.1.0-5.fc10.src.rpm:1239420482
+sems-1_1_1-1_fc10:F-10:sems-1.1.1-1.fc10.src.rpm:1247323339


Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-10/sems.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems.spec	11 Apr 2009 03:29:02 -0000	1.1
+++ sems.spec	11 Jul 2009 14:42:50 -0000	1.2
@@ -1,12 +1,12 @@
 Summary:	SIP Express Media Server, an extensible SIP media server
 Name:		sems
-Version:	1.1.0
-Release:	5%{?dist}
+Version:	1.1.1
+Release:	1%{?dist}
 URL:		http://www.iptel.org/sems
-# wget http://ftp.iptel.org/pub/sems/sems-1.1.0.tar.gz
-# tar zx --exclude iLBC_rfc3951 -f sems-1.1.0.tar.gz
-# tar czf sems-1.1.0.w_o_ilbc_sources.tar.gz sems-1.1.0
-Source0:	sems-1.1.0.w_o_ilbc_sources.tar.gz
+# wget http://ftp.iptel.org/pub/sems/sems-1.1.1.tar.gz
+# tar zx --exclude iLBC_rfc3951 -f sems-1.1.1.tar.gz
+# tar czf sems-1.1.1.w_o_ilbc_sources.tar.gz sems-1.1.1
+Source0:	sems-1.1.1.w_o_ilbc_sources.tar.gz
 License:	GPLv2+
 Group:		Applications/Communications
 # Use external gsm instead of shipped one
@@ -17,6 +17,11 @@ Patch3:		sems--flite-hardcoded-path-remo
 Patch4:		sems--py_sources_install.diff
 # module apps/xmlrpc2di uses custoimized version of xmlrpc++ library
 Patch5:		sems--xmlrpc++-use_fedora_cxxflags.diff
+# Get rid of stupid makefile_defs condition in Makefile.defs
+# which prevents uf from successful building on some Fedora releases
+Patch6:		sems--makefile_defs_removal.diff
+# GCC 4.4 fixes
+Patch7:		sems--gcc44.diff
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # temporary fix for https://fedorahosted.org/fedora-infrastructure/ticket/1202
 #BuildRequires:	python >= 2.3
@@ -154,17 +159,21 @@ rm -rf core/plug-in/gsm/gsm-1.0-pl10/
 %patch3 -p0 -b .flite_hardcoded
 %patch4 -p0 -b .py_install_also
 %patch5 -p0 -b .cxxflags
+%patch6 -p0 -b .makefile_defs_removal
+%patch7 -p0 -b .gcc44
 
 iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client{.utf8,}
 iconv -f iso8859-1 -t UTF-8 doc/Readme.voicebox > doc/Readme.voicebox.utf8 && mv doc/Readme.voicebox{.utf8,}
 mv ./apps/dsm/fsmc/readme.txt  ./apps/dsm/fsmc/Readme.fsmc.txt
 
 %build
-make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all
+export CPPFLAGS="-D_REENTRANT -DSEMS_VERSION='\"%{version}\"' -DARCH='\"%{_arch}\"' -DOS='\"linux\"'  -DUSE_SPANDSP -D__STDC_LIMIT_MACROS -DUSE_LIBSAMPLERATE -Wall -Wno-reorder -fPIC -g"
+export CXXFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
+export CFLAGS="-Wno-reorder -fPIC $RPM_OPT_FLAGS"
+make %{?_smp_mflags} EXTRA_CXXFLAGS="$RPM_OPT_FLAGS" USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" all \
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export CFLAGS="$RPM_OPT_FLAGS"
 make install USE_SPANDSP="yes" USE_LIBSAMPLERATE="yes" TTS="y" exclude_modules="examples %{!?with_ilbc:ilbc} %{!?with_mp3:mp3}" \
 	DESTDIR=$RPM_BUILD_ROOT \
 	basedir= \
@@ -537,6 +546,12 @@ fi
 %{_libdir}/%{name}/plug-in/xmlrpc2di.so
 
 %changelog
+* Thu Apr 30 2009 Ján ONDREJ (SAL) <ondrejj(at)salstar.sk> - 1.1.0-7
+- rebuilt
+
+* Sun Apr 19 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-6
+- Fix building with GCC 4.4
+
 * Fri Apr 10 2009 Peter Lemenkov <lemenkov at gmail.com> 1.1.0-5
 - Use modified tarball (with ilBC sources completely removed)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/sems/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	11 Apr 2009 03:29:02 -0000	1.2
+++ sources	11 Jul 2009 14:42:50 -0000	1.3
@@ -1 +1 @@
-6e794b96f0657f073d458aaafd932952  sems-1.1.0.w_o_ilbc_sources.tar.gz
+1faee6a6e7c85babd84288cd7e0ff7cc  sems-1.1.1.w_o_ilbc_sources.tar.gz

More information about the fedora-extras-commits mailing list