clibs/libxls
SHA256
6
0
Fork 0
forked from pool/libxls
Code Pull Requests Activity

- Add 0001-Fix-libtool-versioning.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:mail/libxls?expand=0&rev=6
This commit is contained in:
Jan Engelhardt 2020-09-09 09:20:36 +00:00 committed by Git OBS Bridge
parent 62b3dc6136
commit 1514f5a1bf
3 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
0001-Fix-libtool-versioning.patch Normal file
View File

@ -0,0 +1,49 @@
From cf5b0500e78e77a70361c6de12b08230590857dc Mon Sep 17 00:00:00 2001
From: Evan Miller <emmiller@gmail.com>
Date: Sat, 5 Sep 2020 10:25:38 -0400
Subject: [PATCH] Fix libtool versioning
Upstream: https://github.com/libxls/libxls/pull/80#issuecomment-687619323
The version-info shipped in 1.6.0 was 7:0:6, whereas 1.5.3 was 6:3:5.
The AGE field should have been set to 0 to reflect ABI breakage.
I've changed the logic to set AGE to 0 always, since I very much doubt
public interfaces in this library will be added without other breakage.
And also because it is annoying to keep up with libtool's versioning
rules.
In the future we should remove some of the private functions from the
public API but I think we've had enough damage for one week.
See #80
---
configure.ac | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8927c97..7e91b93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,16 @@
-AC_INIT([libxls],[1.6.0],[emmiller@gmail.com], [libxls], [https://github.com/libxls/libxls])
+AC_INIT([libxls],[1.6.1-beta],[emmiller@gmail.com], [libxls], [https://github.com/libxls/libxls])
AC_CONFIG_SRCDIR([test/test.c])
LIBXLS_MAJOR_VERSION=1
LIBXLS_MINOR_VERSION=6
-LIBXLS_MICRO_VERSION=0
+LIBXLS_MICRO_VERSION=1
VERSION=$LIBXLS_MAJOR_VERSION.$LIBXLS_MINOR_VERSION.$LIBXLS_MICRO_VERSION
-VERSION_INFO=`expr $LIBXLS_MAJOR_VERSION + $LIBXLS_MINOR_VERSION`:$LIBXLS_MICRO_VERSION:$LIBXLS_MINOR_VERSION
+# if libxls ever goes to 2.0 you will need to change the following line to
+# start at whatever the ending value was in the 1.x series E.g. if the last
+# minor release was 1.9 then the value of "current" was 11 so the line should
+# be changed to `expr 12 + $LIBXLS_MINOR_VERSION`
+VERSION_INFO=`expr 2 + $LIBXLS_MINOR_VERSION`:$LIBXLS_MICRO_VERSION
AC_SUBST(VERSION_INFO)
AC_SUBST(LIBXLS_MAJOR_VERSION)
--
2.28.0

5
libxls.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Sep 9 08:35:57 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Add 0001-Fix-libtool-versioning.patch
-------------------------------------------------------------------
Fri Sep 4 17:19:39 UTC 2020 - Jan Engelhardt <jengelh@inai.de>

7
libxls.spec
View File

@ -17,7 +17,7 @@
Name: libxls
%define lname libxlsreader1
%define lname libxlsreader8
Version: 1.6.0
Release: 0
Summary: Library for Parsing Excel (XLS) Files
@ -25,6 +25,10 @@ License: BSD-2-Clause
Group: Development/Libraries/C and C++
URL: https://github.com/libxls/libxls
Source: https://github.com/libxls/libxls/releases/download/v%version/libxls-%version.tar.gz
Patch1: 0001-Fix-libtool-versioning.patch
BuildRequires: autoconf-archive
BuildRequires: automake
BuildRequires: libtool >= 2
BuildRequires: pkg-config
%description
@ -58,6 +62,7 @@ CSV format, more suitable for parsing.
%prep
%autosetup -p1
autoreconf -fi
%build
%configure --disable-static