rpms/sems/EL-5 sems-0010-Fix-newest-variables-escaping-strategy-on-new-CMake.patch, NONE, 1.1 sems-0011-Disable-mysql-in-conference-and-early_announce-modul.patch, NONE, 1.1 import.log, 1.5, 1.6 sems-0001-Force-to-use-system-wide-GSM-includes.patch, 1.2, 1.3 sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch, 1.2, 1.3 sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch, 1.2, 1.3 sems-0004-Fix-for-old-python-2.4.patch, 1.2, 1.3 sems-0005-More-compatibility-with-older-CMake-2.4.patch, 1.1, 1.2 sems-0006-Typo-paramater-parameter.patch, 1.1, 1.2 sems-0007-Copy-paste-typo-this-conf-file-actually-is-a-early_a.patch, 1.1, 1.2 sems-0008-Fix-MOD_NAME-passing-to-gcc.patch, 1.1, 1.2 sems-0009-More-CMake-templates-for-config-files.patch, 1.1, 1.2 sems.spec, 1.6, 1.7

Peter Lemenkov peter at fedoraproject.org
Fri Jun 25 09:44:20 UTC 2010


Author: peter

Update of /cvs/pkgs/rpms/sems/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1831/EL-5

Modified Files:
	import.log 
	sems-0001-Force-to-use-system-wide-GSM-includes.patch 
	sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch 
	sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch 
	sems-0004-Fix-for-old-python-2.4.patch 
	sems-0005-More-compatibility-with-older-CMake-2.4.patch 
	sems-0006-Typo-paramater-parameter.patch 
	sems-0007-Copy-paste-typo-this-conf-file-actually-is-a-early_a.patch 
	sems-0008-Fix-MOD_NAME-passing-to-gcc.patch 
	sems-0009-More-CMake-templates-for-config-files.patch 
	sems.spec 
Added Files:
	sems-0010-Fix-newest-variables-escaping-strategy-on-new-CMake.patch 
	sems-0011-Disable-mysql-in-conference-and-early_announce-modul.patch 
Log Message:
Several fixes

sems-0010-Fix-newest-variables-escaping-strategy-on-new-CMake.patch:
 CMakeLists.txt |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE sems-0010-Fix-newest-variables-escaping-strategy-on-new-CMake.patch ---
>From 0ebc0eb0051a62d26e9788af15b4a8cb7c2e9562 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Wed, 2 Jun 2010 13:13:04 +0000
Subject: [PATCH 10/11] Fix newest variables escaping strategy on new CMake

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/sems/trunk@1949 8eb893ce-cfd4-0310-b710-fb5ebe64c474
---
 CMakeLists.txt |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cfb538..8eb128b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,8 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
 
+# Don't do automatic escaping of variables
+CMAKE_POLICY(SET CMP0005 OLD)
+
 PROJECT (SEMS)
 
 SET(SEMS_MAJOR_VERSION 1)
-- 
1.7.0.1


sems-0011-Disable-mysql-in-conference-and-early_announce-modul.patch:
 conference/CMakeLists.txt     |   12 ++++++------
 early_announce/CMakeLists.txt |   13 ++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

--- NEW FILE sems-0011-Disable-mysql-in-conference-and-early_announce-modul.patch ---
>From 90b5fcd79d4c6366b1b8f8d12c8670968d6c70d3 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov at gmail.com>
Date: Fri, 25 Jun 2010 12:16:45 +0400
Subject: [PATCH 11/11] Disable mysql++ in conference and early_announce modules

Unfortunately, this breaks existing configurations, which is a
no-go situation for EPEL repository. We'll enable it later.

Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
---
 apps/conference/CMakeLists.txt     |   12 ++++++------
 apps/early_announce/CMakeLists.txt |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/conference/CMakeLists.txt b/apps/conference/CMakeLists.txt
