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: 08-Dec-2006 09:47:42
Branch: HEAD Handle: 2006120808474200
Modified files:
openpkg-src/vortex vortex.patch vortex.spec
Log:
upgrading package: vortex 0.9.0 -> 1.0
Summary:
Revision Changes Path
1.2 +20 -20 openpkg-src/vortex/vortex.patch
1.4 +5 -5 openpkg-src/vortex/vortex.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/vortex/vortex.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 vortex.patch
--- openpkg-src/vortex/vortex.patch 25 Aug 2006 18:31:45 -0000 1.1
+++ openpkg-src/vortex/vortex.patch 8 Dec 2006 08:47:42 -0000 1.2
@@ -1,30 +1,30 @@
Index: data/Makefile.in
---- data/Makefile.in.orig 2006-07-08 09:32:10 +0200
-+++ data/Makefile.in 2006-08-25 20:26:46 +0200
-@@ -163,7 +163,7 @@
+--- data/Makefile.in.orig 2006-12-07 16:18:56 +0100
++++ data/Makefile.in 2006-12-08 09:44:03 +0100
+@@ -188,7 +188,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-dtddir = $(datadir)/libvortex
+dtddir = $(datadir)/vortex
dtd_DATA = channel.dtd sasl.dtd tls.dtd xml-rpc-boot.dtd
vortex-listener-conf.dtd
-
EXTRA_DIST = $(dtd_DATA)
+ all: all-am
Index: src/vortex_tls.c
---- src/vortex_tls.c.orig 2006-06-18 23:11:59 +0200
-+++ src/vortex_tls.c 2006-08-25 20:26:46 +0200
+--- src/vortex_tls.c.orig 2006-12-04 09:58:38 +0100
++++ src/vortex_tls.c 2006-12-08 09:45:08 +0100
@@ -48,6 +48,7 @@
#define LOG_DOMAIN "vortex-tls"
#include <vortex.h>
+#undef boolean /* undefine AXL #define boolean int as it clashes with
OpenSSL asn1.h */
+ #include <openssl/err.h>
- /**
Index: test/Makefile.in
---- test/Makefile.in.orig 2006-07-08 09:32:10 +0200
-+++ test/Makefile.in 2006-08-25 20:26:46 +0200
-@@ -164,7 +164,7 @@
+--- test/Makefile.in.orig 2006-12-07 16:18:56 +0100
++++ test/Makefile.in 2006-12-08 09:44:03 +0100
+@@ -301,7 +301,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -32,26 +32,26 @@
+certfilesdir = $(datadir)/vortex
certfiles_DATA = test-certificate.pem test-private-key.pem
EXTRA_DIST = Makefile.win $(certfiles_DATA)
- bin_PROGRAMS = vortex-client
+ INCLUDES = -I$(top_srcdir)/libvortex/src $(LIBRARIES_CFLAGS) $(AXL_CFLAGS)
-I$(READLINE_PATH)/include -Wall -g -DVERSION=\""$(VORTEX_VERSION)"\" -I../src
Index: vortex.pc.in
---- vortex.pc.in.orig 2006-04-11 18:16:32 +0200
-+++ vortex.pc.in 2006-08-25 20:26:46 +0200
+--- vortex.pc.in.orig 2006-07-12 12:30:25 +0200
++++ vortex.pc.in 2006-12-08 09:45:30 +0100
@@ -7,5 +7,5 @@
Description: A BEEP implementation for af-arch (RFC 3080/RFC 3081 compliant)
Requires: glib-2.0 gthread-2.0 axl
Version: @VORTEX_VERSION@
--Libs: -L${libdir} -lvortex
-+Libs: -L${libdir} -lvortex @LIBRARIES_LIBS@
- Cflags: -I${includedir}/vortex
+-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@
Index: xml-rpc-gen/Makefile.in
---- xml-rpc-gen/Makefile.in.orig 2006-07-08 09:32:10 +0200
-+++ xml-rpc-gen/Makefile.in 2006-08-25 20:27:46 +0200
-@@ -164,7 +164,7 @@
+--- xml-rpc-gen/Makefile.in.orig 2006-12-07 16:18:57 +0100
++++ xml-rpc-gen/Makefile.in 2006-12-08 09:44:03 +0100
+@@ -211,7 +211,7 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-dtddir = $(datadir)/libvortex
+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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/vortex/vortex.spec
============================================================================
$ cvs diff -u -r1.3 -r1.4 vortex.spec
--- openpkg-src/vortex/vortex.spec 13 Oct 2006 17:35:32 -0000 1.3
+++ openpkg-src/vortex/vortex.spec 8 Dec 2006 08:47:42 -0000 1.4
@@ -23,8 +23,8 @@
##
# package version
-%define V_external 0.9.0
-%define V_internal b2134.g2134
+%define V_external 1.0
+%define V_internal b2411.g2413
# package information
Name: vortex
@@ -37,7 +37,7 @@
Group: Network
License: LGPL
Version: %{V_external}
-Release: 20061013
+Release: 20061208
# package options
%option with_ssl yes
@@ -53,8 +53,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, pkgconfig
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: axl, glib2
-PreReq: axl, glib2
+BuildPreReq: axl >= 0.3.0, glib2
+PreReq: axl >= 0.3.0, glib2
%if "%{with_ssl}" == "yes"
BuildPreReq: openssl
PreReq: openssl
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
