diff --git a/configure-8-byte-atomics.patch b/configure-8-byte-atomics.patch index f453a36..c0230f5 100644 --- a/configure-8-byte-atomics.patch +++ b/configure-8-byte-atomics.patch @@ -10,11 +10,11 @@ as is the case with all ARM targets currently configure.in | 19 ++++++++++++++++--- 2 files changed, 29 insertions(+), 19 deletions(-) -diff --git a/configure b/configure -index a07063d..bfc6df0 100755 ---- a/configure -+++ b/configure -@@ -4012,25 +4012,22 @@ fi +Index: kyotocabinet-1.2.77/configure +=================================================================== +--- kyotocabinet-1.2.77.orig/configure ++++ kyotocabinet-1.2.77/configure +@@ -4041,25 +4041,22 @@ fi # Atomic operations if test "$enable_atomic" != "no" then @@ -53,11 +53,11 @@ index a07063d..bfc6df0 100755 then MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC" printf 'yes\n' -diff --git a/configure.in b/configure.in -index 7808806..b5f5ac0 100644 ---- a/configure.in -+++ b/configure.in -@@ -238,9 +238,22 @@ fi +Index: kyotocabinet-1.2.77/configure.in +=================================================================== +--- kyotocabinet-1.2.77.orig/configure.in ++++ kyotocabinet-1.2.77/configure.in +@@ -229,9 +229,22 @@ fi # Atomic operations if test "$enable_atomic" != "no" then @@ -83,5 +83,3 @@ index 7808806..b5f5ac0 100644 then MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC" printf 'yes\n' --- -1.7.9.5 diff --git a/gcc6-fix-errors.patch b/gcc6-fix-errors.patch deleted file mode 100644 index dd4d367..0000000 --- a/gcc6-fix-errors.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kyotocabinet-1.2.76/kcdbext.h -=================================================================== ---- kyotocabinet-1.2.76.orig/kcdbext.h -+++ kyotocabinet-1.2.76/kcdbext.h -@@ -1278,7 +1278,7 @@ class IndexDB { - if (omode_ == 0) { - set_error(_KCCODELINE_, BasicDB::Error::INVALID, "not opened"); - *sp = 0; -- return false; -+ return NULL; - } - if (!cache_) return db_.get(kbuf, ksiz, sp); - size_t dvsiz = 0; diff --git a/kyotocabinet-1.2.76.tar.gz b/kyotocabinet-1.2.76.tar.gz deleted file mode 100644 index 78320ac..0000000 --- a/kyotocabinet-1.2.76.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:812a2d3f29c351db4c6f1ff29d94d7135f9e601d7cc1872ec1d7eed381d0d23c -size 951930 diff --git a/kyotocabinet-1.2.77.tar.gz b/kyotocabinet-1.2.77.tar.gz new file mode 100644 index 0000000..6e63979 --- /dev/null +++ b/kyotocabinet-1.2.77.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56899329384cc6f0f1f8aa3f1b41001071ca99c1d79225086a7f3575c0209de6 +size 949326 diff --git a/kyotocabinet-fix_rpath.patch b/kyotocabinet-fix_rpath.patch index b1a1aa7..73fcc9e 100644 --- a/kyotocabinet-fix_rpath.patch +++ b/kyotocabinet-fix_rpath.patch @@ -1,7 +1,7 @@ -Index: kyotocabinet-1.2.52/Makefile.in +Index: kyotocabinet-1.2.77/Makefile.in =================================================================== ---- kyotocabinet-1.2.52.orig/Makefile.in -+++ kyotocabinet-1.2.52/Makefile.in +--- kyotocabinet-1.2.77.orig/Makefile.in ++++ kyotocabinet-1.2.77/Makefile.in @@ -56,7 +56,7 @@ LDFLAGS = @MYLDFLAGS@ CMDLDFLAGS = @MYCMDLDFLAGS@ CMDLIBS = @MYCMDLIBS@ @@ -9,15 +9,15 @@ Index: kyotocabinet-1.2.52/Makefile.in -RUNENV = @MYLDLIBPATHENV@=@MYLDLIBPATH@ +RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR) POSTCMD = @MYPOSTCMD@ - - -Index: kyotocabinet-1.2.52/configure.in + + +Index: kyotocabinet-1.2.77/configure.in =================================================================== ---- kyotocabinet-1.2.52.orig/configure.in -+++ kyotocabinet-1.2.52/configure.in +--- kyotocabinet-1.2.77.orig/configure.in ++++ kyotocabinet-1.2.77/configure.in @@ -35,27 +35,18 @@ MYDOCUMENTFILES="COPYING FOSSEXCEPTION C MYPCFILES="kyotocabinet.pc" - + # Building flags -MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0 -O2" +MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0" @@ -33,7 +33,7 @@ Index: kyotocabinet-1.2.52/configure.in MYLDLIBPATH="" MYLDLIBPATHENV="LD_LIBRARY_PATH" MYPOSTCMD="true" - + -# Building paths -PATH=".:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PATH" -CPATH=".:/usr/local/include:$CPATH" @@ -43,6 +43,6 @@ Index: kyotocabinet-1.2.52/configure.in -export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH - - - + #================================================================ # Options diff --git a/kyotocabinet.changes b/kyotocabinet.changes index 5da3394..63de73e 100644 --- a/kyotocabinet.changes +++ b/kyotocabinet.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Mar 12 11:45:45 UTC 2020 - Martin Pluskal + +- Update to version 1.2.77: + * kcthread.cc (CondVar::wait): a bug on Win32 was fixed. + * kcdbext.h (IndexDB::set, IndexDB::replace): a bug of updating + existing records was fixed. + * kcdb.h (DB::check): new function. +- Drop no longer needed gcc6-fix-errors.patch +- Modernise spec file + ------------------------------------------------------------------- Wed Jan 3 12:18:07 UTC 2018 - dimstar@opensuse.org diff --git a/kyotocabinet.spec b/kyotocabinet.spec index b69b159..eb7b610 100644 --- a/kyotocabinet.spec +++ b/kyotocabinet.spec @@ -1,7 +1,7 @@ # # spec file for package kyotocabinet # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,26 +12,23 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -Name: kyotocabinet -Version: 1.2.76 -Release: 0 %define soname 16 +Name: kyotocabinet +Version: 1.2.77 +Release: 0 Summary: A straightforward implementation of DBM License: SUSE-GPL-3.0-with-FLOSS-exception Group: Productivity/Databases/Tools -Url: http://fallabs.com/kyotocabinet/ -Source: http://fallabs.com/kyotocabinet/pkg/kyotocabinet-%{version}.tar.gz +URL: https://fallabs.com/kyotocabinet/ +Source: https://fallabs.com/kyotocabinet/pkg/kyotocabinet-%{version}.tar.gz Source99: baselibs.conf # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: %{name}-fix_rpath.patch -Patch2: configure-8-byte-atomics.patch -# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Fix errors seen by GCC6/GCC7. -Patch3: gcc6-fix-errors.patch -# PATCH-FIX-OPENSUSE gcc6-fix-errors.patch -- Do not supress debuginfo +Patch2: configure-8-byte-atomics.patch Patch4: kyotocabinet-fix-debuginfo.patch BuildRequires: autoconf BuildRequires: automake @@ -40,10 +37,9 @@ BuildRequires: libbz2-devel BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if "%_target_cpu" == "i386" +%if "%{_target_cpu}" == "i386" # kyotocabinet uses __sync_* primitives and requires at least 586 -BuildArch: i586 +ExclusiveArch: i586 %endif %description @@ -109,26 +105,18 @@ On the other hand, a commercial license is also provided. If you use Kyoto Cabinet within a proprietary software, the commercial license is required. %prep -%setup -q -%patch1 -p 1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -sed -ie "/ldconfig/d" Makefile.in -sed -ie "/DOCDIR/d" Makefile.in +%autosetup -p1 %build +sed -ie "/ldconfig/d" Makefile.in +sed -ie "/DOCDIR/d" Makefile.in sed -ri 's/-march=native/-O2 -g3/g' configure.in -autoreconf -iv -export CFLAGS="%optflags"; -export CXXFLAGS="%optflags"; -export CFLAGS="${CFLAGS//-march=i386/-march=i586}"; -export CXXFLAGS="${CXXFLAGS//-march=i386/-march=i586}"; +autoreconf -fiv %configure -make %{?_smp_mflags} +%make_build %install -make install DESTDIR="%buildroot" +%make_install rm -rf %{buildroot}%{_datadir}/kyotocabinet rm -rf %{buildroot}%{_libdir}/libkyotocabinet.a @@ -136,26 +124,24 @@ rm -rf %{buildroot}%{_libdir}/libkyotocabinet.a # make check %post -n libkyotocabinet%{soname} -p /sbin/ldconfig - %postun -n libkyotocabinet%{soname} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc ChangeLog COPYING +%license COPYING +%doc ChangeLog %doc doc/* %doc *.idl %{_bindir}/* -%doc %{_mandir}/man1/* +%{_mandir}/man1/* %files -n libkyotocabinet-devel -%defattr(-,root,root) %{_includedir}/*.h %{_libdir}/libkyotocabinet.so %{_libdir}/pkgconfig/kyotocabinet.pc %files -n libkyotocabinet%{soname} -%defattr(-,root,root) -%doc ChangeLog COPYING +%license COPYING +%doc ChangeLog %{_libdir}/libkyotocabinet.so.%{soname}* %changelog