Accepting request 1128805 from devel:libraries:c_c++

- update to 1.2.80:
  - configure.in supports strict C99 rules.
  - Fixed errors of kcdirtest on BtrFS.
  - Fixed build warnings.

  * link all executables as pie (bsc#1185033)
- gcc6-fix-errors.patch: return NULL instead, make GCC7 happy
  (configure-8-byte-atomics.patch)

OBS-URL: https://build.opensuse.org/request/show/1128805
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kyotocabinet?expand=0&rev=15

baselibs.conf

@@ -0,0 +1 @@
+libkyotocabinet16

configure-8-byte-atomics.patch

@@ -0,0 +1,85 @@
+From: Shawn Landden <shawnlandden@gmail.com>
+Date: Thu, 21 Jun 2012 20:34:28 -0700
+Subject: configure: 8 byte atomics
+
+fix up configure test to handle lack of 8 byte atomics correctly
+
+as is the case with all ARM targets currently
+---
+ configure    |   29 +++++++++++++----------------
+ configure.in |   19 ++++++++++++++++---
+ 2 files changed, 29 insertions(+), 19 deletions(-)
+
+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
+-  printf 'checking for atomic operations... '
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
++  printf 'checking for 8 byte atomic operations... '
++  if printf '
++/* Some targets support 4 byte atomics, but not 8 byte atomics,
++ * and will fail at link time if they are used.
++ *
++ * http://gcc.gnu.org/onlinedocs/gcc-4.6.3/gcc/Atomic-Builtins.html
++ * http://gcc.gnu.org/wiki/Atomic
++ */
++#include <stdint.h>
+ int
+ main ()
+ {
+-__sync_fetch_and_add
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_cxx_try_compile "$LINENO"; then :
+-  MYGCCATOMIC=yes
+-else
+-  MYGCCATOMIC=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  if test "$MYGCCATOMIC" = "yes"
++uint64_t n = 0xdeadbeaf;
++__sync_bool_compare_and_swap(&n, 0xdeadbeaf, 0);
++return n;
++}' | $CC -xc -o config.tmp - >/dev/null 2>&1
+   then
+     MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC"
+     printf 'yes\n'
+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
+-  printf 'checking for atomic operations... '
+-  AC_TRY_COMPILE([], [__sync_fetch_and_add], [MYGCCATOMIC=yes], [MYGCCATOMIC=no])
+-  if test "$MYGCCATOMIC" = "yes"
++  printf 'checking for 8 byte atomic operations... '
++  if printf '
++/* Some targets support 4 byte atomics, but not 8 byte atomics,
++ * and will fail at link time if they are used.
++ *
++ * http://gcc.gnu.org/onlinedocs/gcc-4.6.3/gcc/Atomic-Builtins.html
++ * http://gcc.gnu.org/wiki/Atomic
++ */
++#include <stdint.h>
++int
++main ()
++{
++uint64_t n = 0xdeadbeaf;
++__sync_bool_compare_and_swap(&n, 0xdeadbeaf, 0);
++return n;
++}' | $CC -xc -o config.tmp - >/dev/null 2>&1
+   then
+     MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC"
+     printf 'yes\n'

kyotocabinet-1.2.50.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:93b41f383251820d645e683e9d753b3cf0b890d1a91bb9c30ad760ab7c377848
-size 833545

kyotocabinet-fix-debuginfo.patch

@@ -0,0 +1,15 @@
+Index: kyotocabinet-1.2.76/configure.in
+===================================================================
+--- kyotocabinet-1.2.76.orig/configure.in
++++ kyotocabinet-1.2.76/configure.in
+@@ -35,8 +35,8 @@ MYDOCUMENTFILES="COPYING FOSSEXCEPTION C
+ MYPCFILES="kyotocabinet.pc"
+ 
+ # Building flags
+-MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0"
+-MYCXXFLAGS="-Wall -fPIC -fsigned-char -g0 -O2"
++MYCFLAGS="-Wall -fPIC -fsigned-char "
++MYCXXFLAGS="-Wall -fPIC -fsigned-char -fvisibility-inlines-hidden"
+ MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
+ MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1"
+ MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__"

kyotocabinet-fix_rpath.patch

@@ -1,7 +1,7 @@
-Index: kyotocabinet-1.2.50/Makefile.in
+Index: kyotocabinet-1.2.77/Makefile.in
 ===================================================================
---- kyotocabinet-1.2.50.orig/Makefile.in
-+++ kyotocabinet-1.2.50/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@
@@ -11,10 +11,10 @@ Index: kyotocabinet-1.2.50/Makefile.in
  POSTCMD = @MYPOSTCMD@
  
  
-Index: kyotocabinet-1.2.50/configure.in
+Index: kyotocabinet-1.2.77/configure.in
 ===================================================================
---- kyotocabinet-1.2.50.orig/configure.in
-+++ kyotocabinet-1.2.50/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"
  

kyotocabinet-pie.patch

@@ -0,0 +1,15 @@
+---
+ configure.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/configure.in
++++ b/configure.in	2021-04-21 06:45:28.707199498 +0000
+@@ -41,7 +41,7 @@ MYCPPFLAGS="-I. -I\$(INCLUDEDIR)"
+ MYCPPFLAGS="$MYCPPFLAGS -DNDEBUG -D_GNU_SOURCE=1"
+ MYCPPFLAGS="$MYCPPFLAGS -D_FILE_OFFSET_BITS=64 -D_REENTRANT -D__EXTENSIONS__"
+ MYLDFLAGS="-L. -L\$(LIBDIR)"
+-MYCMDLDFLAGS=""
++MYCMDLDFLAGS="-pie"
+ MYCMDLIBS=""
+ MYLDLIBPATH=""
+ MYLDLIBPATHENV="LD_LIBRARY_PATH"

kyotocabinet.changes

@@ -1,3 +1,104 @@
+-------------------------------------------------------------------
+Sat Nov 25 20:41:23 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- update to 1.2.80:
+  - configure.in supports strict C99 rules.
+  - Fixed errors of kcdirtest on BtrFS.
+  - Fixed build warnings.
+
+-------------------------------------------------------------------
+Tue May 30 10:50:48 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
+
+- Update url to new website.
+
+-------------------------------------------------------------------
+Wed Apr 21 06:51:44 UTC 2021 - Dr. Werner Fink <werner@suse.de>
+
+- Add yet an other patch kyotocabinet-pie.patch
+  * link all executables as pie (bsc#1185033)
+
+-------------------------------------------------------------------
+Thu Mar 12 11:45:45 UTC 2020 - Martin Pluskal <mpluskal@suse.com>
+
+- 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
+
+- Add baselibs.conf: Produce libkyotocabinet16-32bit, dependency to
+  libpinyin13-32bit.
+
+-------------------------------------------------------------------
+Tue May  9 14:46:10 UTC 2017 - werner@suse.de
+
+- boo#1037914: Do not optimize for native cpu of the build system!
+
+-------------------------------------------------------------------
+Tue Apr  4 03:47:22 UTC 2017 - crrodriguez@opensuse.org
+
+- kyotocabinet-fix-debuginfo.patch: Fix debuginfo generation
+- gcc6-fix-errors.patch: return NULL instead, make GCC7 happy
+
+-------------------------------------------------------------------
+Wed May 25 09:38:17 UTC 2016 - martin.liska@suse.com
+
+- Add gcc6-fix-errors.patch to remove errors seen by GCC6.
+
+-------------------------------------------------------------------
+Fri Jan  4 16:30:01 UTC 2013 - jengelh@inai.de
+
+- Avoid explicit requires on library packages
+
+-------------------------------------------------------------------
+Thu Dec 27 10:34:38 UTC 2012 - dvaleev@suse.com
+
+- fix up configure test to handle lack of 8 byte atomics correctly
+  (configure-8-byte-atomics.patch)
+
+-------------------------------------------------------------------
+Sat Aug 11 14:19:14 UTC 2012 - jengelh@inai.de
+
+- Replace %makeinstall by make install; the former seldomly works
+- kyoto requires at least i586 an arch; force it on RH6 (which
+  defaults to i386)
+
+-------------------------------------------------------------------
+Tue Jul 31 12:45:52 UTC 2012 - cfarrell@suse.com
+
+- license update: SUSE-GPL-3.0-with-FLOSS-exception
+  Package allows exceptions for linking with components under certain
+  licenses (similar to MySQL)
+
+-------------------------------------------------------------------
+Sun Jul 22 01:31:25 UTC 2012 - i@marguerite.su
+
+- update version 1.2.76
+  * 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.
+
+-------------------------------------------------------------------
+Thu Jun 21 23:28:49 UTC 2012 - jengelh@inai.de
+
+- Make kyotocabinet installation work on SLE_11
+
+-------------------------------------------------------------------
+Fri Feb  3 14:40:02 UTC 2012 - jengelh@medozas.de
+
+- Remove redundant tags/sections per specfile guideline suggestions
+- Add autotools BuildRequires for factory/12.2
+
+-------------------------------------------------------------------
+Tue May 3 22:20:07 UTC 2011 - unnamedrambler@gmail.com
+
+- updated to 1.2.52
+
 -------------------------------------------------------------------
 Tue Mar 15 15:04:42 UTC 2011 - prusnak@opensuse.org
 

kyotocabinet.spec

@@ -1,23 +1,47 @@
 #
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# spec file for package kyotocabinet
+#
+# Copyright (c) 2023 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
+%define soname 16
 Name:           kyotocabinet
-Version:        1.2.50
-%define soname 9
+Version:        1.2.80
 Release:        0
-License:        GPLv3
-Summary:        Modern Implementation of DBM - CLI Utilities
-Url:            http://fallabs.com/kyotocabinet/
+Summary:        A straightforward implementation of DBM
+License:        SUSE-GPL-3.0-with-FLOSS-exception
 Group:          Productivity/Databases/Tools
-Source:         http://fallabs.com/kyotocabinet/pkg/kyotocabinet-%{version}.tar.gz
+URL:            https://dbmx.net/kyotocabinet/
+Source:         https://dbmx.net/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
+Patch3:         %{name}-pie.patch
+Patch4:         %{name}-fix-debuginfo.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  gcc-c++
 BuildRequires:  libbz2-devel
+BuildRequires:  libtool
 BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
-Requires:       libkyotocabinet%{soname} = %{version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if "%{_target_cpu}" == "i386"
+# kyotocabinet uses __sync_* primitives and requires at least 586
+ExclusiveArch:  i586
+%endif
 
 %description
 Kyoto Cabinet is a library of routines for managing a database. The database
@@ -82,15 +106,15 @@ 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
-sed -ie "/ldconfig/d" Makefile.in
-sed -ie "/DOCDIR/d" Makefile.in
+%autosetup -p1
 
 %build
-autoreconf -iv
+sed -ie "/ldconfig/d" Makefile.in
+sed -ie "/DOCDIR/d" Makefile.in
+sed -ri 's/-march=native/-O2 -g3/g' configure.in
+autoreconf -fiv
 %configure
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
@@ -100,30 +124,25 @@ rm -rf %{buildroot}%{_libdir}/libkyotocabinet.a
 %check
 # make check
 
-%clean
-rm -rf %{buildroot}
-
 %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