[libclaw] 1.7.0

[Tom Callaway]

commit 1165fb5120b369b624e6e0ca86012d6e916d359b
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Thu Aug 25 16:57:50 2011 -0400

    1.7.0

 .gitignore                 |    1 +
 libclaw-1.7.0-gcc46.patch  |   11 +++++++++++
 libclaw-1.7.0-libdir.patch |   12 ++++++++++++
 libclaw.spec               |   29 +++++++----------------------
 sources                    |    2 +-
 5 files changed, 32 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f05b5f5..a04530f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 libclaw-1.5.4.tar.gz
+/libclaw-1.7.0.tar.gz
diff --git a/libclaw-1.7.0-gcc46.patch b/libclaw-1.7.0-gcc46.patch
new file mode 100644
index 0000000..dcd8649
--- /dev/null
+++ b/libclaw-1.7.0-gcc46.patch
@@ -0,0 +1,11 @@
+diff -up libclaw-1.7.0/claw/graph.hpp.gcc46 libclaw-1.7.0/claw/graph.hpp
+--- libclaw-1.7.0/claw/graph.hpp.gcc46	2011-06-12 06:01:53.000000000 -0400
++++ libclaw-1.7.0/claw/graph.hpp	2011-08-25 15:56:48.671035660 -0400
+@@ -38,6 +38,7 @@
+ #include <exception>
+ #include <iterator>
+ #include <utility>
++#include <cstddef>
+ 
+ namespace claw
+ {
diff --git a/libclaw-1.7.0-libdir.patch b/libclaw-1.7.0-libdir.patch
new file mode 100644
index 0000000..ea83b91
--- /dev/null
+++ b/libclaw-1.7.0-libdir.patch
@@ -0,0 +1,12 @@
+diff -up libclaw-1.7.0/CMakeLists.txt.libdir libclaw-1.7.0/CMakeLists.txt
+--- libclaw-1.7.0/CMakeLists.txt.libdir	2011-08-25 15:55:29.000000000 -0400
++++ libclaw-1.7.0/CMakeLists.txt	2011-08-25 15:56:17.300436660 -0400
+@@ -30,7 +30,7 @@ endif(SVN_ENTRIES)
+ set( CLAW_CODE_DIR claw/code/ )
+ set( CLAW_INCLUDE_DIRECTORY "${CMAKE_INSTALL_PREFIX}/include/" )
+ set( CLAW_INSTALLDIR_SOURCE include/claw/ )
+-set( CLAW_INSTALLDIR_LIB lib/ )
++set( CLAW_INSTALLDIR_LIB "${CMAKE_INSTALL_LIBDIR}/" )
+ set( CLAW_INSTALLDIR_DOC share/doc/libclaw${CLAW_VERSION_MAJOR}/ )
+ set( CLAW_TRANSLATIONS_INSTALL_DIR "share/locale" )
+ set( CLAW_EXECUTABLE_DIR bin/ )
diff --git a/libclaw.spec b/libclaw.spec
index e3fde2b..1dd0a3c 100644
--- a/libclaw.spec
+++ b/libclaw.spec
@@ -1,18 +1,14 @@
 Name:           libclaw
-Version:        1.6.1
+Version:        1.7.0
 Release:        1%{?dist}
 Summary:        C++ Library of various utility functions
-
 Group:          System Environment/Libraries
 License:        LGPLv2
 URL:            http://libclaw.sourceforge.net/
 Source0:        http://dl.sourceforge.net/project/%{name}/%{version}/%{name}-%{version}.tar.gz
 Patch0:         libclaw-1.6.1-nostrip.patch
-Patch1:         libclaw-1.6.1-libdir.patch
-Patch5:         libclaw-1.5.4-gcc46.patch
-
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
+Patch1:         libclaw-1.7.0-libdir.patch
+Patch5:         libclaw-1.7.0-gcc46.patch
 BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel
 BuildRequires:  cmake
@@ -24,7 +20,6 @@ Claw (C++ Library Absolutely Wonderful) is a C++ library of various utility
 functions. In doesn't have a particular objective but being useful to
 anyone.
 
-
 %package devel
 Summary:        Development files for Claw library
 Group:          Development/Libraries
@@ -35,14 +30,12 @@ Requires:       cmake
 This package contains files needed to develop and build software against
 Claw (C++ Library Absolutely Wonderful).
 
-
 %prep
 %setup -q
 %patch0 -p1 -b .nostrip
 %patch1 -p1 -b .libdir
 %patch5 -p1 -b .gcc46
 
-
 %build
 %cmake .
 make %{?_smp_mflags} VERBOSE=1
@@ -54,40 +47,32 @@ do
         mv .utf8 $F
 done
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT VERBOSE=1
 
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %{_libdir}/*.so.*
 %doc %dir %{_datadir}/doc/libclaw1
 %doc %{_datadir}/doc/libclaw1/COPYING
 
-
 %files devel
-%defattr(-,root,root,-)
 %{_bindir}/claw-config
+%{_datadir}/cmake/libclaw/libclaw-config.cmake
 %{_includedir}/claw
 %{_libdir}/*.so
 %exclude %{_libdir}/*.a
-%{_datadir}/cmake/Modules/FindCLAW.cmake
 %doc %{_datadir}/doc/libclaw1
 %doc examples
 
-
 %changelog
+* Thu Aug 25 2011 Tom Callaway <spot at fedoraproject.org> - 1.7.0-1
+- update to 1.7.0
+
 * Mon Apr 18 2011 Tom Callaway <spot at fedoraproject.org> - 1.6.1-1
 - update to 1.6.1
 
diff --git a/sources b/sources
index 815d1ec..38b4ac3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90d4c8c834aa1e3fb5f2b24cdcfc0e07  libclaw-1.6.1.tar.gz
+a8b1ad1887484d39263243755b64b28e  libclaw-1.7.0.tar.gz