Merge branch 'master' into el6

uthash.spec

@@ -1,10 +1,16 @@
-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
+# 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}
+
+Name:           uthash
+Version:        1.9.9
+Release:        6%{?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
@@ -14,7 +20,9 @@ delete items from the hash table.
 
 %package        devel
 Summary:        Development files for %{name}
+Provides:       %{name} = %{version}-%{release}
 Provides:       %{name}-static = %{version}-%{release}
+BuildArch:      noarch
 
 %description    devel
 This package contains libraries and header files for
@@ -33,11 +41,28 @@ install -pm0644 src/*.h %{buildroot}%{_includedir}/
 %check
 cd tests && make %{?_smp_mflags}
 
-%files
+%files devel
 %doc LICENSE doc/*.txt
 %{_includedir}/ut*.h
 
 %changelog
+* Wed May 28 2014 Björn Esser <bjoern.esser@gmail.com> - 1.9.9-6
+- add `%%global debug_package %%{nil}` to avoid empty debuginfo-pkg.
+
+* Thu May 22 2014 Björn Esser <bjoern.esser@gmail.com> - 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 <pbrobinson@fedoraproject.org> 1.9.9-4
+- Root package should be noarch too
+
+* Wed May 21 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.9.9-3
+- Build as noarch
+
+* Sun May 18 2014 Christopher Meng <rpm@cicku.me> - 1.9.9-2
+- Move all files to -devel subpkg.
+
 * Sat Mar 29 2014 Christopher Meng <rpm@cicku.me> - 1.9.9-1
 - Update to 1.9.9