index 40c7063..a86e8e8 100644
--- a/apps/conference/CMakeLists.txt
+++ b/apps/conference/CMakeLists.txt
@@ -13,12 +13,12 @@ IF(FLITE_FOUND AND ZRTP_FOUND)
 	SET(sems_module_libs ${sems_module_libs} flite_cmu_us_kal flite_usenglish flite_cmulex flite)
 ENDIF(FLITE_FOUND AND ZRTP_FOUND)
 
-IF(MYSQLPP_FOUND)
-	INCLUDE_DIRECTORIES(/usr/include/mysql)
-	INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++)
-	ADD_DEFINITIONS(-DUSE_MYSQL)
-	SET(sems_module_libs ${sems_module_libs} mysqlpp)
-ENDIF(MYSQLPP_FOUND)
+#IF(MYSQLPP_FOUND)
+#	INCLUDE_DIRECTORIES(/usr/include/mysql)
+#	INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++)
+#	ADD_DEFINITIONS(-DUSE_MYSQL)
+#	SET(sems_module_libs ${sems_module_libs} mysqlpp)
+#ENDIF(MYSQLPP_FOUND)
 
 SET(sems_module_name conference)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
diff --git a/apps/early_announce/CMakeLists.txt b/apps/early_announce/CMakeLists.txt
index 184d282..1e23638 100644
--- a/apps/early_announce/CMakeLists.txt
+++ b/apps/early_announce/CMakeLists.txt
@@ -2,12 +2,12 @@ set (early_announce_SRCS
 EarlyAnnounce.cpp
 )
 
-IF(MYSQLPP_FOUND)
-	INCLUDE_DIRECTORIES(/usr/include/mysql)
-	INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++)
-	ADD_DEFINITIONS(-DUSE_MYSQL)
-	SET(sems_module_libs mysqlpp)
-ENDIF(MYSQLPP_FOUND)
+#IF(MYSQLPP_FOUND)
+#	INCLUDE_DIRECTORIES(/usr/include/mysql)
+#	INCLUDE_DIRECTORIES(${MYSQLPP_INCLUDE_DIR}/mysql++)
+#	ADD_DEFINITIONS(-DUSE_MYSQL)
+#	SET(sems_module_libs mysqlpp)
+#ENDIF(MYSQLPP_FOUND)
 
 SET(sems_module_name early_announce)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
-- 
1.7.0.1



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	2 Jun 2010 12:57:20 -0000	1.5
+++ import.log	25 Jun 2010 09:44:19 -0000	1.6
@@ -3,3 +3,4 @@ sems-1_1_1-1_fc10:EL-5:sems-1.1.1-1.fc10
 sems-1_1_1-6_fc12:EL-5:sems-1.1.1-6.fc12.src.rpm:1260363240
 sems-1_2_1-2_fc12:EL-5:sems-1.2.1-2.fc12.src.rpm:1274355012
 sems-1_2_1-3_fc12:EL-5:sems-1.2.1-3.fc12.src.rpm:1275483357
+sems-1_2_1-4_fc12:EL-5:sems-1.2.1-4.fc12.src.rpm:1277459032

sems-0001-Force-to-use-system-wide-GSM-includes.patch:
 gsm.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: sems-0001-Force-to-use-system-wide-GSM-includes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems-0001-Force-to-use-system-wide-GSM-includes.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sems-0001-Force-to-use-system-wide-GSM-includes.patch	2 Jun 2010 12:57:21 -0000	1.2
+++ sems-0001-Force-to-use-system-wide-GSM-includes.patch	25 Jun 2010 09:44:19 -0000	1.3
@@ -1,7 +1,7 @@
-From 9cb680c4f42773cf89518a3b678d71aa7ab29661 Mon Sep 17 00:00:00 2001
+From eff73786b505f8be8bf54815c379323f01cf7fd2 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 31 Mar 2010 11:52:52 +0400
-Subject: [PATCH 1/9] Force to use system-wide GSM includes
+Subject: [PATCH 01/11] Force to use system-wide GSM includes
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch:
 CMakeLists.txt |   10 ----------
 1 file changed, 10 deletions(-)

