Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
49eca01dab
!18 Modify Source0
From: @fly_fzc 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
2022-11-23 08:28:02 +00:00
fly_fzc
3a38b8cc35 Modify Source0 2022-11-23 16:16:51 +08:00
openeuler-ci-bot
ffbf23dec0
!15 【轻量级 PR】:rebuild for next release
From: @markeryang 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
2022-11-01 09:30:46 +00:00
Markeryang
d97f2a047c
update for mass rebuild and upgrade verification 2022-10-25 08:05:06 +00:00
openeuler-ci-bot
2ac327bf66 !13 Upgrade to version 2.14
Merge pull request !13 from shangyibin/openEuler-22.03-LTS-Next
2021-12-29 12:55:07 +00:00
shangyibin
02d674e3a2 Upgrade to version 2.14 2021-12-25 11:32:28 +08:00
openeuler-ci-bot
44d4f74fdc !10 Do not generate html
Merge pull request !10 from 桐小哥/master
2020-08-08 16:31:59 +08:00
桐小哥
14e5f012a4 Do not generate html 2020-08-08 16:16:01 +08:00
openeuler-ci-bot
ce5ee84cb3 !9 Update Source0 url of jansson
Merge pull request !9 from LeoFang/master
2020-08-03 19:30:38 +08:00
Leo Fang
fb0ca64bbd Update url of Source0
Signed-off-by: Leo Fang <leofang_94@163.com>
2020-08-03 19:27:17 +08:00
4 changed files with 48 additions and 6 deletions

View File

@ -0,0 +1,22 @@
From 0677666f65b988b2dd44d02966a08fea490d5883 Mon Sep 17 00:00:00 2001
From: Petri Lehtinen <petri@digip.org>
Date: Thu, 9 Sep 2021 21:53:11 +0300
Subject: [PATCH] Fix the check-exports tests for versioned symbols
---
test/suites/api/check-exports | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/suites/api/check-exports b/test/suites/api/check-exports
index 2b6b3c79..5c82064c 100755
--- a/test/suites/api/check-exports
+++ b/test/suites/api/check-exports
@@ -15,7 +15,7 @@ grep 'json_\|jansson_' $top_srcdir/src/jansson.def \
nm -D $SOFILE >/dev/null >$test_log/symbols 2>/dev/null \
|| exit 77 # Skip if "nm -D" doesn't seem to work
-grep ' [DT] ' $test_log/symbols | cut -d' ' -f3 | grep -v '^_' | sort >$test_log/output
+grep ' [DT] ' $test_log/symbols | cut -d' ' -f3 | grep -v '^_' | sed 's/@@libjansson.*//' | sort >$test_log/output
if ! cmp -s $test_log/exports $test_log/output; then
diff -u $test_log/exports $test_log/output >&2

Binary file not shown.

BIN
jansson-2.14.tar.bz2 Normal file

Binary file not shown.

View File

@ -1,11 +1,12 @@
Name: jansson Name: jansson
Version: 2.13.1 Version: 2.14
Release: 2 Release: 3
Summary: A C library for encoding, decoding and manipulating JSON data Summary: A C library for encoding, decoding and manipulating JSON data
License: MIT License: MIT
URL: http://www.digip.org/jansson/ URL: http://www.digip.org/jansson/
Source0: https://github.com/akheron/jansson/archive/%{name}-%{version}.tar.bz2 Source0: https://github.com/akheron/jansson/releases/download/v%{version}/%{name}-%{version}.tar.bz2
Patch6000: Fix-the-check-exports-tests-for-versioned-symbols.patch
BuildRequires: gcc python-sphinx BuildRequires: gcc python-sphinx
@ -30,7 +31,6 @@ files for jansson development
%install %install
rm -rf %RPM_BUILD_ROOT rm -rf %RPM_BUILD_ROOT
%make_install %make_install
make html
%delete_la_and_a %delete_la_and_a
%check %check
@ -53,9 +53,29 @@ make check
%files help %files help
%defattr(-,root,root) %defattr(-,root,root)
%doc CHANGES %doc CHANGES
%doc doc/_build/html/*
%changelog %changelog
* Wed Nov 23 2022 fuanan <fuanan3@h-partners.com> - 2.14-3
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Modify Source0
* Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 2.14-2
- rebuild for next release
* Sat Dec 25 2021 shangyibin <shangyibin1@huawei> - 2.14-1
- DESC:upgrade to 2.14
* Sat Aug 8 2020 shixuantong <shixuantong@huawei> - 2.13.1-4
- Type:NA
- ID:NA
- SUG:NA
- DESC:Do not generate html
* Mon Aug 03 2020 Leo Fang <leofang_94@163.com> - 2.13.1-3
- Update url of Source0
* Sat Aug 1 2020 xinghe<xinghe1@huawei.com> - 2.13.1-2 * Sat Aug 1 2020 xinghe<xinghe1@huawei.com> - 2.13.1-2
- Type:enhancement - Type:enhancement
- ID:NA - ID:NA