Compare commits
10 Commits
d8974e3d04
...
74f2a2a1f3
Author | SHA1 | Date | |
---|---|---|---|
|
74f2a2a1f3 | ||
|
579c9db88a | ||
|
c0e9c57c4a | ||
|
56a0b62882 | ||
|
4daadabde7 | ||
|
13a35f6eb9 | ||
|
abbf4ec692 | ||
|
eb00ea22a7 | ||
|
cd456dd899 | ||
|
fb2e941534 |
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
|||||||
|
1
|
7
gating.yaml
Normal file
7
gating.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-10
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
# this is the testcase identifier, which OSCI pipeline uses
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
66
kyotocabinet-configure-c99.patch
Normal file
66
kyotocabinet-configure-c99.patch
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
Avoid implicit ints in the configure script, to prevent checks from
|
||||||
|
failing unconditionally with future compilers that do not support
|
||||||
|
them by default.
|
||||||
|
|
||||||
|
diff --git a/configure b/configure
|
||||||
|
index 2dd357d4f253946f..cffa76cdb8d68887 100755
|
||||||
|
--- a/configure
|
||||||
|
+++ b/configure
|
||||||
|
@@ -4007,7 +4007,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
|
||||||
|
|
||||||
|
# System-depending optimization
|
||||||
|
printf 'checking for 64-bit availability... '
|
||||||
|
-if printf 'main() {}' | $CC -xc -m64 -o config.tmp - >config.tmp 2>&1
|
||||||
|
+if printf 'int main(void) {return 0;}' | $CC -xc -m64 -o config.tmp - >config.tmp 2>&1
|
||||||
|
then
|
||||||
|
MYCFLAGS="-m64 $MYCFLAGS"
|
||||||
|
MYCXXFLAGS="-m64 $MYCXXFLAGS"
|
||||||
|
@@ -4018,7 +4018,7 @@ fi
|
||||||
|
if test "$enable_opt" != "no"
|
||||||
|
then
|
||||||
|
printf 'checking for CPU optimization availability... '
|
||||||
|
- if printf 'main() {}' | $CC -xc -march=native -o config.tmp - >config.tmp 2>&1
|
||||||
|
+ if printf 'int main(void) {return 0;}' | $CC -xc -march=native -o config.tmp - >config.tmp 2>&1
|
||||||
|
then
|
||||||
|
MYCFLAGS="-march=native $MYCFLAGS"
|
||||||
|
MYCXXFLAGS="-march=native $MYCXXFLAGS"
|
||||||
|
@@ -4028,7 +4028,7 @@ then
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
printf 'checking for useless warnings... '
|
||||||
|
-if printf 'main() {}' | $CC -xc \
|
||||||
|
+if printf 'int main(void) {return 0;}' | $CC -xc \
|
||||||
|
-Wno-unused-but-set-variable -Wno-unused-but-set-parameter -o config.tmp - >config.tmp 2>&1
|
||||||
|
then
|
||||||
|
MYCFLAGS="$MYCFLAGS -Wno-unused-but-set-variable -Wno-unused-but-set-parameter"
|
||||||
|
diff --git a/configure.in b/configure.in
|
||||||
|
index 6ce03e3313a211de..5abb5c33281b9da8 100644
|
||||||
|
--- a/configure.in
|
||||||
|
+++ b/configure.in
|
||||||
|
@@ -204,7 +204,7 @@ AC_C_BIGENDIAN(MYCPPFLAGS="$MYCPPFLAGS -D_MYBIGEND")
|
||||||
|
|
||||||
|
# System-depending optimization
|
||||||
|
printf 'checking for 64-bit availability... '
|
||||||
|
-if printf 'main() {}' | $CC -xc -m64 -o config.tmp - >config.tmp 2>&1
|
||||||
|
+if printf 'int main(void) {return 0;}' | $CC -xc -m64 -o config.tmp - >config.tmp 2>&1
|
||||||
|
then
|
||||||
|
MYCFLAGS="-m64 $MYCFLAGS"
|
||||||
|
MYCXXFLAGS="-m64 $MYCXXFLAGS"
|
||||||
|
@@ -215,7 +215,7 @@ fi
|
||||||
|
if test "$enable_opt" != "no"
|
||||||
|
then
|
||||||
|
printf 'checking for CPU optimization availability... '
|
||||||
|
- if printf 'main() {}' | $CC -xc -march=native -o config.tmp - >config.tmp 2>&1
|
||||||
|
+ if printf 'int main(void) {return 0;}' | $CC -xc -march=native -o config.tmp - >config.tmp 2>&1
|
||||||
|
then
|
||||||
|
MYCFLAGS="-march=native $MYCFLAGS"
|
||||||
|
MYCXXFLAGS="-march=native $MYCXXFLAGS"
|
||||||
|
@@ -225,7 +225,7 @@ then
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
printf 'checking for useless warnings... '
|
||||||
|
-if printf 'main() {}' | $CC -xc \
|
||||||
|
+if printf 'int main(void) {return 0;}' | $CC -xc \
|
||||||
|
-Wno-unused-but-set-variable -Wno-unused-but-set-parameter -o config.tmp - >config.tmp 2>&1
|
||||||
|
then
|
||||||
|
MYCFLAGS="$MYCFLAGS -Wno-unused-but-set-variable -Wno-unused-but-set-parameter"
|
@ -1,8 +1,8 @@
|
|||||||
Summary: A straightforward implementation of DBM
|
Summary: A straightforward implementation of DBM
|
||||||
Name: kyotocabinet
|
Name: kyotocabinet
|
||||||
Version: 1.2.79
|
Version: 1.2.80
|
||||||
Release: 2%{?dist}
|
Release: 5%{?dist}
|
||||||
License: GPLv3
|
License: GPL-3.0-only
|
||||||
URL: https://dbmx.net/%{name}/
|
URL: https://dbmx.net/%{name}/
|
||||||
Source: https://dbmx.net/%{name}/pkg/%{name}-%{version}.tar.gz
|
Source: https://dbmx.net/%{name}/pkg/%{name}-%{version}.tar.gz
|
||||||
Patch0: kyotocabinet-1.2.76-cflags.patch
|
Patch0: kyotocabinet-1.2.76-cflags.patch
|
||||||
@ -48,9 +48,7 @@ The kyotocabinet-apidocs package contains API documentation for developing
|
|||||||
applications that use Kyoto Cabinet.
|
applications that use Kyoto Cabinet.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
%patch0 -p1 -b .cflags
|
|
||||||
%patch1 -p1 -b .8-byte-atomics
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --disable-opt --enable-lzo --enable-lzma
|
%configure --disable-opt --enable-lzo --enable-lzma
|
||||||
@ -140,6 +138,25 @@ make check
|
|||||||
%doc COPYING doc/api/* kyotocabinet.idl
|
%doc COPYING doc/api/* kyotocabinet.idl
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.80-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.80-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.80-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu May 18 2023 Peng Wu <pwu@redhat.com> - 1.2.80-2
|
||||||
|
- Migrate to SPDX license
|
||||||
|
|
||||||
|
* Mon Apr 17 2023 Peng Wu <pwu@redhat.com> - 1.2.80-1
|
||||||
|
- Update to 1.2.80
|
||||||
|
- Resolves: RHBZ#2186606
|
||||||
|
|
||||||
|
* Wed Apr 12 2023 Florian Weimer <fweimer@redhat.com> - 1.2.79-3
|
||||||
|
- Port configure script to C99 (#2186199)
|
||||||
|
|
||||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.79-2
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.79-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
6
plans/basic.fmf
Normal file
6
plans/basic.fmf
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
summary: Basic smoke test
|
||||||
|
discover:
|
||||||
|
how: fmf
|
||||||
|
dist-git-source: true
|
||||||
|
execute:
|
||||||
|
how: tmt
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (kyotocabinet-1.2.79.tar.gz) = 9243192c81d3aa37cc8c80eb3bdf235192a0919b134cededa2b4178be515d148916e7405e094cbcdd7dbf13bf38a569bf21863afac7cc05d6418cca5853a2ff4
|
SHA512 (kyotocabinet-1.2.80.tar.gz) = 9fe0a92c9a76db5ce06ef4d5a551c05930f2a9c065ab695b030fdaf45692bfe88d91f1b75791f50d0772c699567744cd74f3ef407172874d4bba467989d54328
|
||||||
|
13
tests/main.fmf
Normal file
13
tests/main.fmf
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
test: bash ./make_check.sh ..
|
||||||
|
duration: 50m
|
||||||
|
framework: shell
|
||||||
|
require:
|
||||||
|
- make
|
||||||
|
- gcc-c++
|
||||||
|
- autoconf
|
||||||
|
- automake
|
||||||
|
- libtool
|
||||||
|
- zlib-devel
|
||||||
|
- lzo-devel
|
||||||
|
- xz-devel
|
||||||
|
- rpm-build
|
26
tests/make_check.sh
Normal file
26
tests/make_check.sh
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -x
|
||||||
|
|
||||||
|
check_return_value () {
|
||||||
|
if [ $1 != 0 ] ; then
|
||||||
|
exit $1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
cd $1
|
||||||
|
|
||||||
|
VERSION=`rpmspec -q --srpm --qf "%{version}" kyotocabinet.spec 2>/dev/null`
|
||||||
|
|
||||||
|
if test -d kyotocabinet-$VERSION-build;
|
||||||
|
then cd kyotocabinet-$VERSION-build;
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd kyotocabinet-$VERSION
|
||||||
|
|
||||||
|
./configure --prefix=/usr --disable-opt --enable-lzo --enable-lzma
|
||||||
|
check_return_value $?
|
||||||
|
make
|
||||||
|
check_return_value $?
|
||||||
|
make check
|
||||||
|
exit $?
|
Loading…
Reference in New Issue
Block a user