upgrading package: vortex 1.0.7 -> 1.0.8

vortex/vortex.patch

@@ -1,7 +1,23 @@
+Index: configure
+--- configure.orig	2007-10-11 17:56:36 +0200
++++ configure	2007-10-13 20:14:04 +0200
+@@ -19598,7 +19598,11 @@
+ 
+ if test $vortex_p_t_r = yes; then
+ 
+-      vortex_cv_pthreads_cflags="$flag"
++      if test ".$flag" != ".none"; then
++          vortex_cv_pthreads_cflags="$flag"
++      else 
++          vortex_cv_pthreads_cflags=""
++      fi
+       break
+ 
+ fi
 Index: data/Makefile.in
---- data/Makefile.in.orig	2007-05-30 19:44:34 +0200
-+++ data/Makefile.in	2007-06-02 13:14:12 +0200
-@@ -200,7 +200,7 @@
+--- data/Makefile.in.orig	2007-10-11 17:56:34 +0200
++++ data/Makefile.in	2007-10-13 20:07:38 +0200
+@@ -199,7 +199,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -11,8 +27,8 @@ Index: data/Makefile.in
  EXTRA_DIST = $(dtd_DATA)
  all: all-am
 Index: src/vortex_tls.c
---- src/vortex_tls.c.orig	2007-05-18 22:03:57 +0200
-+++ src/vortex_tls.c	2007-06-02 13:14:12 +0200
+--- src/vortex_tls.c.orig	2007-09-17 16:53:26 +0200
++++ src/vortex_tls.c	2007-10-13 20:07:38 +0200
 @@ -48,6 +48,7 @@
  #define LOG_DOMAIN "vortex-tls"
  
@@ -22,20 +38,20 @@ Index: src/vortex_tls.c
  
  /* some keys to store creation handlers and its associate data */
 Index: test/Makefile.in
---- test/Makefile.in.orig	2007-05-30 19:44:34 +0200
-+++ test/Makefile.in	2007-06-02 13:14:36 +0200
-@@ -324,7 +324,7 @@
+--- test/Makefile.in.orig	2007-10-11 17:56:35 +0200
++++ test/Makefile.in	2007-10-13 20:07:38 +0200
+@@ -336,7 +336,7 @@
  @ENABLE_POLL_SUPPORT_TRUE@INCLUDE_VORTEX_POLL = -DVORTEX_HAVE_POLL=1
  @ENABLE_EPOLL_SUPPORT_TRUE@INCLUDE_VORTEX_EPOLL = -DVORTEX_HAVE_EPOLL=1
  @ENABLE_VORTEX_LOG_TRUE@INCLUDE_VORTEX_LOG = -DENABLE_VORTEX_LOG
 -certfilesdir = $(datadir)/libvortex
 +certfilesdir = $(datadir)/vortex
  certfiles_DATA = test-certificate.pem test-private-key.pem
- EXTRA_DIST = Makefile.win $(certfiles_DATA) vortex-regression-client.vcproj  vortex-regression-listener.vcproj
- INCLUDES = -I$(top_srcdir)/libvortex/src \
+ EXTRA_DIST = Makefile.win $(certfiles_DATA) vortex-regression-client.vcproj  vortex-regression-listener.vcproj vortex-regression-client.idl
+ INCLUDES = -I$(top_srcdir)/libvortex/src $(AXL_CFLAGS)  $(PTHREAD_CFLAGS) \
 Index: vortex.pc.in
---- vortex.pc.in.orig	2007-05-27 09:17:32 +0200
-+++ vortex.pc.in	2007-06-02 13:15:00 +0200
+--- vortex.pc.in.orig	2007-05-24 13:04:37 +0200
++++ vortex.pc.in	2007-10-13 20:07:38 +0200
 @@ -7,5 +7,5 @@
  Description: Robust, full featured BEEP implementation (RFC 3080/RFC 3081)
  Requires: axl
@@ -44,9 +60,9 @@ Index: vortex.pc.in
 +Libs: -L${libdir} -lvortex @TLS_SUPPORT_FLAGS@ @SASL_LIBS@ @LIBRARIES_LIBS@ @PTHREAD_LIBS@
  Cflags: -I${includedir}/vortex @SASL_CFLAGS@ @PTHREAD_CFLAGS@
 Index: xml-rpc-gen/Makefile.in