Index: sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch	2 Jun 2010 12:57:21 -0000	1.2
+++ sems-0002-Allow-rewrite-of-custom-makefiles-by-CMake.patch	25 Jun 2010 09:44:19 -0000	1.3
@@ -1,7 +1,7 @@
-From 702b728185a6ae9cc1c511e1c4a04839222ca8b7 Mon Sep 17 00:00:00 2001
+From d4fd6eb9b0964fdf982c35a919b254d1f50a6c2d Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 31 Mar 2010 11:53:48 +0400
-Subject: [PATCH 2/9] Allow rewrite of custom makefiles by CMake
+Subject: [PATCH 02/11] Allow rewrite of custom makefiles by CMake
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch:
 CMakeLists.txt |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch	2 Jun 2010 12:57:21 -0000	1.2
+++ sems-0003-Set-CFG_PREFIX-to-empty-string-by-default.patch	25 Jun 2010 09:44:19 -0000	1.3
@@ -1,7 +1,7 @@
-From 925e57b57d82c4b1813b1bb41faf23380e21d736 Mon Sep 17 00:00:00 2001
+From fae8f9be9808a690bf8e75fa9b330b32f6953e28 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 31 Mar 2010 18:56:39 +0400
-Subject: [PATCH 3/9] Set CFG_PREFIX to empty string by default
+Subject: [PATCH 03/11] Set CFG_PREFIX to empty string by default
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

sems-0004-Fix-for-old-python-2.4.patch:
 Ivr.cpp |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: sems-0004-Fix-for-old-python-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems-0004-Fix-for-old-python-2.4.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sems-0004-Fix-for-old-python-2.4.patch	2 Jun 2010 12:57:21 -0000	1.2
+++ sems-0004-Fix-for-old-python-2.4.patch	25 Jun 2010 09:44:19 -0000	1.3
@@ -1,7 +1,7 @@
-From 99f3df0d7e1b9f0d622c587149912e3c98a17c8c Mon Sep 17 00:00:00 2001
+From 981076a117ca8dd86b7f500c9ecf1def548ff008 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Sat, 1 May 2010 22:19:48 +0400
-Subject: [PATCH 4/9] Fix for old python 2.4
+Subject: [PATCH 04/11] Fix for old python 2.4
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---

sems-0005-More-compatibility-with-older-CMake-2.4.patch:
 CMakeLists.txt                                       |    2 +-
 apps/diameter_client/CMakeLists.txt                  |    2 --
 apps/diameter_client/lib_dbase/CMakeLists.txt        |    1 +
 apps/py_sems/CMakeLists.txt                          |    3 ---
 apps/py_sems/sip/CMakeLists.txt                      |    1 +
 apps/xmlrpc2di/CMakeLists.txt                        |    3 ---
 apps/xmlrpc2di/xmlrpc++/src/CMakeLists.txt           |    1 +
 cmake/config.rules.txt                               |    2 +-
 cmake/python.rules.txt                               |    4 ++--
 core/plug-in/binrpcctrl/CMakeLists.txt               |    3 ---
 core/plug-in/binrpcctrl/libbinrpc/src/CMakeLists.txt |    1 +
 core/plug-in/ilbc/CMakeLists.txt                     |    4 ----
 12 files changed, 8 insertions(+), 19 deletions(-)

Index: sems-0005-More-compatibility-with-older-CMake-2.4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems-0005-More-compatibility-with-older-CMake-2.4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems-0005-More-compatibility-with-older-CMake-2.4.patch	2 Jun 2010 12:57:21 -0000	1.1
+++ sems-0005-More-compatibility-with-older-CMake-2.4.patch	25 Jun 2010 09:44:19 -0000	1.2
@@ -1,7 +1,7 @@
-From 59cfa2c29e951e57f7f34bda03ecf31a8a62713a Mon Sep 17 00:00:00 2001
+From 70caab6374a2c288d589be0e7200a06c6c5bfa4f Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Tue, 18 May 2010 17:31:11 +0000
-Subject: [PATCH 5/9] More compatibility with older CMake (2.4).
+Subject: [PATCH 05/11] More compatibility with older CMake (2.4).
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 ---
@@ -17,7 +17,6 @@ Signed-off-by: Peter Lemenkov <lemenkov@
  core/plug-in/binrpcctrl/CMakeLists.txt             |    3 ---
  .../binrpcctrl/libbinrpc/src/CMakeLists.txt        |    1 +
  core/plug-in/ilbc/CMakeLists.txt                   |    3 ---
