[ucommon] Change to using cmake in rpm build

[David Sugar]

commit dcf22d048714e2dd4d5567c08c8ac7bbd3153148
Author: David Sugar <dyfet at gnutelephony.org>
Date:   Sat May 3 06:42:16 2014 -0400

    Change to using cmake in rpm build
    
    - Upstream fixes for specific memory corruption issues

 .gitignore   |    1 +
 sources      |    2 +-
 ucommon.spec |   49 ++++++++++++++++++++++++++++---------------------
 3 files changed, 30 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3b7c9fc..ce8af4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@ ucommon-3.3.4.tar.gz
 /ucommon-6.0.7.tar.gz
 /ucommon-6.1.0.tar.gz
 /ucommon-6.1.1.tar.gz
+/ucommon-6.1.3.tar.gz
diff --git a/sources b/sources
index 5c06410..9fad85f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48afcf19ae4ea4877af9ebe00490a4c0  ucommon-6.1.1.tar.gz
+07b0ac6aa23b18e25616dc724ce7bf4c  ucommon-6.1.3.tar.gz
diff --git a/ucommon.spec b/ucommon.spec
index 6b5365d..ca3fcc5 100644
--- a/ucommon.spec
+++ b/ucommon.spec
@@ -10,20 +10,19 @@
 
 Name: ucommon
 Summary: Portable C++ framework for threads and sockets
-Version: 6.1.1
+Version: 6.1.3
 Release: 1%{?dist}
 License: LGPLv3+
 URL: http://www.gnu.org/software/commoncpp
 Source0: http://dev.gnutelephony.org/dist/tarballs/ucommon-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: doxygen graphviz-gd openssl-devel
+BuildRequires: doxygen graphviz-gd openssl-devel cmake
 Group: System Environment/Libraries
-Summary: Runtime library for portable C++ threading and sockets
+Summary: Library for portable C++ threading and sockets
 
 %description
 GNU uCommon C++ is a lightweight library to facilitate using C++ design
 patterns even for very deeply embedded applications, such as for systems using
-uClibc along with POSIX threading support. For this reason, uCommon disables
+uclibc along with POSIX threading support. For this reason, uCommon disables
 language features that consume memory or introduce runtime overhead. UCommon
 introduces some design patterns from Objective-C, such as reference counted
 objects, memory pools, and smart pointers. UCommon introduces some new concepts
@@ -31,21 +30,20 @@ for handling of thread locking and synchronization.  Starting with release
 5.0, GNU uCommon also bundles GNU Common C++ libraries.
 
 %package bin
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
 Group: Applications/System
-Summary: ucommon system and support applications
+Summary: GNU uCommon system and support applications
 
 %package devel
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-bin = %{version}-%{release}
-Requires: openssl-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: openssl-devel%{?_isa}
 Requires: pkgconfig
 Group: Development/Libraries
-Summary: Headers for building uCommon applications
+Summary: Headers for building GNU uCommon applications
 
 %package doc
 Group: Documentation
-Summary: Generated class documentation for uCommon
+Summary: Generated class documentation for GNU uCommon
 
 %description bin
 This is a collection of command line tools that use various aspects of the
@@ -57,27 +55,32 @@ This package provides header and support files needed for building
 applications that use the uCommon and commoncpp libraries.
 
 %description doc
-Generated class documentation for GNU uCommon library from header files,
-html browsable.
+Generated class documentation for GNU uCommon library from header files in
+HTML format.
 
 %prep
 %setup -q
+
 %build
+%cmake \
+      -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+      -DSYSCONFDIR=%{_sysconfdir} \
+      -DINSTALL_MANDIR=%{_mandir} \
+      -DINSTALL_INCLUDEDIR=%{_includedir} \
+      -DINSTALL_BINDIR=%{_bindir} \
+      -DINSTALL_SBINDIR=%{_sbindir} \
+      -DINSTALL_LIBEXEC=%{_libexecdir} \
+      -DINSTALL_LIBDIR=%{_libdir} \
+      .
 
-%configure --disable-static
 %{__make} %{?_smp_mflags}
 %{__rm} -rf doc/html
-%{__make} doxy
+%{__make} doc
 
 %install
-%{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} INSTALL="install -p" install
 %{__chmod} 0755 %{buildroot}%{_bindir}/ucommon-config
 %{__chmod} 0755 %{buildroot}%{_bindir}/commoncpp-config
-%{__rm} %{buildroot}%{_libdir}/*.la
-
-%clean
-%{__rm} -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -125,6 +128,10 @@ html browsable.
 %postun -p /sbin/ldconfig
 
 %changelog
+* Sat May 03 2014 David Sugar <dyfet at gnutelephony.org> - 6.1.3-1
+- Change to using cmake in rpm build
+- Upstream fixes for specific memory corruption issues
+
 * Mon Apr 14 2014 David Sugar <dyfet at gnutelephony.org> - 6.1.1-1
 - Greater commoncpp compatibility