- added Conflicts to deb & rpm-4.0 spec (not tested yet)

- version chg. to 0.8.11pre30

Makefile.defs

@@ -23,6 +23,7 @@
 #  2003-05-23  check if this makefile was already included (andrei)
 #              removed -DDIGEST_DOMAIN (andrei)
 #  2003-05-30  added extra_defs (andrei)
+#  2003-06-06  moved compiler detection before DEFS (andrei)
 
 
 # check if already included/exported
@@ -124,6 +125,63 @@ YACC := $(shell echo "$${YACC}")
 
 
 
+# find compiler name & version
+ifeq ($(CC),)
+	CC=gcc
+endif
+LD= $(CC)
+CC_LONGVER=$(shell if  $(CC) -v 2>/dev/null; then \
+						$(CC) -v 2>&1 ;\
+					else \
+						$(CC) -V 2>&1 ; \
+					fi )
+MKTAGS=ctags -R .
+
+#find-out the compiler's name
+
+ifneq (,$(findstring gcc, $(CC_LONGVER)))
+	CC_NAME=gcc
+	CC_VER=$(CC) $(shell $(CC) --version|head -1| \
+				 sed -e 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/' -e 's/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
+	# sun sed is a little brain damaged => this complicated expression
+	MKDEP=$(CC) -MM 
+	#transform gcc version into 2.9x or 3.0
+	CC_SHORTVER=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \
+				 sed -e 's/[^0-9]*-\(.*\)/\1/'| \
+				 sed -e 's/2\.9.*/2.9x/' -e 's/3\..\..*/3.0/' -e \
+				 	's/3\../3.0/')
+endif
+
+ifneq (, $(findstring Sun, $(CC_LONGVER)))
+	CC_NAME=suncc
+	CC_SHORTVER=$(shell echo "$(CC_LONGVER)"|head -1| \
+					sed -e 's/.*\([0-9]\.[0-9]\).*/\1/g' )
+	CC_VER=$(CC) $(CC_SHORTVER)
+	MKDEP=$(CC) -xM1 
+endif
+
+ifneq (, $(findstring Intel(R) C++ Compiler, $(CC_LONGVER)))
+	# very nice: gcc compatible
+	CC_NAME=icc
+	CC_FULLVER=$(shell echo "$(CC_LONGVER)"|head -1| \
+					sed -e 's/.*Version \([0-9]\.[0-9]\.[0-9]*\).*/\1/g' )
+	CC_SHORTVER=$(shell echo "$(CC_FULLVER)" | cut -d. -f1,2 )
+	CC_VER=$(CC) $(CC_FULLVER)
+	MKDEP=$(CC) -MM 
+endif
+
+
+ifeq (,$(CC_NAME))
+#not found
+	CC_NAME=$(CC)
+	CC_SHORTVER=unknown
+	CC_VER=unknown
+	MKDEP=gcc -MM 
+$(warning	Unknown compiler $(CC)\; supported compilers: \
+			gcc, sun cc, intel icc )
+endif
+
+
 # compile-time options
 #
 # -DSTATS
@@ -239,63 +297,6 @@ endif
 
 # platform dependent settings
 
