From 8ff37d4d3fee3c9586840a0e83ed94b92e602e78 Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Thu, 7 Aug 2014 10:48:26 +0800 Subject: [PATCH 01/47] Don't do things not of yours. --- uthash.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/uthash.spec b/uthash.spec index d66b9e2..5480a21 100644 --- a/uthash.spec +++ b/uthash.spec @@ -20,7 +20,6 @@ delete items from the hash table. %package devel Summary: Development files for %{name} -Provides: %{name} = %{version}-%{release} Provides: %{name}-static = %{version}-%{release} BuildArch: noarch @@ -39,7 +38,7 @@ install -d %{buildroot}%{_includedir} install -pm0644 src/*.h %{buildroot}%{_includedir}/ %check -cd tests && make %{?_smp_mflags} +make %{?_smp_mflags} -C tests/ %files devel %doc LICENSE doc/*.txt From 49d51e5f695a362cc34f509df2c904ea1cdb4d4d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 07:19:25 +0000 Subject: [PATCH 02/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 5480a21..581362c 100644 --- a/uthash.spec +++ b/uthash.spec @@ -6,7 +6,7 @@ Name: uthash Version: 1.9.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A hash table for C structures License: BSD URL: http://troydhanson.github.io/uthash @@ -45,6 +45,9 @@ make %{?_smp_mflags} -C tests/ %{_includedir}/ut*.h %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.9.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.9.9-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From e01ad5661123be1ae2b8c95395278beaeb088051 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 07:19:36 +0000 Subject: [PATCH 03/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index d66b9e2..a6c0e21 100644 --- a/uthash.spec +++ b/uthash.spec @@ -6,7 +6,7 @@ Name: uthash Version: 1.9.9 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A hash table for C structures License: BSD URL: http://troydhanson.github.io/uthash @@ -46,6 +46,9 @@ cd tests && make %{?_smp_mflags} %{_includedir}/ut*.h %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.9.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 1.9.9-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 179bb86d12acf196f0fe0324d54a0b3b56592a04 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:43:53 +0000 Subject: [PATCH 04/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 581362c..c4cdafc 100644 --- a/uthash.spec +++ b/uthash.spec @@ -6,7 +6,7 @@ Name: uthash Version: 1.9.9 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A hash table for C structures License: BSD URL: http://troydhanson.github.io/uthash @@ -45,6 +45,9 @@ make %{?_smp_mflags} -C tests/ %{_includedir}/ut*.h %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.9.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 1.9.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From ced7cc3a31c85507c2081af2f0d852cc3218ae4e Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Wed, 23 Sep 2015 07:58:34 +0800 Subject: [PATCH 05/47] Cleanup --- uthash.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/uthash.spec b/uthash.spec index c4cdafc..0a5593c 100644 --- a/uthash.spec +++ b/uthash.spec @@ -14,18 +14,20 @@ Source0: https://github.com/troydhanson/%{name}/archive/v%{version}.tar.g %description Any C structure can be stored in a hash table using uthash. Just add a -UT_hash_handle to the structure and choose one or more fields in your -structure to act as the key. Then use these macros to store, retrieve or -delete items from the hash table. +UT_hash_handle to the structure and choose one or more fields in your +structure to act as the key. Then use these macros to store, retrieve or +delete items from the hash table. %package devel -Summary: Development files for %{name} +Summary: A hash table for C structures (headers only) Provides: %{name}-static = %{version}-%{release} BuildArch: noarch %description devel -This package contains libraries and header files for -developing applications that use %{name}. +Any C structure can be stored in a hash table using uthash. Just add a +UT_hash_handle to the structure and choose one or more fields in your +structure to act as the key. Then use these macros to store, retrieve or +delete items from the hash table. %prep %setup -q @@ -38,10 +40,11 @@ install -d %{buildroot}%{_includedir} install -pm0644 src/*.h %{buildroot}%{_includedir}/ %check -make %{?_smp_mflags} -C tests/ +%make_build -C tests/ %files devel -%doc LICENSE doc/*.txt +%doc doc/*.txt +%license LICENSE %{_includedir}/ut*.h %changelog From fd1834ce0c206da94c3734daac19bf8658cb469a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:28:56 +0000 Subject: [PATCH 06/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 0a5593c..8f39634 100644 --- a/uthash.spec +++ b/uthash.spec @@ -6,7 +6,7 @@ Name: uthash Version: 1.9.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A hash table for C structures License: BSD URL: http://troydhanson.github.io/uthash @@ -48,6 +48,9 @@ install -pm0644 src/*.h %{buildroot}%{_includedir}/ %{_includedir}/ut*.h %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.9.9-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 1.9.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 94908f987ac09913c015563a7f3cdc424418b526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 17 Dec 2016 15:24:49 +0100 Subject: [PATCH 07/47] Update to new upstream release v2.0.1 Introduce libut / libvector --- .gitignore | 1 + sources | 2 +- uthash-remove-failed-tests.patch | 417 ------------------------------- uthash.spec | 114 ++++++--- 4 files changed, 86 insertions(+), 448 deletions(-) delete mode 100644 uthash-remove-failed-tests.patch diff --git a/.gitignore b/.gitignore index f984a67..873ae66 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /v1.9.8.tar.gz /uthash-1.9.9.tar.gz +/uthash-2.0.1.tar.gz diff --git a/sources b/sources index c6700e7..de04ffc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3ce9197c818dcb7ca85b59912f310a4 uthash-1.9.9.tar.gz +SHA512 (uthash-2.0.1.tar.gz) = 56463a5600d1ae8ad59f58a4dec9090a4e9b2aa98cb6d24e64c60c5ece63b77f4845b25915c6a179ef890671258854d500fc8a58a1c5a9ba247de7ce8757d423 diff --git a/uthash-remove-failed-tests.patch b/uthash-remove-failed-tests.patch deleted file mode 100644 index 78d7292..0000000 --- a/uthash-remove-failed-tests.patch +++ /dev/null @@ -1,417 +0,0 @@ -From c3aef1064b79db79c0982cc92f8f993ace8e3cc6 Mon Sep 17 00:00:00 2001 -From: "Troy D. Hanson" -Date: Mon, 15 Apr 2013 22:36:12 -0400 -Subject: [PATCH] Clean up warnings and rm tests w/32-64 variance - ---- - tests/Makefile | 2 +- - tests/hashscan.c | 1 + - tests/test74.c | 2 +- - tests/test75.c | 2 +- - tests/test76.c | 2 +- - tests/test77.c | 2 +- - tests/test83.ans | 51 --------------------------------------------------- - tests/test83.c | 35 ----------------------------------- - tests/test83.dat | 51 --------------------------------------------------- - tests/test84.ans | 51 --------------------------------------------------- - tests/test84.c | 36 ------------------------------------ - tests/test84.dat | 51 --------------------------------------------------- - 12 files changed, 6 insertions(+), 280 deletions(-) - delete mode 100644 tests/test83.ans - delete mode 100644 tests/test83.c - delete mode 100644 tests/test83.dat - delete mode 100644 tests/test84.ans - delete mode 100644 tests/test84.c - delete mode 100644 tests/test84.dat - -diff --git a/tests/Makefile b/tests/Makefile -index b887c95..1d7cb7e 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -13,7 +13,7 @@ PROGS = test1 test2 test3 test4 test5 test6 test7 test8 test9 \ - test58 test59 test60 test61 test62 test63 test64 test65 \ - test66 test67 test68 test69 test70 test71 test72 test73 \ - test74 test75 test76 test77 test78 test79 test80 test81 \ -- test82 test83 test84 -+ test82 - CFLAGS = -I$(HASHDIR) - #CFLAGS += -DHASH_BLOOM=16 - #CFLAGS += -O2 -diff --git a/tests/hashscan.c b/tests/hashscan.c -index 65c53ae..ea6c5ff 100644 ---- a/tests/hashscan.c -+++ b/tests/hashscan.c -@@ -86,6 +86,7 @@ int infer_hash_function(char *key, size_t keylen, uint32_t hashv) { - HASH_FNV(key,keylen,num_bkts,ohashv,obkt); if (ohashv == hashv) return FNV; - HASH_OAT(key,keylen,num_bkts,ohashv,obkt); if (ohashv == hashv) return OAT; - HASH_MUR(key,keylen,num_bkts,ohashv,obkt); if (ohashv == hashv) return MUR; -+ obkt++; // this quiets an unused variable warning. yes, this is a ugly hack - return 0; - } - -diff --git a/tests/test74.c b/tests/test74.c -index 549bbb2..4910488 100644 ---- a/tests/test74.c -+++ b/tests/test74.c -@@ -32,7 +32,7 @@ int main() { - V_FindCnt++; - } - } while (V_FindPos >= 0); -- printf("FindCnt=%u\n", V_FindCnt); -+ printf("FindCnt=%u\n", (unsigned)V_FindCnt); - - utstring_free(s); - utstring_free(t); -diff --git a/tests/test75.c b/tests/test75.c -index d486934..d7520f5 100644 ---- a/tests/test75.c -+++ b/tests/test75.c -@@ -32,7 +32,7 @@ int main() { - V_FindCnt++; - } - } while (V_FindPos >= 0); -- printf("FindCnt=%u\n", V_FindCnt); -+ printf("FindCnt=%u\n", (unsigned)V_FindCnt); - - utstring_free(s); - utstring_free(t); -diff --git a/tests/test76.c b/tests/test76.c -index 385046f..d975978 100644 ---- a/tests/test76.c -+++ b/tests/test76.c -@@ -42,7 +42,7 @@ int main() { - } - printf("utstring_find()=%ld\n", V_FindPos); - } while (V_FindPos >= 0); -- printf("FindCnt=%u\n", V_FindCnt); -+ printf("FindCnt=%u\n", (unsigned)V_FindCnt); - - free(V_KMP_Table); - } -diff --git a/tests/test77.c b/tests/test77.c -index 42054b3..5d74942 100644 ---- a/tests/test77.c -+++ b/tests/test77.c -@@ -41,7 +41,7 @@ int main() { - } - printf("utstring_find()=%ld\n", V_FindPos); - } while (V_FindPos >= 0); -- printf("FindCnt=%u\n", V_FindCnt); -+ printf("FindCnt=%u\n", (unsigned)V_FindCnt); - - free(V_KMP_Table); - } -diff --git a/tests/test83.ans b/tests/test83.ans -deleted file mode 100644 -index 666b752..0000000 ---- a/tests/test83.ans -+++ /dev/null -@@ -1,51 +0,0 @@ --items in hash: 1, overhead: 460 --items in hash: 2, overhead: 492 --items in hash: 3, overhead: 524 --items in hash: 4, overhead: 556 --items in hash: 5, overhead: 588 --items in hash: 6, overhead: 620 --items in hash: 7, overhead: 652 --items in hash: 8, overhead: 684 --items in hash: 9, overhead: 716 --items in hash: 10, overhead: 748 --items in hash: 11, overhead: 780 --items in hash: 12, overhead: 812 --items in hash: 13, overhead: 844 --items in hash: 14, overhead: 876 --items in hash: 15, overhead: 908 --items in hash: 16, overhead: 940 --items in hash: 17, overhead: 972 --items in hash: 18, overhead: 1004 --items in hash: 19, overhead: 1036 --items in hash: 20, overhead: 1068 --items in hash: 21, overhead: 1100 --items in hash: 22, overhead: 1132 --items in hash: 23, overhead: 1164 --items in hash: 24, overhead: 1196 --items in hash: 25, overhead: 1228 --items in hash: 26, overhead: 1260 --items in hash: 27, overhead: 1292 --items in hash: 28, overhead: 1324 --items in hash: 29, overhead: 1356 --items in hash: 30, overhead: 1388 --items in hash: 31, overhead: 1420 --items in hash: 32, overhead: 1452 --items in hash: 33, overhead: 1484 --items in hash: 34, overhead: 1516 --items in hash: 35, overhead: 1548 --items in hash: 36, overhead: 1580 --items in hash: 37, overhead: 1612 --items in hash: 38, overhead: 1644 --items in hash: 39, overhead: 1676 --items in hash: 40, overhead: 1708 --items in hash: 41, overhead: 1740 --items in hash: 42, overhead: 1772 --items in hash: 43, overhead: 1804 --items in hash: 44, overhead: 1836 --items in hash: 45, overhead: 1868 --items in hash: 46, overhead: 1900 --items in hash: 47, overhead: 1932 --items in hash: 48, overhead: 1964 --items in hash: 49, overhead: 1996 --items in hash: 50, overhead: 2028 --items in hash: 51, overhead: 2060 -diff --git a/tests/test83.c b/tests/test83.c -deleted file mode 100644 -index 5d458e2..0000000 ---- a/tests/test83.c -+++ /dev/null -@@ -1,35 +0,0 @@ --#include "uthash.h" --#include /* malloc */ --#include /* perror */ --#include /* printf */ -- --#define BUFLEN 20 -- --typedef struct name_rec { -- char boy_name[BUFLEN]; -- UT_hash_handle hh; --} name_rec; -- --int main(int argc,char *argv[]) { -- name_rec *name, *names=NULL; -- char linebuf[BUFLEN]; -- FILE *file; -- -- if ( (file = fopen( "test83.dat", "r" )) == NULL ) { -- perror("can't open: "); -- exit(-1); -- } -- -- while (fgets(linebuf,BUFLEN,file) != NULL) { -- if ( (name = (name_rec*)malloc(sizeof(name_rec))) == NULL) exit(-1); -- strncpy(name->boy_name,linebuf,BUFLEN); -- HASH_ADD_STR(names,boy_name,name); -- printf("items in hash: %u, overhead: %u\n",(unsigned)HASH_COUNT(names), -- (unsigned)HASH_OVERHEAD(hh,names)); -- } -- -- fclose(file); -- -- return 0; --} -- -diff --git a/tests/test83.dat b/tests/test83.dat -deleted file mode 100644 -index bb6051b..0000000 ---- a/tests/test83.dat -+++ /dev/null -@@ -1,51 +0,0 @@ --JOHN --WILLIAM --WALTER --DOUGLAS --GERALD --FREDERICK --WARREN --SHANE --LESTER --RON --HARVEY --ADRIAN --CODY --NELSON --CLIFTON --WILLARD --DOUG --ORLANDO --REX --OMAR --DAMON --LOWELL --IRVING --CARROLL --LAURENCE --ROLANDO --CARY --XAVIER --ISAIAH --GUS --JARVIS --WINFRED --RAYMUNDO --LINCOLN --CORNELL --NIGEL --NORMAND --FRITZ --DONN --TRINIDAD --ODIS --DANNIE --DARIO --KENTON --CHONG --NEVILLE --TONEY --WARNER --WES --COLTON --ARNOLDO -diff --git a/tests/test84.ans b/tests/test84.ans -deleted file mode 100644 -index 7b3cc1e..0000000 ---- a/tests/test84.ans -+++ /dev/null -@@ -1,51 +0,0 @@ --items in hash: 1, overhead: 8664 --items in hash: 2, overhead: 8696 --items in hash: 3, overhead: 8728 --items in hash: 4, overhead: 8760 --items in hash: 5, overhead: 8792 --items in hash: 6, overhead: 8824 --items in hash: 7, overhead: 8856 --items in hash: 8, overhead: 8888 --items in hash: 9, overhead: 8920 --items in hash: 10, overhead: 8952 --items in hash: 11, overhead: 8984 --items in hash: 12, overhead: 9016 --items in hash: 13, overhead: 9048 --items in hash: 14, overhead: 9080 --items in hash: 15, overhead: 9112 --items in hash: 16, overhead: 9144 --items in hash: 17, overhead: 9176 --items in hash: 18, overhead: 9208 --items in hash: 19, overhead: 9240 --items in hash: 20, overhead: 9272 --items in hash: 21, overhead: 9304 --items in hash: 22, overhead: 9336 --items in hash: 23, overhead: 9368 --items in hash: 24, overhead: 9400 --items in hash: 25, overhead: 9432 --items in hash: 26, overhead: 9464 --items in hash: 27, overhead: 9496 --items in hash: 28, overhead: 9528 --items in hash: 29, overhead: 9560 --items in hash: 30, overhead: 9592 --items in hash: 31, overhead: 9624 --items in hash: 32, overhead: 9656 --items in hash: 33, overhead: 9688 --items in hash: 34, overhead: 9720 --items in hash: 35, overhead: 9752 --items in hash: 36, overhead: 9784 --items in hash: 37, overhead: 9816 --items in hash: 38, overhead: 9848 --items in hash: 39, overhead: 9880 --items in hash: 40, overhead: 9912 --items in hash: 41, overhead: 9944 --items in hash: 42, overhead: 9976 --items in hash: 43, overhead: 10008 --items in hash: 44, overhead: 10040 --items in hash: 45, overhead: 10072 --items in hash: 46, overhead: 10104 --items in hash: 47, overhead: 10136 --items in hash: 48, overhead: 10168 --items in hash: 49, overhead: 10200 --items in hash: 50, overhead: 10232 --items in hash: 51, overhead: 10264 -diff --git a/tests/test84.c b/tests/test84.c -deleted file mode 100644 -index 92f0749..0000000 ---- a/tests/test84.c -+++ /dev/null -@@ -1,36 +0,0 @@ --#define HASH_BLOOM 16 --#include "uthash.h" --#include /* malloc */ --#include /* perror */ --#include /* printf */ -- --#define BUFLEN 20 -- --typedef struct name_rec { -- char boy_name[BUFLEN]; -- UT_hash_handle hh; --} name_rec; -- --int main(int argc,char *argv[]) { -- name_rec *name, *names=NULL; -- char linebuf[BUFLEN]; -- FILE *file; -- -- if ( (file = fopen( "test84.dat", "r" )) == NULL ) { -- perror("can't open: "); -- exit(-1); -- } -- -- while (fgets(linebuf,BUFLEN,file) != NULL) { -- if ( (name = (name_rec*)malloc(sizeof(name_rec))) == NULL) exit(-1); -- strncpy(name->boy_name,linebuf,BUFLEN); -- HASH_ADD_STR(names,boy_name,name); -- printf("items in hash: %u, overhead: %u\n",(unsigned)HASH_COUNT(names), -- (unsigned)HASH_OVERHEAD(hh,names)); -- } -- -- fclose(file); -- -- return 0; --} -- -diff --git a/tests/test84.dat b/tests/test84.dat -deleted file mode 100644 -index bb6051b..0000000 ---- a/tests/test84.dat -+++ /dev/null -@@ -1,51 +0,0 @@ --JOHN --WILLIAM --WALTER --DOUGLAS --GERALD --FREDERICK --WARREN --SHANE --LESTER --RON --HARVEY --ADRIAN --CODY --NELSON --CLIFTON --WILLARD --DOUG --ORLANDO --REX --OMAR --DAMON --LOWELL --IRVING --CARROLL --LAURENCE --ROLANDO --CARY --XAVIER --ISAIAH --GUS --JARVIS --WINFRED --RAYMUNDO --LINCOLN --CORNELL --NIGEL --NORMAND --FRITZ --DONN --TRINIDAD --ODIS --DANNIE --DARIO --KENTON --CHONG --NEVILLE --TONEY --WARNER --WES --COLTON --ARNOLDO --- -1.8.1.6 - diff --git a/uthash.spec b/uthash.spec index 8f39634..7bb9614 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,53 +1,107 @@ -# This package builds a header-only lib, but has some testsuite to check -# the headers' function. For this reason the main-pkg is build arched and -# produces a noarched subpkg, only. There is no binary-compiled bits and -# therefore no debuginfo generated. -%global debug_package %{nil} +%global sover 0 -Name: uthash -Version: 1.9.9 -Release: 10%{?dist} -Summary: A hash table for C structures -License: BSD -URL: http://troydhanson.github.io/uthash -Source0: https://github.com/troydhanson/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +%global common_desc \ +Any C structure can be stored in a hash table using uthash. Just \ +add a UT_hash_handle to the structure and choose one or more fields \ +in your structure to act as the key. Then use these macros to store, \ +retrieve or delete items from the hash table. + +Name: uthash +Version: 2.0.1 +Release: 1%{?dist} +Summary: A hash table for C structures + +License: BSD +URL: http://troydhanson.github.io/uthash +Source0: https://github.com/troydhanson/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz %description -Any C structure can be stored in a hash table using uthash. Just add a -UT_hash_handle to the structure and choose one or more fields in your -structure to act as the key. Then use these macros to store, retrieve or -delete items from the hash table. +%{common_desc} -%package devel -Summary: A hash table for C structures (headers only) -Provides: %{name}-static = %{version}-%{release} -BuildArch: noarch + +%package devel +Summary: A hash table for C structures (headers only) + +Provides: %{name}-static == %{version}-%{release} + +BuildArch: noarch %description devel -Any C structure can be stored in a hash table using uthash. Just add a -UT_hash_handle to the structure and choose one or more fields in your -structure to act as the key. Then use these macros to store, retrieve or -delete items from the hash table. +%{common_desc} + + +%package -n libut +Summary: Library-implementation of utvector + +%description -n libut +The utvector is an alternative to utarray. It is a bit more +efficient. It's object code, not just a header. + + +%package -n libut-devel +Summary: Development-files for libut + +Requires: %{name}-devel == %{version}-%{release} +Requires: libut%{?_isa} == %{version}-%{release} + +%description -n libut-devel +Development-files for libut. + %prep -%setup -q +%autosetup + %build -# This is a header only package. +%configure || : +export CFLAGS="-fPIC ${CFLAGS}" +%make_build -C libut +%{__cc} -shared ${CFLAGS} ${LDFLAGS} \ + -Wl,-soname,libut.so.%{sover} \ + -o libut/libut.so.%{sover} libut/*.o + %install -install -d %{buildroot}%{_includedir} -install -pm0644 src/*.h %{buildroot}%{_includedir}/ +%{__mkdir} -p %{buildroot}%{_includedir} \ + %{buildroot}%{_libdir} +%{__install} -pm 0644 src/*.h %{buildroot}%{_includedir} +%{__install} -pm 0755 libut/libut.so.0 %{buildroot}%{_libdir} +/bin/ln -s %{_libdir}/libut.so.0 %{buildroot}%{_libdir}/libut.so + %check -%make_build -C tests/ +%configure || : +%make_build -C tests +%make_build -C libut/tests + + +%post -n libut -p /sbin/ldconfig +%postun -n libut -p /sbin/ldconfig + %files devel -%doc doc/*.txt %license LICENSE +%doc doc/*.txt +%exclude %{_includedir}/utvector.h %{_includedir}/ut*.h +%files -n libut +%license LICENSE +%{_libdir}/libut.so.%{sover} + +%files -n libut-devel +%doc libut/README.md +%{_includedir}/libut.h +%{_includedir}/ringbuf.h +%{_includedir}/utvector.h +%{_libdir}/libut.so + + %changelog +* Sat Dec 17 2016 Björn Esser - 2.0.1-1 +- Update to new upstream release v2.0.1 +- Introduce libut / libvector + * Fri Feb 05 2016 Fedora Release Engineering - 1.9.9-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 0ea0b7fe45f4e7f0a0cac73b3b2ee1bb3dc802ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 17 Dec 2016 16:13:15 +0100 Subject: [PATCH 08/47] Add BR: perl --- uthash.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/uthash.spec b/uthash.spec index 7bb9614..b626d2f 100644 --- a/uthash.spec +++ b/uthash.spec @@ -15,6 +15,8 @@ License: BSD URL: http://troydhanson.github.io/uthash Source0: https://github.com/troydhanson/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +BuildRequires: perl + %description %{common_desc} @@ -101,6 +103,7 @@ export CFLAGS="-fPIC ${CFLAGS}" * Sat Dec 17 2016 Björn Esser - 2.0.1-1 - Update to new upstream release v2.0.1 - Introduce libut / libvector +- Add BR: perl * Fri Feb 05 2016 Fedora Release Engineering - 1.9.9-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 96951f70ac944515fdbf65bd3cdb2a8818ad4c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 18 Dec 2016 14:05:44 +0100 Subject: [PATCH 09/47] Run testsuite with threads, too --- uthash.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index b626d2f..de00113 100644 --- a/uthash.spec +++ b/uthash.spec @@ -8,7 +8,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A hash table for C structures License: BSD @@ -74,6 +74,7 @@ export CFLAGS="-fPIC ${CFLAGS}" %check %configure || : %make_build -C tests +%make_build -C tests/threads %make_build -C libut/tests @@ -100,6 +101,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Sun Dec 18 2016 Björn Esser - 2.0.1-2 +- Run testsuite with threads, too + * Sat Dec 17 2016 Björn Esser - 2.0.1-1 - Update to new upstream release v2.0.1 - Introduce libut / libvector From 855cfb9a42a949f7ceeba4cd569dcebfc0d2b903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 29 Dec 2016 22:44:59 +0100 Subject: [PATCH 10/47] Properly build the documentation --- uthash-2.0.1_fix-asciidoc.patch | 21 +++++++++++++++++++++ uthash.spec | 19 ++++++++++++++----- 2 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 uthash-2.0.1_fix-asciidoc.patch diff --git a/uthash-2.0.1_fix-asciidoc.patch b/uthash-2.0.1_fix-asciidoc.patch new file mode 100644 index 0000000..f2d35f5 --- /dev/null +++ b/uthash-2.0.1_fix-asciidoc.patch @@ -0,0 +1,21 @@ +From 0190e9e7234b0049a8c61cea536ab6aaeda28194 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Thu, 29 Dec 2016 22:59:59 +0100 +Subject: [PATCH] Fix Author-string for older versions of asciidoc + +--- + doc/userguide.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/userguide.txt b/doc/userguide.txt +index 7a04d0c..9f96e5a 100644 +--- a/doc/userguide.txt ++++ b/doc/userguide.txt +@@ -1,6 +1,6 @@ + uthash User Guide + ================= +-Troy D. Hanson, Arthur O'Dwyer ++:Author: Troy_D._Hanson,_Arthur_O'Dwyer + v2.0.1, July 2016 + + To download uthash, follow this link back to the diff --git a/uthash.spec b/uthash.spec index de00113..b00c09e 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,4 +1,5 @@ %global sover 0 +%global git_url https://github.com/troydhanson/%{name} %global common_desc \ Any C structure can be stored in a hash table using uthash. Just \ @@ -8,13 +9,16 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A hash table for C structures License: BSD URL: http://troydhanson.github.io/uthash -Source0: https://github.com/troydhanson/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: %{git_url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: %{git_url}/pull/98.patch#/%{name}-2.0.1_fix-asciidoc.patch + +BuildRequires: asciidoc BuildRequires: perl %description @@ -51,7 +55,7 @@ Development-files for libut. %prep -%autosetup +%autosetup -p1 %build @@ -61,14 +65,16 @@ export CFLAGS="-fPIC ${CFLAGS}" %{__cc} -shared ${CFLAGS} ${LDFLAGS} \ -Wl,-soname,libut.so.%{sover} \ -o libut/libut.so.%{sover} libut/*.o +%make_build -C doc %install -%{__mkdir} -p %{buildroot}%{_includedir} \ +%{__mkdir} -p html %{buildroot}%{_includedir} \ %{buildroot}%{_libdir} %{__install} -pm 0644 src/*.h %{buildroot}%{_includedir} %{__install} -pm 0755 libut/libut.so.0 %{buildroot}%{_libdir} /bin/ln -s %{_libdir}/libut.so.0 %{buildroot}%{_libdir}/libut.so +%{__cp} -a doc/*.html doc/*.css doc/*.png html %check @@ -84,7 +90,7 @@ export CFLAGS="-fPIC ${CFLAGS}" %files devel %license LICENSE -%doc doc/*.txt +%doc html/ %exclude %{_includedir}/utvector.h %{_includedir}/ut*.h @@ -101,6 +107,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Thu Dec 29 2016 Björn Esser - 2.0.1-3 +- Properly build the documentation + * Sun Dec 18 2016 Björn Esser - 2.0.1-2 - Run testsuite with threads, too From fbbe96670940888c1918a077a4ca06a659161b45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 29 Dec 2016 23:44:14 +0100 Subject: [PATCH 11/47] Include plain ascii-docs, too --- uthash.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/uthash.spec b/uthash.spec index b00c09e..90dae9d 100644 --- a/uthash.spec +++ b/uthash.spec @@ -9,7 +9,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A hash table for C structures License: BSD @@ -90,7 +90,7 @@ export CFLAGS="-fPIC ${CFLAGS}" %files devel %license LICENSE -%doc html/ +%doc doc/*.txt html/ %exclude %{_includedir}/utvector.h %{_includedir}/ut*.h @@ -107,6 +107,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Thu Dec 29 2016 Björn Esser - 2.0.1-4 +- Include plain ascii-docs, too + * Thu Dec 29 2016 Björn Esser - 2.0.1-3 - Properly build the documentation From 43efffd0049ee05171ac5c2108889b92f6fa064d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 30 Dec 2016 10:31:22 +0100 Subject: [PATCH 12/47] Introduce doc-subpackage Use unified %%_pkgdocdir Updated Patch0 and use on el <= 6, only Rename Patch0 --> Patch 1000 Clean-up indentation --- uthash-2.0.1_fix-asciidoc.patch | 9 +---- uthash.spec | 70 +++++++++++++++++++++++++++------ 2 files changed, 60 insertions(+), 19 deletions(-) diff --git a/uthash-2.0.1_fix-asciidoc.patch b/uthash-2.0.1_fix-asciidoc.patch index f2d35f5..59ddfe2 100644 --- a/uthash-2.0.1_fix-asciidoc.patch +++ b/uthash-2.0.1_fix-asciidoc.patch @@ -1,21 +1,14 @@ -From 0190e9e7234b0049a8c61cea536ab6aaeda28194 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Thu, 29 Dec 2016 22:59:59 +0100 -Subject: [PATCH] Fix Author-string for older versions of asciidoc - ---- doc/userguide.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/userguide.txt b/doc/userguide.txt -index 7a04d0c..9f96e5a 100644 --- a/doc/userguide.txt +++ b/doc/userguide.txt @@ -1,6 +1,6 @@ uthash User Guide ================= -Troy D. Hanson, Arthur O'Dwyer -+:Author: Troy_D._Hanson,_Arthur_O'Dwyer ++Hanson, O'Dwyer v2.0.1, July 2016 To download uthash, follow this link back to the diff --git a/uthash.spec b/uthash.spec index 90dae9d..ee4b2f4 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,22 +1,29 @@ %global sover 0 %global git_url https://github.com/troydhanson/%{name} -%global common_desc \ +%global common_desc \ Any C structure can be stored in a hash table using uthash. Just \ add a UT_hash_handle to the structure and choose one or more fields \ in your structure to act as the key. Then use these macros to store, \ retrieve or delete items from the hash table. +# Setup _pkgdocdir if not defined already +%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} + + Name: uthash Version: 2.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A hash table for C structures License: BSD URL: http://troydhanson.github.io/uthash Source0: %{git_url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: %{git_url}/pull/98.patch#/%{name}-2.0.1_fix-asciidoc.patch +%if (0%{?rhel} && 0%{?rhel} <= 6) +# Downstream patch for asciidoc generation. +Patch1000: %{name}-2.0.1_fix-asciidoc.patch +%endif # (0#{?rhel} && 0#{?rhel} <= 6) BuildRequires: asciidoc BuildRequires: perl @@ -36,6 +43,14 @@ BuildArch: noarch %{common_desc} +%package doc +Summary: Documentation-files for %{name}. +BuildArch: noarch + +%description doc +This package contains the documentation-files for %{name}. + + %package -n libut Summary: Library-implementation of utvector @@ -62,19 +77,28 @@ Development-files for libut. %configure || : export CFLAGS="-fPIC ${CFLAGS}" %make_build -C libut -%{__cc} -shared ${CFLAGS} ${LDFLAGS} \ - -Wl,-soname,libut.so.%{sover} \ +%{__cc} -shared ${CFLAGS} ${LDFLAGS} \ + -Wl,-soname,libut.so.%{sover} \ -o libut/libut.so.%{sover} libut/*.o %make_build -C doc %install -%{__mkdir} -p html %{buildroot}%{_includedir} \ - %{buildroot}%{_libdir} +%{__mkdir} -p html \ + %{buildroot}%{_includedir} \ + %{buildroot}%{_libdir} \ + %{buildroot}%{_pkgdocdir}/{html,libut} %{__install} -pm 0644 src/*.h %{buildroot}%{_includedir} %{__install} -pm 0755 libut/libut.so.0 %{buildroot}%{_libdir} /bin/ln -s %{_libdir}/libut.so.0 %{buildroot}%{_libdir}/libut.so -%{__cp} -a doc/*.html doc/*.css doc/*.png html + +# Install doc. +%{__install} -pm 0644 doc/*.txt %{buildroot}%{_pkgdocdir} +%{__install} -pm 0644 doc/*.html doc/*.css doc/*.png %{buildroot}%{_pkgdocdir}/html +%{__install} -pm 0644 libut/README.md %{buildroot}%{_pkgdocdir}/libut +%if (0%{?rhel} && 0%{?rhel} <= 6) +%{__install} -pm 0644 LICENSE %{buildroot}%{_pkgdocdir} +%endif # (0#{?rhel} && 0#{?rhel} <= 6) %check @@ -89,17 +113,33 @@ export CFLAGS="-fPIC ${CFLAGS}" %files devel +%if !(0%{?rhel} && 0%{?rhel} <= 6) %license LICENSE -%doc doc/*.txt html/ +%else # !(0%{?rhel} && 0%{?rhel} <= 6) +%doc %{_pkgdocdir}/LICENSE +%endif # !(0%{?rhel} && 0%{?rhel} <= 6) +%doc %dir %{_pkgdocdir} %exclude %{_includedir}/utvector.h %{_includedir}/ut*.h +%files doc +%if !(0%{?rhel} && 0%{?rhel} <= 6) +%license %{_datadir}/licenses/%{name}* +%endif # !(0%{?rhel} && 0%{?rhel} <= 6) +%doc %{_pkgdocdir} + %files -n libut -%license LICENSE +%if !(0%{?rhel} && 0%{?rhel} <= 6) +%license %{_datadir}/licenses/%{name}* +%else # !(0%{?rhel} && 0%{?rhel} <= 6) +%doc %{_pkgdocdir}/LICENSE +%endif # !(0%{?rhel} && 0%{?rhel} <= 6) +%doc %dir %{_pkgdocdir} %{_libdir}/libut.so.%{sover} %files -n libut-devel -%doc libut/README.md +%doc %dir %{_pkgdocdir} +%doc %dir %{_pkgdocdir}/libut/README.md %{_includedir}/libut.h %{_includedir}/ringbuf.h %{_includedir}/utvector.h @@ -107,6 +147,14 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Fri Dec 30 2016 Björn Esser - 2.0.1-5 +- Introduce doc-subpackage +- Use unified %%_pkgdocdir +- Updated Patch0 and use on el <= 6, only +- Rename Patch0 --> Patch 1000 +- Clean-up indentation + + * Thu Dec 29 2016 Björn Esser - 2.0.1-4 - Include plain ascii-docs, too From 89c0a573492dabc619be52f1eeb1f6f48c42e976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 30 Dec 2016 13:05:43 +0100 Subject: [PATCH 13/47] Fix dir-ownership in %%doc --- uthash.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/uthash.spec b/uthash.spec index ee4b2f4..268b554 100644 --- a/uthash.spec +++ b/uthash.spec @@ -13,7 +13,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A hash table for C structures License: BSD @@ -139,7 +139,7 @@ export CFLAGS="-fPIC ${CFLAGS}" %files -n libut-devel %doc %dir %{_pkgdocdir} -%doc %dir %{_pkgdocdir}/libut/README.md +%doc %{_pkgdocdir}/libut %{_includedir}/libut.h %{_includedir}/ringbuf.h %{_includedir}/utvector.h @@ -147,6 +147,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Fri Dec 30 2016 Björn Esser - 2.0.1-6 +- Fix dir-ownership in %%doc + * Fri Dec 30 2016 Björn Esser - 2.0.1-5 - Introduce doc-subpackage - Use unified %%_pkgdocdir From 162204c4bc82c94c0206fec6d4f5cad82160192c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:51:52 +0000 Subject: [PATCH 14/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 268b554..ddc0128 100644 --- a/uthash.spec +++ b/uthash.spec @@ -13,7 +13,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A hash table for C structures License: BSD @@ -147,6 +147,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.0.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Dec 30 2016 Björn Esser - 2.0.1-6 - Fix dir-ownership in %%doc From 95d14880e8f5ce90280b5e3fbfb268b534c8c3a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 4 Mar 2017 20:55:23 +0100 Subject: [PATCH 15/47] New upstream release (rhbz#1429106) --- .gitignore | 1 + sources | 2 +- uthash.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 873ae66..c787020 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /v1.9.8.tar.gz /uthash-1.9.9.tar.gz /uthash-2.0.1.tar.gz +/uthash-2.0.2.tar.gz diff --git a/sources b/sources index de04ffc..6c5bb11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uthash-2.0.1.tar.gz) = 56463a5600d1ae8ad59f58a4dec9090a4e9b2aa98cb6d24e64c60c5ece63b77f4845b25915c6a179ef890671258854d500fc8a58a1c5a9ba247de7ce8757d423 +SHA512 (uthash-2.0.2.tar.gz) = 0c2e686eb5a1d6a03a6fa1d42e803fca4e9b60b2d965c635a5a33d487c8d115f1f8155ff99a0e1874b69f6b66c04ea7d8866472a39abe5d1a23ae73f6fa956d7 diff --git a/uthash.spec b/uthash.spec index ddc0128..54c398d 100644 --- a/uthash.spec +++ b/uthash.spec @@ -12,12 +12,12 @@ retrieve or delete items from the hash table. Name: uthash -Version: 2.0.1 -Release: 7%{?dist} +Version: 2.0.2 +Release: 1%{?dist} Summary: A hash table for C structures License: BSD -URL: http://troydhanson.github.io/uthash +URL: http://troydhanson.github.io/%{name} Source0: %{git_url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz %if (0%{?rhel} && 0%{?rhel} <= 6) @@ -70,7 +70,7 @@ Development-files for libut. %prep -%autosetup -p1 +%autosetup -p 1 %build @@ -147,6 +147,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Sat Mar 04 2017 Björn Esser - 2.0.2-1 +- New upstream release (rhbz#1429106) + * Sat Feb 11 2017 Fedora Release Engineering - 2.0.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 059cbbd97ad9f18707e28e735996ae8dbbb744f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 4 Mar 2017 21:04:57 +0100 Subject: [PATCH 16/47] Update asciidoc-patch for el6 --- ...-2.0.1_fix-asciidoc.patch => uthash-2.0.2_fix-asciidoc.patch | 2 +- uthash.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename uthash-2.0.1_fix-asciidoc.patch => uthash-2.0.2_fix-asciidoc.patch (94%) diff --git a/uthash-2.0.1_fix-asciidoc.patch b/uthash-2.0.2_fix-asciidoc.patch similarity index 94% rename from uthash-2.0.1_fix-asciidoc.patch rename to uthash-2.0.2_fix-asciidoc.patch index 59ddfe2..3180e5a 100644 --- a/uthash-2.0.1_fix-asciidoc.patch +++ b/uthash-2.0.2_fix-asciidoc.patch @@ -9,6 +9,6 @@ diff --git a/doc/userguide.txt b/doc/userguide.txt ================= -Troy D. Hanson, Arthur O'Dwyer +Hanson, O'Dwyer - v2.0.1, July 2016 + v2.0.2, March 2017 To download uthash, follow this link back to the diff --git a/uthash.spec b/uthash.spec index 54c398d..3b1fcbb 100644 --- a/uthash.spec +++ b/uthash.spec @@ -22,7 +22,7 @@ Source0: %{git_url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz %if (0%{?rhel} && 0%{?rhel} <= 6) # Downstream patch for asciidoc generation. -Patch1000: %{name}-2.0.1_fix-asciidoc.patch +Patch1000: %{name}-%{version}_fix-asciidoc.patch %endif # (0#{?rhel} && 0#{?rhel} <= 6) BuildRequires: asciidoc From e71f838262f4211a9d5e2b555ad36343319ac065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 12 Jul 2017 14:58:55 +0200 Subject: [PATCH 17/47] perl dependency renamed to perl-interpreter --- uthash.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 3b1fcbb..4d396a8 100644 --- a/uthash.spec +++ b/uthash.spec @@ -26,7 +26,7 @@ Patch1000: %{name}-%{version}_fix-asciidoc.patch %endif # (0#{?rhel} && 0#{?rhel} <= 6) BuildRequires: asciidoc -BuildRequires: perl +BuildRequires: perl-interpreter %description %{common_desc} From fc9c0aa017d22a813a30e6874d3d9d00fb5d3003 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 21:06:58 +0000 Subject: [PATCH 18/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 4d396a8..a899dd0 100644 --- a/uthash.spec +++ b/uthash.spec @@ -13,7 +13,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A hash table for C structures License: BSD @@ -147,6 +147,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Mar 04 2017 Björn Esser - 2.0.2-1 - New upstream release (rhbz#1429106) From a45caab16c96c8c508ca0c2b713965fed0b07172 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:55:30 +0000 Subject: [PATCH 19/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index a899dd0..45802b5 100644 --- a/uthash.spec +++ b/uthash.spec @@ -13,7 +13,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A hash table for C structures License: BSD @@ -147,6 +147,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 2.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 54cdd94af90c864d745a8b6e48f86ae624ce2a0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:13:13 +0000 Subject: [PATCH 20/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 45802b5..bfc2dc6 100644 --- a/uthash.spec +++ b/uthash.spec @@ -13,7 +13,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A hash table for C structures License: BSD @@ -147,6 +147,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 2.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 79a58b573aa5d5bfa826c3899c828e70c743d96f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:21:30 +0000 Subject: [PATCH 21/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index bfc2dc6..2f7ec0a 100644 --- a/uthash.spec +++ b/uthash.spec @@ -13,7 +13,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A hash table for C structures License: BSD @@ -147,6 +147,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.0.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 2.0.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 9f5551a6e8af3eaf8506443f3ae9e5e194a42efc Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 24 Jul 2018 16:53:43 +0200 Subject: [PATCH 22/47] Add missing BuildRequires on gcc make: cc: Command not found References: https://bugzilla.redhat.com/show_bug.cgi?id=1606628 Signed-off-by: Igor Gnatenko --- uthash.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/uthash.spec b/uthash.spec index 2f7ec0a..0f75cc9 100644 --- a/uthash.spec +++ b/uthash.spec @@ -25,6 +25,7 @@ Source0: %{git_url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch1000: %{name}-%{version}_fix-asciidoc.patch %endif # (0#{?rhel} && 0#{?rhel} <= 6) +BuildRequires: gcc BuildRequires: asciidoc BuildRequires: perl-interpreter From c4052d11c5dc72a21cae5671585675ac8db03172 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:41:16 +0100 Subject: [PATCH 23/47] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- uthash.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/uthash.spec b/uthash.spec index 0f75cc9..7c24af5 100644 --- a/uthash.spec +++ b/uthash.spec @@ -109,8 +109,7 @@ export CFLAGS="-fPIC ${CFLAGS}" %make_build -C libut/tests -%post -n libut -p /sbin/ldconfig -%postun -n libut -p /sbin/ldconfig +%ldconfig_scriptlets -n libut %files devel From 2a34d1e4462a2d06d441a5f5c266e0ea6dbb5c54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:59:39 +0000 Subject: [PATCH 24/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 7c24af5..3839640 100644 --- a/uthash.spec +++ b/uthash.spec @@ -13,7 +13,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A hash table for C structures License: BSD @@ -147,6 +147,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.0.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From f1ba1cceadcaa8245a97c91fa7f6717d9f3c29ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:41:55 +0000 Subject: [PATCH 25/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 3839640..554e806 100644 --- a/uthash.spec +++ b/uthash.spec @@ -13,7 +13,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A hash table for C structures License: BSD @@ -147,6 +147,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.0.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 2.0.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From a7b57c6b5f3aa396c45a209b9cd036c56bae12f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:49:53 +0000 Subject: [PATCH 26/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 554e806..e5986a2 100644 --- a/uthash.spec +++ b/uthash.spec @@ -13,7 +13,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A hash table for C structures License: BSD @@ -147,6 +147,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 2.0.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 2.0.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From e742a3374a52c1d6087b49984a2393439775cb7e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:28:15 +0000 Subject: [PATCH 27/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index e5986a2..126b1e3 100644 --- a/uthash.spec +++ b/uthash.spec @@ -13,7 +13,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A hash table for C structures License: BSD @@ -147,6 +147,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 2.0.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 2.0.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 956b52b82fea8b9db8df70fd0f386520f105c2a2 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 12 Jan 2021 01:34:04 +0000 Subject: [PATCH 28/47] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- uthash.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/uthash.spec b/uthash.spec index 126b1e3..da405bd 100644 --- a/uthash.spec +++ b/uthash.spec @@ -25,6 +25,7 @@ Source0: %{git_url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch1000: %{name}-%{version}_fix-asciidoc.patch %endif # (0#{?rhel} && 0#{?rhel} <= 6) +BuildRequires: make BuildRequires: gcc BuildRequires: asciidoc BuildRequires: perl-interpreter From 57881be5a35755a44177936e17ac089966b5f92d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:50:14 +0000 Subject: [PATCH 29/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index da405bd..2d0776c 100644 --- a/uthash.spec +++ b/uthash.spec @@ -13,7 +13,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A hash table for C structures License: BSD @@ -148,6 +148,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 2.0.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 2.0.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From c0cfdcd6e617f19eadd0c455d7f57348290d00ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:13:38 +0000 Subject: [PATCH 30/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 2d0776c..5ab1fa5 100644 --- a/uthash.spec +++ b/uthash.spec @@ -13,7 +13,7 @@ retrieve or delete items from the hash table. Name: uthash Version: 2.0.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A hash table for C structures License: BSD @@ -148,6 +148,9 @@ export CFLAGS="-fPIC ${CFLAGS}" %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 2.0.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 02c7ee79ff116e7ca93fc0ef0370c71b8da4af44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 23 Dec 2021 15:03:38 +0100 Subject: [PATCH 31/47] Update to 2.3.0 Obsolete libut as it has been dropped upstream --- .gitignore | 5 +- sources | 2 +- uthash-2.0.2_fix-asciidoc.patch | 14 --- uthash.spec | 150 ++++++++++---------------------- 4 files changed, 48 insertions(+), 123 deletions(-) delete mode 100644 uthash-2.0.2_fix-asciidoc.patch diff --git a/.gitignore b/.gitignore index c787020..b772d1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/v1.9.8.tar.gz -/uthash-1.9.9.tar.gz -/uthash-2.0.1.tar.gz -/uthash-2.0.2.tar.gz +/uthash-*.tar.gz diff --git a/sources b/sources index 6c5bb11..b640b01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uthash-2.0.2.tar.gz) = 0c2e686eb5a1d6a03a6fa1d42e803fca4e9b60b2d965c635a5a33d487c8d115f1f8155ff99a0e1874b69f6b66c04ea7d8866472a39abe5d1a23ae73f6fa956d7 +SHA512 (uthash-2.3.0.tar.gz) = 3b01f1074790fb242900411cb16eb82c1a9afcf58e3196a0f4611d9d7ef94690ad38c0a500e7783d3efa20328aa8d6ab14f246be63b3b3d385502ba2b6b2a294 diff --git a/uthash-2.0.2_fix-asciidoc.patch b/uthash-2.0.2_fix-asciidoc.patch deleted file mode 100644 index 3180e5a..0000000 --- a/uthash-2.0.2_fix-asciidoc.patch +++ /dev/null @@ -1,14 +0,0 @@ - doc/userguide.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/userguide.txt b/doc/userguide.txt ---- a/doc/userguide.txt -+++ b/doc/userguide.txt -@@ -1,6 +1,6 @@ - uthash User Guide - ================= --Troy D. Hanson, Arthur O'Dwyer -+Hanson, O'Dwyer - v2.0.2, March 2017 - - To download uthash, follow this link back to the diff --git a/uthash.spec b/uthash.spec index 5ab1fa5..ae62db0 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,153 +1,95 @@ -%global sover 0 -%global git_url https://github.com/troydhanson/%{name} - -%global common_desc \ -Any C structure can be stored in a hash table using uthash. Just \ -add a UT_hash_handle to the structure and choose one or more fields \ -in your structure to act as the key. Then use these macros to store, \ -retrieve or delete items from the hash table. - -# Setup _pkgdocdir if not defined already -%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} +# Header-only lib. +%global debug_package %{nil} -Name: uthash -Version: 2.0.2 -Release: 11%{?dist} -Summary: A hash table for C structures +Name: uthash +Version: 2.3.0 +Release: 1%{?dist} +Summary: A hash table for C structures -License: BSD -URL: http://troydhanson.github.io/%{name} -Source0: %{git_url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +License: BSD +URL: http://troydhanson.github.io/%{name} +Source0: https://github.com/troydhanson/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -%if (0%{?rhel} && 0%{?rhel} <= 6) -# Downstream patch for asciidoc generation. -Patch1000: %{name}-%{version}_fix-asciidoc.patch -%endif # (0#{?rhel} && 0#{?rhel} <= 6) - -BuildRequires: make +BuildRequires: asciidoc BuildRequires: gcc -BuildRequires: asciidoc -BuildRequires: perl-interpreter +BuildRequires: make +BuildRequires: perl-interpreter %description -%{common_desc} +Any C structure can be stored in a hash table using uthash. Just +add a UT_hash_handle to the structure and choose one or more fields +in your structure to act as the key. Then use these macros to store, +retrieve or delete items from the hash table. -%package devel -Summary: A hash table for C structures (headers only) +%package devel +Summary: A hash table for C structures (headers only) -Provides: %{name}-static == %{version}-%{release} +# c-compiled libraries have been dropped upstream. +Obsoletes: libut < 2.3.0 +Obsoletes: libut-devel < 2.3.0 -BuildArch: noarch +Provides: %{name} = %{version}-%{release} +Provides: %{name}-static = %{version}-%{release} +Provides: libut = %{version}-%{release} +Provides: libut-devel = %{version}-%{release} -%description devel -%{common_desc} +BuildArch: noarch + +%description devel +Any C structure can be stored in a hash table using uthash. Just +add a UT_hash_handle to the structure and choose one or more fields +in your structure to act as the key. Then use these macros to store, +retrieve or delete items from the hash table. %package doc -Summary: Documentation-files for %{name}. -BuildArch: noarch +Summary: Documentation-files for %{name} +BuildArch: noarch %description doc This package contains the documentation-files for %{name}. -%package -n libut -Summary: Library-implementation of utvector - -%description -n libut -The utvector is an alternative to utarray. It is a bit more -efficient. It's object code, not just a header. - - -%package -n libut-devel -Summary: Development-files for libut - -Requires: %{name}-devel == %{version}-%{release} -Requires: libut%{?_isa} == %{version}-%{release} - -%description -n libut-devel -Development-files for libut. - - %prep -%autosetup -p 1 +%autosetup -p1 %build -%configure || : -export CFLAGS="-fPIC ${CFLAGS}" -%make_build -C libut -%{__cc} -shared ${CFLAGS} ${LDFLAGS} \ - -Wl,-soname,libut.so.%{sover} \ - -o libut/libut.so.%{sover} libut/*.o %make_build -C doc %install -%{__mkdir} -p html \ - %{buildroot}%{_includedir} \ - %{buildroot}%{_libdir} \ - %{buildroot}%{_pkgdocdir}/{html,libut} -%{__install} -pm 0644 src/*.h %{buildroot}%{_includedir} -%{__install} -pm 0755 libut/libut.so.0 %{buildroot}%{_libdir} -/bin/ln -s %{_libdir}/libut.so.0 %{buildroot}%{_libdir}/libut.so - +mkdir -p %{buildroot}{%{_includedir},%{_pkgdocdir}/html} +install -pm 0644 src/*.h %{buildroot}%{_includedir} # Install doc. -%{__install} -pm 0644 doc/*.txt %{buildroot}%{_pkgdocdir} -%{__install} -pm 0644 doc/*.html doc/*.css doc/*.png %{buildroot}%{_pkgdocdir}/html -%{__install} -pm 0644 libut/README.md %{buildroot}%{_pkgdocdir}/libut -%if (0%{?rhel} && 0%{?rhel} <= 6) -%{__install} -pm 0644 LICENSE %{buildroot}%{_pkgdocdir} -%endif # (0#{?rhel} && 0#{?rhel} <= 6) +install -pm 0644 doc/*.txt %{buildroot}%{_pkgdocdir} +install -pm 0644 doc/*.html doc/*.css doc/*.png %{buildroot}%{_pkgdocdir}/html %check -%configure || : +%set_build_flags %make_build -C tests %make_build -C tests/threads -%make_build -C libut/tests - - -%ldconfig_scriptlets -n libut %files devel -%if !(0%{?rhel} && 0%{?rhel} <= 6) %license LICENSE -%else # !(0%{?rhel} && 0%{?rhel} <= 6) -%doc %{_pkgdocdir}/LICENSE -%endif # !(0%{?rhel} && 0%{?rhel} <= 6) %doc %dir %{_pkgdocdir} -%exclude %{_includedir}/utvector.h -%{_includedir}/ut*.h +%doc %{_pkgdocdir}/ChangeLog.txt +%{_includedir}/*.h %files doc -%if !(0%{?rhel} && 0%{?rhel} <= 6) %license %{_datadir}/licenses/%{name}* -%endif # !(0%{?rhel} && 0%{?rhel} <= 6) %doc %{_pkgdocdir} -%files -n libut -%if !(0%{?rhel} && 0%{?rhel} <= 6) -%license %{_datadir}/licenses/%{name}* -%else # !(0%{?rhel} && 0%{?rhel} <= 6) -%doc %{_pkgdocdir}/LICENSE -%endif # !(0%{?rhel} && 0%{?rhel} <= 6) -%doc %dir %{_pkgdocdir} -%{_libdir}/libut.so.%{sover} - -%files -n libut-devel -%doc %dir %{_pkgdocdir} -%doc %{_pkgdocdir}/libut -%{_includedir}/libut.h -%{_includedir}/ringbuf.h -%{_includedir}/utvector.h -%{_libdir}/libut.so - %changelog +* Thu Dec 23 2021 Björn Esser - 2.3.0-1 +- Update to 2.3.0 +- Obsolete libut as it has been dropped upstream + * Fri Jul 23 2021 Fedora Release Engineering - 2.0.2-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 60847809eb3bd3e43b169ad00faae7944e16a7ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:42:43 +0000 Subject: [PATCH 32/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index ae62db0..80bfaba 100644 --- a/uthash.spec +++ b/uthash.spec @@ -4,7 +4,7 @@ Name: uthash Version: 2.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A hash table for C structures License: BSD @@ -86,6 +86,9 @@ install -pm 0644 doc/*.html doc/*.css doc/*.png %{buildroot}%{_pkgdocdir}/html %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Dec 23 2021 Björn Esser - 2.3.0-1 - Update to 2.3.0 - Obsolete libut as it has been dropped upstream From 4bae7e9ae76ed2be1bcd2243f84aa1b32df42fb5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:35:40 +0000 Subject: [PATCH 33/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 80bfaba..d3eb387 100644 --- a/uthash.spec +++ b/uthash.spec @@ -4,7 +4,7 @@ Name: uthash Version: 2.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A hash table for C structures License: BSD @@ -86,6 +86,9 @@ install -pm 0644 doc/*.html doc/*.css doc/*.png %{buildroot}%{_pkgdocdir}/html %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 2.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 2.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From cf194b15ec13b9fa7ca41e86da62346a81af3f39 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:01:19 +0000 Subject: [PATCH 34/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index d3eb387..d0d1d6e 100644 --- a/uthash.spec +++ b/uthash.spec @@ -4,7 +4,7 @@ Name: uthash Version: 2.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A hash table for C structures License: BSD @@ -86,6 +86,9 @@ install -pm 0644 doc/*.html doc/*.css doc/*.png %{buildroot}%{_pkgdocdir}/html %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 2.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 2.3.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d3de8c0bf2ec08e26af98c160a55454bdcbd0448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 28 Jun 2023 01:07:34 +0200 Subject: [PATCH 35/47] Add tools package --- uthash.spec | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/uthash.spec b/uthash.spec index d0d1d6e..80a5d5e 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,10 +1,6 @@ -# Header-only lib. -%global debug_package %{nil} - - Name: uthash Version: 2.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A hash table for C structures License: BSD @@ -44,6 +40,22 @@ in your structure to act as the key. Then use these macros to store, retrieve or delete items from the hash table. +%package tools +Summary: Command-line utilities for %{name} +Requires: %{name} = %{version}-%{release} + +%description tools +This package provides the hashscan and keystats utility programs +for %{name}. + +The hashscan program examines a running process and reports on the +uthash tables that it finds in that program’s memory. It can also +save the keys from each table in a format that can be fed into keystats. + +The keystats program is able to analyze which hash function has the best +characteristics on the set of keys reported by the hashscan program. + + %package doc Summary: Documentation-files for %{name} BuildArch: noarch @@ -57,35 +69,41 @@ This package contains the documentation-files for %{name}. %build +%set_build_flags %make_build -C doc +%make_build -C tests +%make_build -C tests/threads %install -mkdir -p %{buildroot}{%{_includedir},%{_pkgdocdir}/html} +mkdir -p %{buildroot}{%{_bindir},%{_includedir},%{_pkgdocdir}/html} +install -pm 0755 tests/{hashscan,keystats} %{buildroot}%{_bindir} install -pm 0644 src/*.h %{buildroot}%{_includedir} # Install doc. install -pm 0644 doc/*.txt %{buildroot}%{_pkgdocdir} install -pm 0644 doc/*.html doc/*.css doc/*.png %{buildroot}%{_pkgdocdir}/html -%check -%set_build_flags -%make_build -C tests -%make_build -C tests/threads - - %files devel %license LICENSE %doc %dir %{_pkgdocdir} %doc %{_pkgdocdir}/ChangeLog.txt %{_includedir}/*.h + +%files tools +%{_bindir}/* + + %files doc %license %{_datadir}/licenses/%{name}* %doc %{_pkgdocdir} %changelog +* Tue Jun 27 2023 Björn Esser - 2.3.0-5 +- Add tools package + * Sat Jan 21 2023 Fedora Release Engineering - 2.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ca04d4f5e6b3147f82f1a8657d33fcbb7088640f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 28 Jun 2023 01:08:25 +0200 Subject: [PATCH 36/47] Add explicit perl BRs --- uthash.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 80a5d5e..a639735 100644 --- a/uthash.spec +++ b/uthash.spec @@ -11,6 +11,8 @@ BuildRequires: asciidoc BuildRequires: gcc BuildRequires: make BuildRequires: perl-interpreter +BuildRequires: perl(strict) +BuildRequires: perl(warnings) %description Any C structure can be stored in a hash table using uthash. Just @@ -96,13 +98,13 @@ install -pm 0644 doc/*.html doc/*.css doc/*.png %{buildroot}%{_pkgdocdir}/html %files doc -%license %{_datadir}/licenses/%{name}* %doc %{_pkgdocdir} %changelog * Tue Jun 27 2023 Björn Esser - 2.3.0-5 - Add tools package +- Add explicit perl BRs * Sat Jan 21 2023 Fedora Release Engineering - 2.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 374588bb32a3617092f8fbbfff3ba4ee00edf21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 28 Jun 2023 01:09:20 +0200 Subject: [PATCH 37/47] Add example program to doc package --- uthash.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index a639735..9fe65cd 100644 --- a/uthash.spec +++ b/uthash.spec @@ -82,7 +82,7 @@ mkdir -p %{buildroot}{%{_bindir},%{_includedir},%{_pkgdocdir}/html} install -pm 0755 tests/{hashscan,keystats} %{buildroot}%{_bindir} install -pm 0644 src/*.h %{buildroot}%{_includedir} # Install doc. -install -pm 0644 doc/*.txt %{buildroot}%{_pkgdocdir} +install -pm 0644 doc/*.txt tests/example.c %{buildroot}%{_pkgdocdir} install -pm 0644 doc/*.html doc/*.css doc/*.png %{buildroot}%{_pkgdocdir}/html @@ -105,6 +105,7 @@ install -pm 0644 doc/*.html doc/*.css doc/*.png %{buildroot}%{_pkgdocdir}/html * Tue Jun 27 2023 Björn Esser - 2.3.0-5 - Add tools package - Add explicit perl BRs +- Add example program to doc package * Sat Jan 21 2023 Fedora Release Engineering - 2.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f0195e551520f78334747dfe096e032b580c882e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 28 Jun 2023 01:10:20 +0200 Subject: [PATCH 38/47] Drop google site-verification file from doc package --- uthash.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uthash.spec b/uthash.spec index 9fe65cd..c45bf4b 100644 --- a/uthash.spec +++ b/uthash.spec @@ -84,6 +84,7 @@ install -pm 0644 src/*.h %{buildroot}%{_includedir} # Install doc. install -pm 0644 doc/*.txt tests/example.c %{buildroot}%{_pkgdocdir} install -pm 0644 doc/*.html doc/*.css doc/*.png %{buildroot}%{_pkgdocdir}/html +rm -f %{buildroot}%{_pkgdocdir}/html/google*.html %files devel @@ -106,6 +107,7 @@ install -pm 0644 doc/*.html doc/*.css doc/*.png %{buildroot}%{_pkgdocdir}/html - Add tools package - Add explicit perl BRs - Add example program to doc package +- Drop google site-verification file from doc package * Sat Jan 21 2023 Fedora Release Engineering - 2.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 55d6af2e197611f61e16512134782823b27de56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 28 Jun 2023 01:11:13 +0200 Subject: [PATCH 39/47] Require main package in doc package to avoid file conflicts --- uthash.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uthash.spec b/uthash.spec index c45bf4b..34a1bb0 100644 --- a/uthash.spec +++ b/uthash.spec @@ -61,6 +61,7 @@ characteristics on the set of keys reported by the hashscan program. %package doc Summary: Documentation-files for %{name} BuildArch: noarch +Requires: %{name} = %{version}-%{release} %description doc This package contains the documentation-files for %{name}. @@ -108,6 +109,7 @@ rm -f %{buildroot}%{_pkgdocdir}/html/google*.html - Add explicit perl BRs - Add example program to doc package - Drop google site-verification file from doc package +- Require main package in doc package to avoid file conflicts * Sat Jan 21 2023 Fedora Release Engineering - 2.3.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 426d677d59d839493ddb2a92eb4767d8ba422c67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:19:39 +0000 Subject: [PATCH 40/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 34a1bb0..aebdede 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,6 +1,6 @@ Name: uthash Version: 2.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A hash table for C structures License: BSD @@ -104,6 +104,9 @@ rm -f %{buildroot}%{_pkgdocdir}/html/google*.html %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 2.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 27 2023 Björn Esser - 2.3.0-5 - Add tools package - Add explicit perl BRs From 05db3e4e3024cb5e50606283ea4913241d2e5bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 1 Nov 2023 15:24:52 +0000 Subject: [PATCH 41/47] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- uthash.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index aebdede..256ae98 100644 --- a/uthash.spec +++ b/uthash.spec @@ -3,7 +3,7 @@ Version: 2.3.0 Release: 6%{?dist} Summary: A hash table for C structures -License: BSD +License: BSD-1-Clause URL: http://troydhanson.github.io/%{name} Source0: https://github.com/troydhanson/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz From 89e1ed1efa1fac4e764891f872e83e7ccbf4348b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:21:47 +0000 Subject: [PATCH 42/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 256ae98..0d539a6 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,6 +1,6 @@ Name: uthash Version: 2.3.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A hash table for C structures License: BSD-1-Clause @@ -104,6 +104,9 @@ rm -f %{buildroot}%{_pkgdocdir}/html/google*.html %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.3.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4f80f6076baebaaedb051332c35230941570bdfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:28:24 +0000 Subject: [PATCH 43/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 0d539a6..5390d04 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,6 +1,6 @@ Name: uthash Version: 2.3.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A hash table for C structures License: BSD-1-Clause @@ -104,6 +104,9 @@ rm -f %{buildroot}%{_pkgdocdir}/html/google*.html %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.3.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.3.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 9987d430947ab5caf65c50261b80e506eb4d00ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:59:52 +0000 Subject: [PATCH 44/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 5390d04..83e26a5 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,6 +1,6 @@ Name: uthash Version: 2.3.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A hash table for C structures License: BSD-1-Clause @@ -104,6 +104,9 @@ rm -f %{buildroot}%{_pkgdocdir}/html/google*.html %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.3.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 2.3.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c1d9265ce4fe218f98bc76be92997cfb5cc4c5ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:54:24 +0000 Subject: [PATCH 45/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 83e26a5..fb6bec8 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,6 +1,6 @@ Name: uthash Version: 2.3.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A hash table for C structures License: BSD-1-Clause @@ -104,6 +104,9 @@ rm -f %{buildroot}%{_pkgdocdir}/html/google*.html %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.3.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 2.3.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From da2b48eb09dfd78942937350bad11bf1bf751441 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 20 Jan 2026 03:31:27 +0000 Subject: [PATCH 46/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index fb6bec8..6218b78 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,6 +1,6 @@ Name: uthash Version: 2.3.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A hash table for C structures License: BSD-1-Clause @@ -104,6 +104,9 @@ rm -f %{buildroot}%{_pkgdocdir}/html/google*.html %changelog +* Tue Jan 20 2026 Fedora Release Engineering - 2.3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 2.3.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 7ef41ef1ae73ea19e3e329830b73db96754eb306 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:18:17 +0000 Subject: [PATCH 47/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- uthash.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 6218b78..7bf0b2a 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,6 +1,6 @@ Name: uthash Version: 2.3.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A hash table for C structures License: BSD-1-Clause @@ -104,6 +104,9 @@ rm -f %{buildroot}%{_pkgdocdir}/html/google*.html %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.3.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Tue Jan 20 2026 Fedora Release Engineering - 2.3.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild