The package rpms/kyotocabinet.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/kyotocabinet.git/commit/?id=eb93d...
https://src.fedoraproject.org/cgit/rpms/kyotocabinet.git/commit/?id=5b2a2....
Change:
-%ifarch s390x
+%ifarch s390x
Thanks.
Full change:
============
commit ce02aa84d030c61b923645c175af907c0b47d529
Author: Robert Scheck <robert(a)fedoraproject.org>
Date: Mon Mar 25 21:17:10 2019 +0100
Update to 1.2.77
diff --git a/kyotocabinet-1.2.76-gcc6.patch b/kyotocabinet-1.2.76-gcc6.patch
deleted file mode 100644
index d565cff..0000000
--- a/kyotocabinet-1.2.76-gcc6.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Patch from Andreas Sthrk <andy(a)hammerhartes.de> to work around build
-failures with GCC >= 6 like:
-
-In file included from kcdbext.cc:16:0:
-kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t,
size_t*)':
-kcdbext.h:1281:14: error: cannot convert 'bool' to 'char*' in return
- return false;
- ^~~~~
-In file included from kclangc.cc:17:0:
-kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t,
size_t*)':
-kcdbext.h:1281:14: error: cannot convert 'bool' to 'char*' in return
- return false;
- ^~~~~
-
-Note that using '\0' rather nullptr (like the patch from openSUSE is
-doing) just leads to new build failures with GCC >= 7 like:
-
-In file included from kcdbext.cc:16:0:
-kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t,
size_t*)':
-kcdbext.h:1281:14: error: invalid conversion from 'char' to 'char*'
[-fpermissive]
- return '\0';
- ^~~~
-In file included from kclangc.cc:17:0:
-kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t,
size_t*)':
-kcdbext.h:1281:14: error: invalid conversion from 'char' to 'char*'
[-fpermissive]
- return '\0';
- ^~~~
-
-See also:
-
- -
https://bugzilla.redhat.com/show_bug.cgi?id=1307706
- -
https://build.opensuse.org/package/view_file/devel:libraries:c_c++/kyotoc...
- -
https://bugs.debian.org/811627
-
---- kyotocabinet-1.2.76/kcdbext.h 2016-05-25 11:32:53.591866016 +0200
-+++ kyotocabinet-1.2.76/kcdbext.h 2012-05-24 18:27:59.000000000 +0200
-@@ -1278,7 +1278,7 @@
- if (omode_ == 0) {
- set_error(_KCCODELINE_, BasicDB::Error::INVALID, "not opened");
- *sp = 0;
-- return false;
-+ return nullptr;
- }
- if (!cache_) return db_.get(kbuf, ksiz, sp);
- size_t dvsiz = 0;
diff --git a/kyotocabinet.spec b/kyotocabinet.spec
index 6bc82f7..368dfb4 100644
--- a/kyotocabinet.spec
+++ b/kyotocabinet.spec
@@ -1,13 +1,12 @@
Summary: A straightforward implementation of DBM
Name: kyotocabinet
-Version: 1.2.76
-Release: 21%{?dist}
+Version: 1.2.77
+Release: 1%{?dist}
License: GPLv3
-URL:
http://fallabs.com/%{name}/
-Source:
http://fallabs.com/%{name}/pkg/%{name}-%{version}.tar.gz
+URL:
https://fallabs.com/%{name}/
+Source:
https://fallabs.com/%{name}/pkg/%{name}-%{version}.tar.gz
Patch0: kyotocabinet-1.2.76-cflags.patch
Patch1: kyotocabinet-1.2.76-8-byte-atomics.patch
-Patch2: kyotocabinet-1.2.76-gcc6.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: gcc-c++, zlib-devel, lzo-devel, xz-devel
@@ -52,7 +51,6 @@ applications that use Kyoto Cabinet.
%setup -q
%patch0 -p1 -b .cflags
%patch1 -p1 -b .8-byte-atomics
-%patch2 -p1 -b .gcc6
%build
%configure --disable-opt --enable-lzo --enable-lzma
@@ -142,6 +140,9 @@ make check
%doc COPYING doc/api/* kyotocabinet.idl
%changelog
+* Mon Mar 25 2019 Robert Scheck <robert(a)fedoraproject.org> 1.2.77
+- Update to 1.2.77
+
* Fri Mar 1 2019 Peng Wu <pwu(a)redhat.com> - 1.2.76-21
- Switch back to use -O2 for s390x
diff --git a/sources b/sources
index 115d7ca..93b5f34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kyotocabinet-1.2.76.tar.gz) =
278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a
+SHA512 (kyotocabinet-1.2.77.tar.gz) =
f38794c11faa3f4b64097a2e314307e1a6b75ddc495103647ebe52786a689336754496e7083697417ea90436e7fad681f16440975abec9ae917874aa25153e0f
commit eb93de7467ec25a2495902909966bf0677608952
Author: Peng Wu <alexepico(a)gmail.com>
Date: Fri Mar 1 12:35:56 2019 +0800
Switch back to use -O2 for s390x
diff --git a/kyotocabinet.spec b/kyotocabinet.spec
index 9adeb89..6bc82f7 100644
--- a/kyotocabinet.spec
+++ b/kyotocabinet.spec
@@ -1,7 +1,7 @@
Summary: A straightforward implementation of DBM
Name: kyotocabinet
Version: 1.2.76
-Release: 20%{?dist}
+Release: 21%{?dist}
License: GPLv3
URL:
http://fallabs.com/%{name}/
Source:
http://fallabs.com/%{name}/pkg/%{name}-%{version}.tar.gz
@@ -55,12 +55,6 @@ applications that use Kyoto Cabinet.
%patch2 -p1 -b .gcc6
%build
-%ifarch s390x
-RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-O2 /-O1 /g')
-%endif
-export CFLAGS=$RPM_OPT_FLAGS
-
-
%configure --disable-opt --enable-lzo --enable-lzma
make %{?_smp_mflags}
@@ -148,6 +142,9 @@ make check
%doc COPYING doc/api/* kyotocabinet.idl
%changelog
+* Fri Mar 1 2019 Peng Wu <pwu(a)redhat.com> - 1.2.76-21
+- Switch back to use -O2 for s390x
+
* Wed Feb 27 2019 Parag Nemade <pnemade AT redhat DOT com> - 1.2.76-20
- Fix s390x compilation issue by changing -O2 to -O1 (rh#1675243)
commit 5b2a28cd66f0352bbe7d78ef9dbff68b19e6fb3d
Author: Parag Nemade <pnemade(a)fedoraproject.org>
Date: Wed Feb 27 17:48:45 2019 +0530
Fix s390x compilation issue by changing -O2 to -O1 (rh#1675243)
diff --git a/kyotocabinet.spec b/kyotocabinet.spec
index 3fbee86..9adeb89 100644
--- a/kyotocabinet.spec
+++ b/kyotocabinet.spec
@@ -1,7 +1,7 @@
Summary: A straightforward implementation of DBM
Name: kyotocabinet
Version: 1.2.76
-Release: 19%{?dist}
+Release: 20%{?dist}
License: GPLv3
URL:
http://fallabs.com/%{name}/
Source:
http://fallabs.com/%{name}/pkg/%{name}-%{version}.tar.gz
@@ -55,6 +55,12 @@ applications that use Kyoto Cabinet.
%patch2 -p1 -b .gcc6
%build
+%ifarch s390x
+RPM_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-O2 /-O1 /g')
+%endif
+export CFLAGS=$RPM_OPT_FLAGS
+
+
%configure --disable-opt --enable-lzo --enable-lzma
make %{?_smp_mflags}
@@ -142,6 +148,9 @@ make check
%doc COPYING doc/api/* kyotocabinet.idl
%changelog
+* Wed Feb 27 2019 Parag Nemade <pnemade AT redhat DOT com> - 1.2.76-20
+- Fix s390x compilation issue by changing -O2 to -O1 (rh#1675243)
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.2.76-19
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit c4d683890277ca8d8e9b96a0389d28f5d698a0f8
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 1 06:15:02 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/kyotocabinet.spec b/kyotocabinet.spec
index 3be3ae8..3fbee86 100644
--- a/kyotocabinet.spec
+++ b/kyotocabinet.spec
@@ -1,7 +1,7 @@
Summary: A straightforward implementation of DBM
Name: kyotocabinet
Version: 1.2.76
-Release: 18%{?dist}
+Release: 19%{?dist}
License: GPLv3
URL:
http://fallabs.com/%{name}/
Source:
http://fallabs.com/%{name}/pkg/%{name}-%{version}.tar.gz
@@ -142,6 +142,9 @@ make check
%doc COPYING doc/api/* kyotocabinet.idl
%changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.2.76-19
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.2.76-18
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit d8d7c043bd9e13915e7487a9c3d894f24d7f2325
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:17:50 2019 +0100
Remove obsolete Group tag
References:
https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/kyotocabinet.spec b/kyotocabinet.spec
index d0579e1..3be3ae8 100644
--- a/kyotocabinet.spec
+++ b/kyotocabinet.spec
@@ -3,7 +3,6 @@ Name: kyotocabinet
Version: 1.2.76
Release: 18%{?dist}
License: GPLv3
-Group: Applications/Databases
URL:
http://fallabs.com/%{name}/
Source:
http://fallabs.com/%{name}/pkg/%{name}-%{version}.tar.gz
Patch0: kyotocabinet-1.2.76-cflags.patch
@@ -23,7 +22,6 @@ in hash table or B+ tree.
%package libs
Summary: Libraries for applications using Kyoto Cabinet
-Group: System Environment/Libraries
Provides: %{name}-lib = %{version}-%{release}
Provides: %{name}-lib%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-lib < 1.2.76-3
@@ -34,7 +32,6 @@ for any Kyoto Cabinet client program or interface.
%package devel
Summary: Development files for Kyoto Cabinet
-Group: Development/Libraries
Requires: %{name}-libs%{?_isa} = %{version}-%{release}, pkgconfig
%description devel
@@ -43,7 +40,6 @@ developing applications that use Kyoto Cabinet.
%package apidocs
Summary: API documentation for Kyoto Cabinet library
-Group: Documentation
BuildArch: noarch
Provides: %{name}-api-doc = %{version}-%{release}
Obsoletes: %{name}-api-doc < 1.2.76-3
commit fb2e87035e459bbac6600712c170767219658a4a
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Tue Jan 22 18:39:29 2019 +0100
Remove obsolete ldconfig scriptlets
References:
https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/kyotocabinet.spec b/kyotocabinet.spec
index 11f1c4e..d0579e1 100644
--- a/kyotocabinet.spec
+++ b/kyotocabinet.spec
@@ -74,9 +74,7 @@ rm -rf $RPM_BUILD_ROOT%{_defaultdocdir}
%check
make check
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
%files
%doc doc/{command.html,common.css,icon16.png}