Compare commits
No commits in common. "85a2d8ec356b001952ce0bff7817e963e9c131ef" and "ce5ee84cb3ad9a1cc2de60c23cdd9755f765344e" have entirely different histories.
85a2d8ec35
...
ce5ee84cb3
@ -1,22 +0,0 @@
|
|||||||
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
|
|
||||||
BIN
jansson-2.13.1.tar.bz2
Normal file
BIN
jansson-2.13.1.tar.bz2
Normal file
Binary file not shown.
Binary file not shown.
31
jansson.spec
31
jansson.spec
@ -1,12 +1,10 @@
|
|||||||
Name: jansson
|
Name: jansson
|
||||||
Version: 2.14
|
Version: 2.13.1
|
||||||
Release: 4
|
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/releases/download/v%{version}/%{name}-%{version}.tar.bz2
|
Source0: https://digip.org/jansson/releases/%{name}-%{version}.tar.bz2
|
||||||
|
|
||||||
Patch6000: Fix-the-check-exports-tests-for-versioned-symbols.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc python-sphinx
|
BuildRequires: gcc python-sphinx
|
||||||
|
|
||||||
@ -31,6 +29,7 @@ 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,29 +52,9 @@ make check
|
|||||||
%files help
|
%files help
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc CHANGES
|
%doc CHANGES
|
||||||
|
%doc doc/_build/html/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Aug 01 2024 zhangruifang <zhangruifang@h-partners.com> - 2.14-4
|
|
||||||
- rebuild for next release
|
|
||||||
|
|
||||||
* 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
|
* Mon Aug 03 2020 Leo Fang <leofang_94@163.com> - 2.13.1-3
|
||||||
- Update url of Source0
|
- Update url of Source0
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user