---- xml-rpc-gen/Makefile.in.orig	2007-05-30 19:44:35 +0200
-+++ xml-rpc-gen/Makefile.in	2007-06-02 13:14:12 +0200
-@@ -224,7 +224,7 @@
+--- xml-rpc-gen/Makefile.in.orig	2007-10-11 17:56:35 +0200
++++ xml-rpc-gen/Makefile.in	2007-10-13 20:07:38 +0200
+@@ -222,7 +222,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
@@ -54,4 +70,4 @@ Index: xml-rpc-gen/Makefile.in
 +dtddir = $(datadir)/vortex
  dtd_DATA = xml-rpc.dtd
  EXTRA_DIST = $(dtd_DATA) $(wildcard *.idl) $(wildcard *.xdl) $(wildcard *.c) _support.c 
- INCLUDES = -g -Wall -ansi -I. -I$(top_srcdir)/libvortex/src $(LIBRARIES_CFLAGS) $(AXL_CFLAGS) $(EXARG_CFLAGS) $(PTHREAD_CFLAGS) -DVERSION=\""$(VORTEX_VERSION)"\" -DINSTALL_DIR=\"$(datadir)/libvortex\" -I../src
+ INCLUDES = -g -Wall -ansi -I. -I$(top_srcdir)/libvortex/src $(AXL_CFLAGS) $(EXARG_CFLAGS) $(PTHREAD_CFLAGS) -DVERSION=\""$(VORTEX_VERSION)"\" -DINSTALL_DIR=\"$(datadir)/libvortex\" -I../src

vortex/vortex.spec

@@ -23,8 +23,8 @@
 ##
 
 #   package version
-%define       V_external 1.0.7
-%define       V_internal b2910.g2911
+%define       V_external 1.0.8
+%define       V_internal b3048.g3052
 
 #   package information
 Name:         vortex
@@ -37,7 +37,7 @@ Class:        EVAL
 Group:        Network
 License:      LGPL
 Version:      %{V_external}
-Release:      20070903
+Release:      20071013
 
 #   package options
 %option       with_ssl     yes
@@ -88,15 +88,15 @@ AutoReqProv:  no
     CFLAGS="%{l_cflags -O}"
     CPPFLAGS="%{l_cppflags}"
     LDFLAGS="%{l_ldflags}"
-    LIBRARIES_CFLAGS="%{l_cppflags} `pkg-config gthread-2.0 glib-2.0 --cflags`"
-    LIBRARIES_LIBS="%{l_ldflags} `pkg-config gthread-2.0 glib-2.0 --libs`"
-    LIBRARIES_CFLAGS="$LIBRARIES_CFLAGS `pkg-config readline --cflags`"
-    LIBRARIES_LIBS="$LIBRARIES_LIBS `pkg-config readline --libs`"
+    CFLAGS="%{l_cppflags} `pkg-config gthread-2.0 glib-2.0 --cflags`"
+    LIBS="%{l_ldflags} `pkg-config gthread-2.0 glib-2.0 --libs`"
+    CFLAGS="$CFLAGS `pkg-config readline --cflags`"
+    LIBS="$LIBS `pkg-config readline --libs`"
 %if "%{with_ssl}" == "yes"
-    LIBRARIES_CFLAGS="$LIBRARIES_CFLAGS `pkg-config openssl --cflags`"
-    LIBRARIES_LIBS="$LIBRARIES_LIBS `pkg-config openssl --libs`"
+    CFLAGS="$CFLAGS `pkg-config openssl --cflags`"
+    LIBS="$LIBS `pkg-config openssl --libs`"
 %endif
-    export CC CFLAGS CPPFLAGS LDFLAGS LIBRARIES_CFLAGS LIBRARIES_LIBS
+    export CC CFLAGS CPPFLAGS LDFLAGS LIBS
     ./configure \
         --prefix=%{l_prefix} \
 %if "%{with_ssl}" == "yes"