OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Jun-2007 10:16:13
Branch: HEAD Handle: 2007060309161200
Modified files:
openpkg-src/vortex vortex.patch vortex.spec
Log:
upgrading package: vortex 1.0.2 -> 1.0.3
Summary:
Revision Changes Path
1.4 +23 -38 openpkg-src/vortex/vortex.patch
1.8 +5 -5 openpkg-src/vortex/vortex.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/vortex/vortex.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 vortex.patch
--- openpkg-src/vortex/vortex.patch 17 Mar 2007 08:06:03 -0000 1.3
+++ openpkg-src/vortex/vortex.patch 3 Jun 2007 08:16:12 -0000 1.4
@@ -1,7 +1,7 @@
Index: data/Makefile.in
---- data/Makefile.in.orig 2007-03-16 18:19:11 +0100
-+++ data/Makefile.in 2007-03-17 08:24:22 +0100
-@@ -188,7 +188,7 @@
+--- 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 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -11,8 +11,8 @@
EXTRA_DIST = $(dtd_DATA)
all: all-am
Index: src/vortex_tls.c
---- src/vortex_tls.c.orig 2007-03-15 15:43:52 +0100
-+++ src/vortex_tls.c 2007-03-17 08:24:22 +0100
+--- src/vortex_tls.c.orig 2007-05-18 22:03:57 +0200
++++ src/vortex_tls.c 2007-06-02 13:14:12 +0200
@@ -48,6 +48,7 @@
#define LOG_DOMAIN "vortex-tls"
@@ -22,31 +22,31 @@
/* some keys to store creation handlers and its associate data */
Index: test/Makefile.in
---- test/Makefile.in.orig 2007-03-16 18:19:12 +0100
-+++ test/Makefile.in 2007-03-17 08:24:22 +0100
-@@ -308,7 +308,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+--- 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 @@
+ @[EMAIL PROTECTED] = -DVORTEX_HAVE_POLL=1
+ @[EMAIL PROTECTED] = -DVORTEX_HAVE_EPOLL=1
+ @[EMAIL PROTECTED] = -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 $(LIBRARIES_CFLAGS) $(AXL_CFLAGS)
-I$(READLINE_PATH)/include -Wall -g -ansi -DVERSION=\""$(VORTEX_VERSION)"\"
-I../src
+ INCLUDES = -I$(top_srcdir)/libvortex/src \
Index: vortex.pc.in
---- vortex.pc.in.orig 2006-07-12 12:30:25 +0200
-+++ vortex.pc.in 2007-03-17 08:24:22 +0100
+--- vortex.pc.in.orig 2007-05-27 09:17:32 +0200
++++ vortex.pc.in 2007-06-02 13:15:00 +0200
@@ -7,5 +7,5 @@
- Description: A BEEP implementation for af-arch (RFC 3080/RFC 3081 compliant)
- Requires: glib-2.0 gthread-2.0 axl
+ Description: Robust, full featured BEEP implementation (RFC 3080/RFC 3081)
+ Requires: axl
Version: @VORTEX_VERSION@
--Libs: -L${libdir} -lvortex @TLS_SUPPORT_FLAGS@ @SASL_LIBS@
-+Libs: -L${libdir} -lvortex @TLS_SUPPORT_FLAGS@ @SASL_LIBS@ @LIBRARIES_LIBS@
- Cflags: -I${includedir}/vortex @SASL_CFLAGS@
+-Libs: -L${libdir} -lvortex @TLS_SUPPORT_FLAGS@ @SASL_LIBS@ @PTHREAD_LIBS@
++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-03-16 18:19:12 +0100
-+++ xml-rpc-gen/Makefile.in 2007-03-17 08:24:22 +0100
-@@ -212,7 +212,7 @@
+--- 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 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -54,19 +54,4 @@
+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)
-DVERSION=\""$(VORTEX_VERSION)"\" -DINSTALL_DIR=\"$(datadir)/libvortex\"
-I../src
-Index: xml-rpc-gen/xml-rpc-support.c
---- xml-rpc-gen/xml-rpc-support.c.orig 2007-03-15 09:49:39 +0100
-+++ xml-rpc-gen/xml-rpc-support.c 2007-03-17 09:03:24 +0100
-@@ -298,8 +298,9 @@
- ask_msg ("\n");
- ask_msg ("file already exists, and differs: %s\n", path);
- ask_msg ("Do you want me to: Write (w), Skip (s): ");
-- size = getline (&reply, &size, stdin);
-- reply [size - 1] = 0;
-+ size = 1024;
-+ reply = (char *)malloc(size);
-+ fgets(reply, size, stdin);
- if (axl_cmp (reply, "w")) {
- goto write_file;
- } else if (axl_cmp (reply, "s")) {
+ 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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vortex/vortex.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 vortex.spec
--- openpkg-src/vortex/vortex.spec 17 Mar 2007 08:06:03 -0000 1.7
+++ openpkg-src/vortex/vortex.spec 3 Jun 2007 08:16:12 -0000 1.8
@@ -23,8 +23,8 @@
##
# package version
-%define V_external 1.0.2
-%define V_internal b2607.g2608
+%define V_external 1.0.3
+%define V_internal b2748.g2749
# package information
Name: vortex
@@ -37,7 +37,7 @@
Group: Network
License: LGPL
Version: %{V_external}
-Release: 20070317
+Release: 20070603
# package options
%option with_ssl yes
@@ -53,8 +53,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, pkgconfig
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: axl >= 0.4.2, glib2, readline
-PreReq: axl >= 0.4.2, glib2, readline
+BuildPreReq: axl >= 0.4.4, glib2, readline
+PreReq: axl >= 0.4.4, glib2, readline
%if "%{with_ssl}" == "yes"
BuildPreReq: openssl
PreReq: openssl
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
