rpm/kyotocabinet
SHA256
1
0
Fork 0
forked from pool/kyotocabinet
Code Pull Requests Activity

Accepting request 784303 from home:pluskalm:branches:devel:libraries:c_c++

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/784303
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/kyotocabinet?expand=0&rev=23
This commit is contained in:
Dirk Mueller 2020-03-19 08:46:01 +00:00 committed by Git OBS Bridge
parent 561ecb5a4c
commit 0ca56f47ca
7 changed files with 56 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure-8-byte-atomics.patch
View File

@ -10,11 +10,11 @@ as is the case with all ARM targets currently
configure.in | 19 ++++++++++++++++--- configure.in | 19 ++++++++++++++++---
2 files changed, 29 insertions(+), 19 deletions(-) 2 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/configure b/configure Index: kyotocabinet-1.2.77/configure
index a07063d..bfc6df0 100755 ===================================================================
--- a/configure --- kyotocabinet-1.2.77.orig/configure
+++ b/configure +++ kyotocabinet-1.2.77/configure
@@ -4012,25 +4012,22 @@ fi @@ -4041,25 +4041,22 @@ fi
# Atomic operations # Atomic operations
if test "$enable_atomic" != "no" if test "$enable_atomic" != "no"
then then
@ -53,11 +53,11 @@ index a07063d..bfc6df0 100755
then then
MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC" MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC"
printf 'yes\n' printf 'yes\n'
diff --git a/configure.in b/configure.in Index: kyotocabinet-1.2.77/configure.in
index 7808806..b5f5ac0 100644 ===================================================================
--- a/configure.in --- kyotocabinet-1.2.77.orig/configure.in
+++ b/configure.in +++ kyotocabinet-1.2.77/configure.in
@@ -238,9 +238,22 @@ fi @@ -229,9 +229,22 @@ fi
# Atomic operations # Atomic operations
if test "$enable_atomic" != "no" if test "$enable_atomic" != "no"
then then
@ -83,5 +83,3 @@ index 7808806..b5f5ac0 100644
then then
MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC" MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC"
printf 'yes\n' printf 'yes\n'
--
1.7.9.5

13
gcc6-fix-errors.patch
View File

@ -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;

3
kyotocabinet-1.2.76.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:812a2d3f29c351db4c6f1ff29d94d7135f9e601d7cc1872ec1d7eed381d0d23c
size 951930

BIN
kyotocabinet-1.2.77.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

22
kyotocabinet-fix_rpath.patch
View File

@ -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.77.orig/Makefile.in
+++ kyotocabinet-1.2.52/Makefile.in +++ kyotocabinet-1.2.77/Makefile.in
@@ -56,7 +56,7 @@ LDFLAGS = @MYLDFLAGS@ @@ -56,7 +56,7 @@ LDFLAGS = @MYLDFLAGS@
CMDLDFLAGS = @MYCMDLDFLAGS@ CMDLDFLAGS = @MYCMDLDFLAGS@
CMDLIBS = @MYCMDLIBS@ CMDLIBS = @MYCMDLIBS@
@ -9,15 +9,15 @@ Index: kyotocabinet-1.2.52/Makefile.in
-RUNENV = @MYLDLIBPATHENV@=@MYLDLIBPATH@ -RUNENV = @MYLDLIBPATHENV@=@MYLDLIBPATH@
+RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR) +RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
POSTCMD = @MYPOSTCMD@ 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.77.orig/configure.in
+++ kyotocabinet-1.2.52/configure.in +++ kyotocabinet-1.2.77/configure.in
@@ -35,27 +35,18 @@ MYDOCUMENTFILES="COPYING FOSSEXCEPTION C @@ -35,27 +35,18 @@ MYDOCUMENTFILES="COPYING FOSSEXCEPTION C
MYPCFILES="kyotocabinet.pc" MYPCFILES="kyotocabinet.pc"
# Building flags # Building flags
-MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0 -O2" -MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0 -O2"
+MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0" +MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g0"
@ -33,7 +33,7 @@ Index: kyotocabinet-1.2.52/configure.in
MYLDLIBPATH="" MYLDLIBPATH=""
MYLDLIBPATHENV="LD_LIBRARY_PATH" MYLDLIBPATHENV="LD_LIBRARY_PATH"
MYPOSTCMD="true" MYPOSTCMD="true"
-# Building paths -# Building paths
-PATH=".:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PATH" -PATH=".:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin:$PATH"
-CPATH=".:/usr/local/include:$CPATH" -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 -export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
- -
- -
#================================================================ #================================================================
# Options # Options

