diff --git a/uthash-2.0.2-add-stack-protector-strong-flag.patch b/uthash-2.0.2-add-stack-protector-strong-flag.patch deleted file mode 100644 index b1cb632270d38429a0eb23057fc89df352cdcade..0000000000000000000000000000000000000000 --- a/uthash-2.0.2-add-stack-protector-strong-flag.patch +++ /dev/null @@ -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 $@ $^ diff --git a/uthash.spec b/uthash.spec index cd871443741ed5c702fd3d0018f75a4099e14541..238972b21b59abe55bbd101a11d4ce05ac8b2635 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,16 +1,13 @@ +%global debug_package %{nil} Name: uthash -Version: 2.0.2 -Release: 7 +Version: 2.1.0 +Release: 1 Summary: Hash table for C structures License: BSD URL: https://github.com/troydhanson/uthash Source0: https://github.com/troydhanson/uthash/archive/v%{version}.tar.gz -Patch6000: uthash-2.0.2-add-stack-protector-strong-flag.patch BuildRequires: asciidoc -Provides: libut == %{version}-%{release} libut-devel == %{version}-%{release} -Obsoletes: libut <= %{version}-%{release} libut-devel <= %{version}-%{release} - %description 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 @@ -30,8 +27,6 @@ BuildArch: noarch %description help Documentation for uthash -Provides: libut-doc == %{version}-%{release} -Obsoletes: libut-doc <= %{version}-%{release} %prep %autosetup -p1 @@ -41,20 +36,11 @@ cd doc/ %make_build V=1 cd .. -cd libut/ -export CFLAGS="-fPIC" -%make_build -gcc -fPIC -shared -o libut.so.0 *.o - %install 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/ cp LICENSE %{buildroot}%{_prefix}/share/licenses/uthash/ +cp README.md %{buildroot}%{_prefix}/share/doc/uthash/ install -d %{buildroot}%{_includedir} cd src/ @@ -62,19 +48,12 @@ cp * %{buildroot}%{_includedir} cd .. 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 -%{_libdir}/libut.so.0 %doc %{_prefix}/share/licenses/uthash/LICENSE %doc %{_prefix}/share/doc/uthash/README.md %files devel -%{_libdir}/libut.so -%{_libdir}/libut.a %{_includedir}/* %files help @@ -82,9 +61,12 @@ ln -s %{_libdir}/libut.so.0 %{buildroot}%{_libdir}/libut.so %exclude %{_prefix}/share/doc/uthash/README.md %changelog -* Tue Mar 18 2020 zhangtao - 2.0.2-7 +* Tue Jun 02 2020 huanghaitao - 2.1.0-1 +- Change source to latest update + +* Thu Mar 18 2020 zhangtao - 2.0.2-7 - Add stack-protector-strong flag -* Tue Dec 07 2019 lihao - 2.0.2-6 +* Sat Dec 07 2019 lihao - 2.0.2-6 - Package Init diff --git a/v2.0.2.tar.gz b/v2.0.2.tar.gz deleted file mode 100644 index 6152067abdea2619cf3c49b9f1aca5a32695d52c..0000000000000000000000000000000000000000 Binary files a/v2.0.2.tar.gz and /dev/null differ diff --git a/v2.1.0.tar.gz b/v2.1.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..4ef24284677c61862bd2502fd8206a0afbf899f4 Binary files /dev/null and b/v2.1.0.tar.gz differ