From 4b65d5efa3b8d0f3fea87ac9d44fd2cb66d56ce3 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 12 Dec 2020 09:42:03 +0100 Subject: [PATCH] - added opt patch (don't override optflags with -O0) - added format patch (fix missing format string) - release 3 --- ocapi-format.patch | 11 +++++++++++ ocapi-opt.patch | 13 +++++++++++++ ocapi.spec | 6 +++++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 ocapi-format.patch create mode 100644 ocapi-opt.patch diff --git a/ocapi-format.patch b/ocapi-format.patch new file mode 100644 index 0000000..1febe4f --- /dev/null +++ b/ocapi-format.patch @@ -0,0 +1,11 @@ +--- ocapi-1.4.3/buffers.c.orig 2008-11-21 00:02:33.000000000 +0100 ++++ ocapi-1.4.3/buffers.c 2020-12-12 09:36:57.862253188 +0100 +@@ -594,7 +594,7 @@ + { + StringBuffer *sb = sbNew(NULL); + sbAppend(sb, "123456789\n"); +- printf(sb->sContent); ++ fputs(sb->sContent, stdout); + sbInsert_at(sb, "abc", 0); + printf("abc at 0: %s\n", sb->sContent); + sbInsert_at(sb, "def", 10); diff --git a/ocapi-opt.patch b/ocapi-opt.patch new file mode 100644 index 0000000..87aeeed --- /dev/null +++ b/ocapi-opt.patch @@ -0,0 +1,13 @@ +--- ocapi-1.4.3/Makefile.am.orig 2009-04-22 23:19:38.000000000 +0200 ++++ ocapi-1.4.3/Makefile.am 2020-12-12 09:32:04.277177008 +0100 +@@ -29,9 +29,7 @@ + AM_YFLAGS = --defines --verbose --debug + AM_LFLAGS = -8 + AM_CPPFLAGS = -I$(top_srcdir) +-AM_CFLAGS = -g3 -O0 -Wall -W +-#added the following line to enforce the AM_CFLAGS value set above--more for debugging purposes +-CFLAGS = ++AM_CFLAGS = -Wall -W + + # These are not used by automake but are often useful for certain types of + # debugging. The best way to use these is to run configure as: diff --git a/ocapi.spec b/ocapi.spec index 3caf065..098f320 100644 --- a/ocapi.spec +++ b/ocapi.spec @@ -6,13 +6,15 @@ Summary: The OPeNDAP C DAP2 library (client-side only) Summary(pl.UTF-8): Biblioteka OPeNDAP DAP2 dla C (tylko strona kliencka) Name: ocapi Version: 1.4.3 -Release: 2 +Release: 3 License: LGPL v2.1+ Group: Libraries Source0: http://www.opendap.org/pub/OCAPI/source/%{name}-%{version}.tar.gz # Source0-md5: c1a4f9391d7f88b0f9e93bfcb9c5181f Patch0: %{name}-libdir.patch Patch1: %{name}-curl.patch +Patch2: %{name}-opt.patch +Patch3: %{name}-format.patch URL: http://opendap.org/ocapi/ BuildRequires: autoconf >= 2.57 BuildRequires: automake @@ -78,6 +80,8 @@ Statyczna biblioteka OCAPI. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build %{__libtoolize} -- 2.44.0