Change source to latest update

This commit is contained in:
hht8 2020-06-02 10:45:23 +08:00
parent 1d858d105b
commit baea17a42d
4 changed files with 9 additions and 39 deletions

View File

@ -1,12 +0,0 @@
diff --git a/libut/Makefile b/libut/Makefile
index 6143588..f67ff06 100644
--- a/libut/Makefile
+++ b/libut/Makefile
@@ -4,6 +4,7 @@ INCDIR=./include
CFLAGS+=-I$(INCDIR)
CFLAGS+=-Wall -Wextra
CFLAGS+=-g
+CFLAGS+=-fstack-protector-strong
libut.a: libut.o utvector.o utmm.o ringbuf.o
ar r $@ $^

View File

@ -1,16 +1,13 @@
%global debug_package %{nil}
Name: uthash Name: uthash
Version: 2.0.2 Version: 2.1.0
Release: 7 Release: 1
Summary: Hash table for C structures Summary: Hash table for C structures
License: BSD License: BSD
URL: https://github.com/troydhanson/uthash URL: https://github.com/troydhanson/uthash
Source0: https://github.com/troydhanson/uthash/archive/v%{version}.tar.gz Source0: https://github.com/troydhanson/uthash/archive/v%{version}.tar.gz
Patch6000: uthash-2.0.2-add-stack-protector-strong-flag.patch
BuildRequires: asciidoc BuildRequires: asciidoc
Provides: libut == %{version}-%{release} libut-devel == %{version}-%{release}
Obsoletes: libut <= %{version}-%{release} libut-devel <= %{version}-%{release}
%description %description
This package provides hash table for C structures. It isn't a library but a single This package provides hash table for C structures. It isn't a library but a single
header file, so there is no library code to link against. It has been tested on header file, so there is no library code to link against. It has been tested on
@ -30,8 +27,6 @@ BuildArch: noarch
%description help %description help
Documentation for uthash Documentation for uthash
Provides: libut-doc == %{version}-%{release}
Obsoletes: libut-doc <= %{version}-%{release}
%prep %prep
%autosetup -p1 %autosetup -p1
@ -41,20 +36,11 @@ cd doc/
%make_build V=1 %make_build V=1
cd .. cd ..
cd libut/
export CFLAGS="-fPIC"
%make_build
gcc -fPIC -shared -o libut.so.0 *.o
%install %install
install -d %{buildroot}%{_prefix}/share/doc/uthash install -d %{buildroot}%{_prefix}/share/doc/uthash
cd doc/
cp *.html *.txt *.css *.png %{buildroot}%{_prefix}/share/doc/uthash/
cd ..
cp libut/README.md %{buildroot}%{_prefix}/share/doc/uthash/
install -d %{buildroot}%{_prefix}/share/licenses/uthash/ install -d %{buildroot}%{_prefix}/share/licenses/uthash/
cp LICENSE %{buildroot}%{_prefix}/share/licenses/uthash/ cp LICENSE %{buildroot}%{_prefix}/share/licenses/uthash/
cp README.md %{buildroot}%{_prefix}/share/doc/uthash/
install -d %{buildroot}%{_includedir} install -d %{buildroot}%{_includedir}
cd src/ cd src/
@ -62,19 +48,12 @@ cp * %{buildroot}%{_includedir}
cd .. cd ..
install -d %{buildroot}%{_libdir} install -d %{buildroot}%{_libdir}
cd libut/
cp libut.a %{buildroot}%{_libdir}
cp libut.so.0 %{buildroot}%{_libdir}
ln -s %{_libdir}/libut.so.0 %{buildroot}%{_libdir}/libut.so
%files %files
%{_libdir}/libut.so.0
%doc %{_prefix}/share/licenses/uthash/LICENSE %doc %{_prefix}/share/licenses/uthash/LICENSE
%doc %{_prefix}/share/doc/uthash/README.md %doc %{_prefix}/share/doc/uthash/README.md
%files devel %files devel
%{_libdir}/libut.so
%{_libdir}/libut.a
%{_includedir}/* %{_includedir}/*
%files help %files help
@ -82,9 +61,12 @@ ln -s %{_libdir}/libut.so.0 %{buildroot}%{_libdir}/libut.so
%exclude %{_prefix}/share/doc/uthash/README.md %exclude %{_prefix}/share/doc/uthash/README.md
%changelog %changelog
* Tue Mar 18 2020 zhangtao <zhangtao221@huawei.com> - 2.0.2-7 * Tue Jun 02 2020 huanghaitao <huanghaitao8@huawei.com> - 2.1.0-1
- Change source to latest update
* Thu Mar 18 2020 zhangtao <zhangtao221@huawei.com> - 2.0.2-7
- Add stack-protector-strong flag - Add stack-protector-strong flag
* Tue Dec 07 2019 lihao <lihao129@huawei.com> - 2.0.2-6 * Sat Dec 07 2019 lihao <lihao129@huawei.com> - 2.0.2-6
- Package Init - Package Init

Binary file not shown.

BIN
v2.1.0.tar.gz Normal file

Binary file not shown.