Compare commits

...

10 Commits

Author SHA1 Message Date
Peng Wu 74f2a2a1f3 Rewrite CI tests 2024-06-17 14:14:38 +08:00
Pooja Yadav 579c9db88a adding gating.yaml configuration 2024-05-02 13:53:02 +05:30
Peng Wu c0e9c57c4a Add CI tests 2024-04-12 10:23:50 +08:00
Fedora Release Engineering 56a0b62882 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-25 01:07:41 +00:00
Fedora Release Engineering 4daadabde7 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 03:10:01 +00:00
Fedora Release Engineering 13a35f6eb9 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-20 09:49:48 +00:00
Peng Wu abbf4ec692 Migrate to SPDX license 2023-05-18 18:36:53 +08:00
Peng Wu eb00ea22a7 Update changelog 2023-04-17 15:03:42 +08:00
Peng Wu cd456dd899 Update to 1.2.80 2023-04-17 14:39:32 +08:00
Florian Weimer fb2e941534 Port configure script to C99 (#2186199)
Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
2023-04-12 13:59:37 +02:00
8 changed files with 143 additions and 7 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

7
gating.yaml Normal file
View 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}

View 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"

View File

@ -1,8 +1,8 @@
Summary: A straightforward implementation of DBM
Name: kyotocabinet
Version: 1.2.79
Release: 2%{?dist}
License: GPLv3
Version: 1.2.80
Release: 5%{?dist}
License: GPL-3.0-only
URL: https://dbmx.net/%{name}/
Source: https://dbmx.net/%{name}/pkg/%{name}-%{version}.tar.gz
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.
%prep
%setup -q
%patch0 -p1 -b .cflags
%patch1 -p1 -b .8-byte-atomics
%autosetup -p1
%build
%configure --disable-opt --enable-lzo --enable-lzma
@ -140,6 +138,25 @@ make check
%doc COPYING doc/api/* kyotocabinet.idl
%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
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

6
plans/basic.fmf Normal file
View File

@ -0,0 +1,6 @@
summary: Basic smoke test
discover:
how: fmf
dist-git-source: true
execute:
how: tmt

View File

@ -1 +1 @@
SHA512 (kyotocabinet-1.2.79.tar.gz) = 9243192c81d3aa37cc8c80eb3bdf235192a0919b134cededa2b4178be515d148916e7405e094cbcdd7dbf13bf38a569bf21863afac7cc05d6418cca5853a2ff4
SHA512 (kyotocabinet-1.2.80.tar.gz) = 9fe0a92c9a76db5ce06ef4d5a551c05930f2a9c065ab695b030fdaf45692bfe88d91f1b75791f50d0772c699567744cd74f3ef407172874d4bba467989d54328

13
tests/main.fmf Normal file
View 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
View 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 $?