From 7f20cb407d05d80cef7412159779fb5dbb3ae1ad9f7e6a19493db3f5a4807560 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 9 Sep 2020 14:49:41 +0000 Subject: [PATCH] - Update to release 1.6.1 OBS-URL: https://build.opensuse.org/package/show/server:mail/libxls?expand=0&rev=7 --- 0001-Fix-libtool-versioning.patch | 49 ------------------------------- libxls-1.6.0.tar.gz | 3 -- libxls-1.6.1.tar.gz | 3 ++ libxls.changes | 9 ++---- libxls.spec | 7 +---- 5 files changed, 6 insertions(+), 65 deletions(-) delete mode 100644 0001-Fix-libtool-versioning.patch delete mode 100644 libxls-1.6.0.tar.gz create mode 100644 libxls-1.6.1.tar.gz diff --git a/0001-Fix-libtool-versioning.patch b/0001-Fix-libtool-versioning.patch deleted file mode 100644 index ed62df3..0000000 --- a/0001-Fix-libtool-versioning.patch +++ /dev/null @@ -1,49 +0,0 @@ -From cf5b0500e78e77a70361c6de12b08230590857dc Mon Sep 17 00:00:00 2001 -From: Evan Miller -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 - diff --git a/libxls-1.6.0.tar.gz b/libxls-1.6.0.tar.gz deleted file mode 100644 index d346a30..0000000 --- a/libxls-1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9aefa91eea990a5d3141c4a9c530649a4e9787701bc1c1819c9f50b07d666ad4 -size 443517 diff --git a/libxls-1.6.1.tar.gz b/libxls-1.6.1.tar.gz new file mode 100644 index 0000000..8519c45 --- /dev/null +++ b/libxls-1.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbc35fbb7e83bb15adab21db6af8351b52485064e5b7e47685264cba4a99fcf8 +size 443736 diff --git a/libxls.changes b/libxls.changes index bf5f049..6964433 100644 --- a/libxls.changes +++ b/libxls.changes @@ -1,12 +1,7 @@ ------------------------------------------------------------------- -Wed Sep 9 08:35:57 UTC 2020 - Jan Engelhardt +Wed Sep 9 14:46:43 UTC 2020 - Jan Engelhardt -- Add 0001-Fix-libtool-versioning.patch - -------------------------------------------------------------------- -Fri Sep 4 17:19:39 UTC 2020 - Jan Engelhardt - -- Update to release 1.6.0 +- Update to release 1.6.1 * Enabled decoding of non-Unicode character sets in older (BIFF5) XLS files. * Improved string conversion performance in newer files. diff --git a/libxls.spec b/libxls.spec index 6a50a6b..d6f95e7 100644 --- a/libxls.spec +++ b/libxls.spec @@ -18,17 +18,13 @@ Name: libxls %define lname libxlsreader8 -Version: 1.6.0 +Version: 1.6.1 Release: 0 Summary: Library for Parsing Excel (XLS) Files 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 @@ -62,7 +58,6 @@ CSV format, more suitable for parsing. %prep %autosetup -p1 -autoreconf -fi %build %configure --disable-static