-
-#common
-ifeq ($(CC),)
-	CC=gcc
-endif
-LD= $(CC)
-CC_LONGVER=$(shell if  $(CC) -v 2>/dev/null; then \
-						$(CC) -v 2>&1 ;\
-					else \
-						$(CC) -V 2>&1 ; \
-					fi )
-MKTAGS=ctags -R .
-
-#find-out the compiler's name
-
-ifneq (,$(findstring gcc, $(CC_LONGVER)))
-	CC_NAME=gcc
-	CC_VER=$(CC) $(shell $(CC) --version|head -1| \
-				 sed -e 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/' -e 's/[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/')
-	# sun sed is a little brain damaged => this complicated expression
-	MKDEP=$(CC) -MM 
-	#transform gcc version into 2.9x or 3.0
-	CC_SHORTVER=$(shell echo "$(CC_VER)" | cut -d" " -f 2| \
-				 sed -e 's/[^0-9]*-\(.*\)/\1/'| \
-				 sed -e 's/2\.9.*/2.9x/' -e 's/3\..\..*/3.0/' -e \
-				 	's/3\../3.0/')
-endif
-
-ifneq (, $(findstring Sun, $(CC_LONGVER)))
-	CC_NAME=suncc
-	CC_SHORTVER=$(shell echo "$(CC_LONGVER)"|head -1| \
-					sed -e 's/.*\([0-9]\.[0-9]\).*/\1/g' )
-	CC_VER=$(CC) $(CC_SHORTVER)
-	MKDEP=$(CC) -xM1 
-endif
-
-ifneq (, $(findstring Intel(R) C++ Compiler, $(CC_LONGVER)))
-	# very nice: gcc compatible
-	CC_NAME=icc
-	CC_FULLVER=$(shell echo "$(CC_LONGVER)"|head -1| \
-					sed -e 's/.*Version \([0-9]\.[0-9]\.[0-9]*\).*/\1/g' )
-	CC_SHORTVER=$(shell echo "$(CC_FULLVER)" | cut -d. -f1,2 )
-	CC_VER=$(CC) $(CC_FULLVER)
-	MKDEP=$(CC) -MM 
-endif
-
-
-ifeq (,$(CC_NAME))
-#not found
-	CC_NAME=$(CC)
-	CC_SHORTVER=unknown
-	CC_VER=unknown
-	MKDEP=gcc -MM 
-$(warning	Unknown compiler $(CC)\; supported compilers: \
-			gcc, sun cc, intel icc )
-endif
-
 # find ld & as name (gnu or solaris)
 ifeq ($(ARCH), sparc64)
 ifeq ($(CC_NAME), gcc)

TODO

@@ -3,7 +3,7 @@ $Id$
 ( - todo, x - done)
 
 release:
-- fix CC_VER bug in newer Makefile (move DEFS after CC?)
+x fix CC_VER bug in newer Makefile (move DEFS after CC?)
 x openbsd 3.2 packages -> doc in share/doc (and not in doc)
 - openbsd 3.2 -> add jabber and mysql to the package
 x fix modules makefiles (so that cd modules/foo; make will also link the proper

debian/changelog

@@ -1,3 +1,11 @@
+ser (0.8.11-pre30) unstable; urgency=low
+
+  * minor bugfixes
+
+  * debian packaging changes (added conflicts)
+
+ -- Andrei Pelinescu-Onciul <[email protected]>  Fri, 06 Jun 2003 14:03:29 +0200
+
 ser (0.8.11-pre29) unstable; urgency=low
 
   * RFC3261 support (TCP, loose routing)

debian/control

@@ -9,6 +9,7 @@ Package: ser
 Architecture: any
 Depends: ${shlibs:Depends}
 Suggests: ser-mysql-module, ser-jabber-module
+Conflicts: ser-mysql-module (< ${Source-Version}), ser-jabber-module (< ${Source-Version}), ser-radius-modules (< ${Source-Version})
 Description: Sip Express Router, very fast and configurable SIP proxy
  ser or SIP Express Router is a very fast and flexible SIP (RFC3621)
  proxy server. Written entirely in C, ser can handle thousands calls

rpm/ser.spec-4.1

@@ -1,6 +1,6 @@
 %define name    ser
-%define ver     0.8.11pre29
-%define rel     1
+%define ver     0.8.11pre30
+%define rel     0
 
 %define EXCLUDED_MODULES	mysql jabber auth_radius group_radius uri_radius postgress snmp cpl cpl-c ext extcmd mangler pdt
 %define MYSQL_MODULES		mysql
@@ -20,6 +20,7 @@ Source2:      ser.init
 URL:          http://iptel.org/ser
 Vendor:       FhG Fokus
 BuildRoot:    /var/tmp/%{name}-%{ver}-root
+Conflicts:    ser-mysql < %ver, ser-jabber < %ver, ser-radius < %ver
 BuildPrereq:  make flex bison
 
 
@@ -232,6 +233,9 @@ fi
 
 %changelog
 
+* Fri Jun 6 2003 Andrei Pelinescu - Onciul <[email protected]>
+- added Conflicts:, changed vesion to 0.8.11pre30
+
 * Mon Jun 2 2003 Daniel-Constantin Mierla <[email protected]>
 - added README files for ser-jabber and ser-radius packages
 - spec file updated to work with rpm v4.1+