From 06f0da5335c6cd248488041f9fc848703fe88ecc Mon Sep 17 00:00:00 2001 From: Christopher Meng Date: Mon, 19 May 2014 20:08:41 +0800 Subject: [PATCH 1/6] Move all headers to -devel subpkg. --- uthash.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/uthash.spec b/uthash.spec index e529cf7..4d1c7f7 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,10 +1,10 @@ -Name: uthash -Version: 1.9.9 -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 +Name: uthash +Version: 1.9.9 +Release: 2%{?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 @@ -33,11 +33,14 @@ install -pm0644 src/*.h %{buildroot}%{_includedir}/ %check cd tests && make %{?_smp_mflags} -%files +%files devel %doc LICENSE doc/*.txt %{_includedir}/ut*.h %changelog +* Sun May 18 2014 Christopher Meng - 1.9.9-2 +- Move all files to -devel subpkg. + * Sat Mar 29 2014 Christopher Meng - 1.9.9-1 - Update to 1.9.9 From a9e5eece7978df16ac220a199af2973274ec0b3b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 21 May 2014 12:24:40 +0100 Subject: [PATCH 2/6] Build as noarch --- uthash.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index 4d1c7f7..f63f389 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,6 +1,6 @@ Name: uthash Version: 1.9.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A hash table for C structures License: BSD URL: http://troydhanson.github.io/uthash @@ -15,6 +15,7 @@ delete items from the hash table. %package devel Summary: Development files for %{name} Provides: %{name}-static = %{version}-%{release} +BuildArch: noarch %description devel This package contains libraries and header files for @@ -38,6 +39,9 @@ cd tests && make %{?_smp_mflags} %{_includedir}/ut*.h %changelog +* Wed May 21 2014 Peter Robinson 1.9.9-3 +- Build as noarch + * Sun May 18 2014 Christopher Meng - 1.9.9-2 - Move all files to -devel subpkg. From 13e7304a275ebf445c0e987e32bc187f13d0e290 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 21 May 2014 13:44:13 +0100 Subject: [PATCH 3/6] Root package should be noarch too --- uthash.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/uthash.spec b/uthash.spec index f63f389..3d4388c 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,10 +1,11 @@ Name: uthash Version: 1.9.9 -Release: 3%{?dist} +Release: 4%{?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 +BuildArch: noarch %description Any C structure can be stored in a hash table using uthash. Just add a @@ -39,6 +40,9 @@ cd tests && make %{?_smp_mflags} %{_includedir}/ut*.h %changelog +* Wed May 21 2014 Peter Robinson 1.9.9-4 +- Root package should be noarch too + * Wed May 21 2014 Peter Robinson 1.9.9-3 - Build as noarch From d8d4d02af8767b0b3507a3376d4d3347f54d6183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 22 May 2014 16:02:16 +0200 Subject: [PATCH 4/6] revert "Root package should be noarch too". add provides %%{name} for -devel subpkg. add a note about why the mainpkg is arched. This reverts commit 13e7304a275ebf445c0e987e32bc187f13d0e290. --- uthash.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/uthash.spec b/uthash.spec index 3d4388c..4a9e0c8 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,3 +1,7 @@ +# 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. + Name: uthash Version: 1.9.9 Release: 4%{?dist} @@ -5,7 +9,6 @@ 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 -BuildArch: noarch %description Any C structure can be stored in a hash table using uthash. Just add a @@ -15,6 +18,7 @@ delete items from the hash table. %package devel Summary: Development files for %{name} +Provides: %{name} = %{version}-%{release} Provides: %{name}-static = %{version}-%{release} BuildArch: noarch @@ -40,8 +44,10 @@ cd tests && make %{?_smp_mflags} %{_includedir}/ut*.h %changelog -* Wed May 21 2014 Peter Robinson 1.9.9-4 -- Root package should be noarch too +* Thu May 22 2014 Björn Esser - 1.9.9-4 +- revert "Root package should be noarch too". +- add provides %%{name} for -devel subpkg. +- add a note about why the mainpkg is arched. * Wed May 21 2014 Peter Robinson 1.9.9-3 - Build as noarch From de61c785862fd7d105dd2c868b3b7eae9d228020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 22 May 2014 16:10:13 +0200 Subject: [PATCH 5/6] fix up %%changlog and %%revision. --- uthash.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/uthash.spec b/uthash.spec index 4a9e0c8..a9c7030 100644 --- a/uthash.spec +++ b/uthash.spec @@ -4,7 +4,7 @@ Name: uthash Version: 1.9.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A hash table for C structures License: BSD URL: http://troydhanson.github.io/uthash @@ -44,11 +44,14 @@ cd tests && make %{?_smp_mflags} %{_includedir}/ut*.h %changelog -* Thu May 22 2014 Björn Esser - 1.9.9-4 +* Thu May 22 2014 Björn Esser - 1.9.9-5 - revert "Root package should be noarch too". - add provides %%{name} for -devel subpkg. - add a note about why the mainpkg is arched. +* Wed May 21 2014 Peter Robinson 1.9.9-4 +- Root package should be noarch too + * Wed May 21 2014 Peter Robinson 1.9.9-3 - Build as noarch From cbddf3f27d2c4cb77f0f105a254b9e4786b85119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Wed, 28 May 2014 12:56:59 +0200 Subject: [PATCH 6/6] add `%%global debug_package %%{nil}` to avoid empty debuginfo-pkg --- uthash.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/uthash.spec b/uthash.spec index a9c7030..396aca5 100644 --- a/uthash.spec +++ b/uthash.spec @@ -1,10 +1,12 @@ # 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. +# produces a noarched subpkg, only. There is no binary-compiled bits and +# therefore no debuginfo generated. +%global debug_package %{nil} Name: uthash Version: 1.9.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A hash table for C structures License: BSD URL: http://troydhanson.github.io/uthash @@ -44,6 +46,9 @@ cd tests && make %{?_smp_mflags} %{_includedir}/ut*.h %changelog +* Wed May 28 2014 Björn Esser - 1.9.9-6 +- add `%%global debug_package %%{nil}` to avoid empty debuginfo-pkg. + * Thu May 22 2014 Björn Esser - 1.9.9-5 - revert "Root package should be noarch too". - add provides %%{name} for -devel subpkg.