- core/plug-in/ilbc/iLBC_rfc3951/CMakeLists.txt      |    1 +
  13 files changed, 9 insertions(+), 18 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt

sems-0006-Typo-paramater-parameter.patch:
 conference/Conference.cpp        |    4 ++--
 early_announce/EarlyAnnounce.cpp |    4 ++--
 voicemail/AnswerMachine.cpp      |    5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

Index: sems-0006-Typo-paramater-parameter.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems-0006-Typo-paramater-parameter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems-0006-Typo-paramater-parameter.patch	2 Jun 2010 12:57:22 -0000	1.1
+++ sems-0006-Typo-paramater-parameter.patch	25 Jun 2010 09:44:19 -0000	1.2
@@ -1,7 +1,7 @@
-From 72134f6b33369e709d2bf0c3b41b959fe57f7c9c Mon Sep 17 00:00:00 2001
+From d5cdf8f173398c3a46754efebdcb7b5d2194d559 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 2 Jun 2010 09:15:40 +0000
-Subject: [PATCH 6/9] Typo: paramater => parameter
+Subject: [PATCH 06/11] Typo: paramater => parameter
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 

sems-0007-Copy-paste-typo-this-conf-file-actually-is-a-early_a.patch:
 EarlyAnnounce.cpp |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: sems-0007-Copy-paste-typo-this-conf-file-actually-is-a-early_a.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems-0007-Copy-paste-typo-this-conf-file-actually-is-a-early_a.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems-0007-Copy-paste-typo-this-conf-file-actually-is-a-early_a.patch	2 Jun 2010 12:57:22 -0000	1.1
+++ sems-0007-Copy-paste-typo-this-conf-file-actually-is-a-early_a.patch	25 Jun 2010 09:44:19 -0000	1.2
@@ -1,7 +1,7 @@
-From a72eb296ebf509c9dbe37b72d58110b11eba6840 Mon Sep 17 00:00:00 2001
+From dce67b7d86d73820adec085199a7fcc6de1fe096 Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 2 Jun 2010 09:15:46 +0000
-Subject: [PATCH 7/9] Copy+paste typo: this conf-file actually is a early_announce.conf
+Subject: [PATCH 07/11] Copy+paste typo: this conf-file actually is a early_announce.conf
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 

sems-0008-Fix-MOD_NAME-passing-to-gcc.patch:
 module.rules.txt |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Index: sems-0008-Fix-MOD_NAME-passing-to-gcc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems-0008-Fix-MOD_NAME-passing-to-gcc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems-0008-Fix-MOD_NAME-passing-to-gcc.patch	2 Jun 2010 12:57:22 -0000	1.1
+++ sems-0008-Fix-MOD_NAME-passing-to-gcc.patch	25 Jun 2010 09:44:19 -0000	1.2
@@ -1,7 +1,7 @@
-From 8906749fb93942f755ed16afbe59bab299717d4b Mon Sep 17 00:00:00 2001
+From d84e195c467dbd7a611b67f8110039916c799ada Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 2 Jun 2010 11:12:34 +0000
-Subject: [PATCH 8/9] Fix MOD_NAME passing to gcc
+Subject: [PATCH 08/11] Fix MOD_NAME passing to gcc
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 

sems-0009-More-CMake-templates-for-config-files.patch:
 mailbox/etc/mailbox.conf.cmake       |    5 +++++
 mailbox/etc/mailbox_query.conf.cmake |    5 +++++
 py_sems/etc/py_sems.conf.cmake       |    2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

Index: sems-0009-More-CMake-templates-for-config-files.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems-0009-More-CMake-templates-for-config-files.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sems-0009-More-CMake-templates-for-config-files.patch	2 Jun 2010 12:57:22 -0000	1.1
+++ sems-0009-More-CMake-templates-for-config-files.patch	25 Jun 2010 09:44:19 -0000	1.2
@@ -1,7 +1,7 @@
-From a15d20779f94d0e976b7d5cc57de814db937774a Mon Sep 17 00:00:00 2001
+From 097859c512f325ea877d6b427a0ce9ac5d1c10fb Mon Sep 17 00:00:00 2001
 From: Peter Lemenkov <lemenkov at gmail.com>
 Date: Wed, 2 Jun 2010 12:02:20 +0000
-Subject: [PATCH 9/9] More CMake templates for config-files
+Subject: [PATCH 09/11] More CMake templates for config-files
 
 Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>
 


Index: sems.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sems/EL-5/sems.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sems.spec	2 Jun 2010 12:57:22 -0000	1.6
+++ sems.spec	25 Jun 2010 09:44:19 -0000	1.7
@@ -1,7 +1,7 @@
 Summary:	SIP Express Media Server, an extensible SIP media server
 Name:		sems
 Version:	1.2.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 URL:		http://www.iptel.org/sems
 ## wget http://ftp.iptel.org/pub/sems/1.2/1.2.1/src/sems-1.2.1.tar.gz
 ## tar zx --exclude iLBC_rfc3951 -f sems-1.2.1.tar.gz
@@ -27,6 +27,12 @@ Patch7:		sems-0007-Copy-paste-typo-this-
 Patch8:		sems-0008-Fix-MOD_NAME-passing-to-gcc.patch
 # Upstreamed
 Patch9:		sems-0009-More-CMake-templates-for-config-files.patch
+# Upstreamed, see also %%patch8
+Patch10:	sems-0010-Fix-newest-variables-escaping-strategy-on-new-CMake.patch
+# Disable MySQL++ in conference and early_announce until good docs and failover to
+# existing file-based configuration will be provided
+Patch11:	sems-0011-Disable-mysql-in-conference-and-early_announce-modul.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python >= 2.3
 BuildRequires: sip-devel
@@ -196,12 +202,16 @@ rm -rf core/plug-in/gsm/gsm-1.0-pl10/
 %patch3 -p1 -b .cfg_prefix_to_empty_string
 %if 0%{?el4}%{?el5}
 %patch4 -p1 -b .support_for_python_2_4
-%patch5 -p1 -b .support_for_cmake_2_4
 %endif
+%patch5 -p1 -b .support_for_cmake_2_4
 %patch6 -p1 -b .typo
 %patch7 -p1 -b .another_typo
 %patch8 -p1 -b .fix_mod_name
 %patch9 -p1 -b .more_cmake_templates
+%if 0%{?el6}%{?fedora}
+%patch10 -p1 -b .fix_escaping_in_cmake
+%endif
+%patch11 -p1 -b .disable_mysqlpp_in_conf_and_ea
 
 
 iconv -f iso8859-1 -t UTF-8 doc/Readme.diameter_client.txt > doc/Readme.diameter_client.utf8 && mv doc/Readme.diameter_client.{utf8,txt}
@@ -615,6 +625,10 @@ fi
 %{_libdir}/%{name}/plug-in/xmlrpc2di.so
 
 %changelog
+* Fri Jun 25 2010 Peter Lemenkov <lemenkov at gmail.com> 1.2.1-4
+- Fixed escaping variables strategy for  new CMake (and only for new CMake)
+- Disable mysql++ in early_announce and conference modules
+
 * Tue Jun  1 2010 Peter Lemenkov <lemenkov at gmail.com> 1.2.1-3
 - Fixed config-file generation for EPEL (old CMake)
 - Fixed MOD_NAME parameter passing



More information about the scm-commits mailing list