11
kyotocabinet.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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 Wed Jan 3 12:18:07 UTC 2018 - dimstar@opensuse.org

56
kyotocabinet.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package kyotocabinet # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 %define soname 16
Name: kyotocabinet
Version: 1.2.77
Release: 0
Summary: A straightforward implementation of DBM Summary: A straightforward implementation of DBM
License: SUSE-GPL-3.0-with-FLOSS-exception License: SUSE-GPL-3.0-with-FLOSS-exception
Group: Productivity/Databases/Tools Group: Productivity/Databases/Tools
Url: http://fallabs.com/kyotocabinet/ URL: https://fallabs.com/kyotocabinet/
Source: http://fallabs.com/kyotocabinet/pkg/kyotocabinet-%{version}.tar.gz Source: https://fallabs.com/kyotocabinet/pkg/kyotocabinet-%{version}.tar.gz
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
Patch1: %{name}-fix_rpath.patch Patch1: %{name}-fix_rpath.patch
Patch2: configure-8-byte-atomics.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
Patch4: kyotocabinet-fix-debuginfo.patch Patch4: kyotocabinet-fix-debuginfo.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -40,10 +37,9 @@ BuildRequires: libbz2-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: zlib-devel 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 # kyotocabinet uses __sync_* primitives and requires at least 586
BuildArch: i586 ExclusiveArch: i586
%endif %endif
%description %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. Kyoto Cabinet within a proprietary software, the commercial license is required.
%prep %prep
%setup -q %autosetup -p1
%patch1 -p 1
%patch2 -p1
%patch3 -p1
%patch4 -p1
sed -ie "/ldconfig/d" Makefile.in
sed -ie "/DOCDIR/d" Makefile.in
%build %build
sed -ie "/ldconfig/d" Makefile.in
sed -ie "/DOCDIR/d" Makefile.in
sed -ri 's/-march=native/-O2 -g3/g' configure.in sed -ri 's/-march=native/-O2 -g3/g' configure.in
autoreconf -iv autoreconf -fiv
export CFLAGS="%optflags";
export CXXFLAGS="%optflags";
export CFLAGS="${CFLAGS//-march=i386/-march=i586}";
export CXXFLAGS="${CXXFLAGS//-march=i386/-march=i586}";
%configure %configure
make %{?_smp_mflags} %make_build
%install %install
make install DESTDIR="%buildroot" %make_install
rm -rf %{buildroot}%{_datadir}/kyotocabinet rm -rf %{buildroot}%{_datadir}/kyotocabinet
rm -rf %{buildroot}%{_libdir}/libkyotocabinet.a rm -rf %{buildroot}%{_libdir}/libkyotocabinet.a
@ -136,26 +124,24 @@ rm -rf %{buildroot}%{_libdir}/libkyotocabinet.a
# make check # make check
%post -n libkyotocabinet%{soname} -p /sbin/ldconfig %post -n libkyotocabinet%{soname} -p /sbin/ldconfig
%postun -n libkyotocabinet%{soname} -p /sbin/ldconfig %postun -n libkyotocabinet%{soname} -p /sbin/ldconfig
%files %files
%defattr(-,root,root) %license COPYING
%doc ChangeLog COPYING %doc ChangeLog
%doc doc/* %doc doc/*
%doc *.idl %doc *.idl
%{_bindir}/* %{_bindir}/*
%doc %{_mandir}/man1/* %{_mandir}/man1/*
%files -n libkyotocabinet-devel %files -n libkyotocabinet-devel
%defattr(-,root,root)
%{_includedir}/*.h %{_includedir}/*.h
%{_libdir}/libkyotocabinet.so %{_libdir}/libkyotocabinet.so
%{_libdir}/pkgconfig/kyotocabinet.pc %{_libdir}/pkgconfig/kyotocabinet.pc
%files -n libkyotocabinet%{soname} %files -n libkyotocabinet%{soname}
%defattr(-,root,root) %license COPYING
%doc ChangeLog COPYING %doc ChangeLog
%{_libdir}/libkyotocabinet.so.%{soname}* %{_libdir}/libkyotocabinet.so.%{soname}*
%changelog %changelog