Merge branch 'master' into el6

Conflicts:
	uthash.spec

.gitignore

@@ -1 +1,2 @@
 /v1.9.8.tar.gz
+/uthash-1.9.9.tar.gz

sources

@@ -1 +1 @@
-5a893cda95fec662b3da838b54076507  v1.9.8.tar.gz
+c3ce9197c818dcb7ca85b59912f310a4  uthash-1.9.9.tar.gz

uthash.spec

@@ -1,14 +1,10 @@
 Name:            uthash
-Version:         1.9.8
-Release:         3%{?dist}
+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
-Patch0:          uthash-remove-failed-tests.patch
-BuildArch:       noarch
-BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root
-Provides:        %{name}-devel = %{version}-%{release}
+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
@@ -16,28 +12,35 @@ 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}
+Provides:       %{name}-static = %{version}-%{release}
+
+%description    devel
+This package contains libraries and header files for
+developing applications that use %{name}.
+
 %prep
 %setup -q
-%patch0 -p1
 
 %build
+# This is a header only package.
 
 %install
 install -d %{buildroot}%{_includedir}
-cp -pa src/*.h %{buildroot}%{_includedir}/
+install -pm0644 src/*.h %{buildroot}%{_includedir}/
 
 %check
-cd tests
-make %{?_smp_mflags}
-
-%clean
-rm -rf %{buildroot}
+cd tests && make %{?_smp_mflags}
 
 %files
 %doc LICENSE doc/*.txt
 %{_includedir}/ut*.h
 
 %changelog
+* Sat Mar 29 2014 Christopher Meng <rpm@cicku.me> - 1.9.9-1
+- Update to 1.9.9
+
 * Sat Jun 15 2013 Christopher Meng <rpm@cicku.me> - 1.9.8-3
 - Add virtual provide.
 - Remove 2 wrong tests.