[libclaw] 1.6.1

[Tom Callaway]

commit 7fd08844f7451f57fd7e16519b5ed11d4655c9b2
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Mon Apr 18 15:06:44 2011 -0400

    1.6.1

 libclaw-1.6.1-libdir.patch  |   17 +++++++++++++++++
 libclaw-1.6.1-nostrip.patch |   23 +++++++++++++++++++++++
 libclaw.spec                |   28 ++++++++++------------------
 sources                     |    2 +-
 4 files changed, 51 insertions(+), 19 deletions(-)
---
diff --git a/libclaw-1.6.1-libdir.patch b/libclaw-1.6.1-libdir.patch
new file mode 100644
index 0000000..250b044
--- /dev/null
+++ b/libclaw-1.6.1-libdir.patch
@@ -0,0 +1,17 @@
+From Xavier Bachelot 2009-09-29 19:17:34 EDT
+patch fixing the lib dir issue
+
+https://bugzilla.redhat.com/show_bug.cgi?id=524238#c3
+
+diff -up libclaw-1.6.1/CMakeLists.txt.libdir libclaw-1.6.1/CMakeLists.txt
+--- libclaw-1.6.1/CMakeLists.txt.libdir	2011-04-18 11:48:46.236546081 -0400
++++ libclaw-1.6.1/CMakeLists.txt	2011-04-18 11:48:52.723466185 -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_EXECUTABLE_DIR bin/ )
+ 
diff --git a/libclaw-1.6.1-nostrip.patch b/libclaw-1.6.1-nostrip.patch
new file mode 100644
index 0000000..18277eb
--- /dev/null
+++ b/libclaw-1.6.1-nostrip.patch
@@ -0,0 +1,23 @@
+From 23fba075de84b2168677475cddd0f393073a3ab4 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Fri, 18 Sep 2009 15:32:32 +0200
+Subject: [PATCH] Do not strip libraries when linking them
+
+We do that after we construct -debuginfo package from the debugging
+symbols when building the RPM package.
+---
+ CMakeLists.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff -up libclaw-1.6.1/CMakeLists.txt.nostrip libclaw-1.6.1/CMakeLists.txt
+--- libclaw-1.6.1/CMakeLists.txt.nostrip	2011-04-18 11:46:48.552994197 -0400
++++ libclaw-1.6.1/CMakeLists.txt	2011-04-18 11:46:56.459896983 -0400
+@@ -192,7 +192,7 @@ target_link_libraries(claw_graphic ${CLA
+ # extra flags for the link
+ set_target_properties(
+  ${CLAW_LIBRARIES}
+- PROPERTIES LINK_FLAGS "-s -Wl,--as-needed" )
++ PROPERTIES LINK_FLAGS "-Wl,--as-needed" )
+ 
+ # all libraries
+ set( CLAW_ALL_LIBRARIES ${CLAW_LIBRARIES} ${CLAW_GRAPHIC_LIBRARIES})
diff --git a/libclaw.spec b/libclaw.spec
index 636ec26..f82ba79 100644
--- a/libclaw.spec
+++ b/libclaw.spec
@@ -1,24 +1,14 @@
 Name:           libclaw
-Version:        1.5.4
-Release:        7%{?dist}
+Version:        1.6.1
+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.5.4-nostrip.patch
-Patch1:         libclaw-1.5.4-libdir.patch
-# Fix wrong return type of 'claw::log_system::operator<<'
-# SVN172
-# http://libclaw.svn.sourceforge.net/viewvc/libclaw?view=revision&revision=172
-Patch2:         libclaw-1.5.4-svn172.patch
-# Fix incorrect return type in basic_socket.
-# SVN194, 195
-# http://libclaw.svn.sourceforge.net/viewvc/libclaw?view=revision&revision=194
-# http://libclaw.svn.sourceforge.net/viewvc/libclaw?view=revision&revision=195
-Patch3:         libclaw-1.5.4-svn194.patch
-Patch4:         libclaw-1.5.4-svn195.patch
+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)
@@ -49,9 +39,6 @@ Claw (C++ Library Absolutely Wonderful).
 %setup -q
 %patch0 -p1 -b .nostrip
 %patch1 -p1 -b .libdir
-%patch2 -p1 -b .svn172
-%patch3 -p1 -b .svn194
-%patch4 -p1 -b .svn195
 %patch5 -p1 -b .gcc46
 
 
@@ -71,6 +58,8 @@ done
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT VERBOSE=1
 
+%find_lang %{name}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -79,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_libdir}/*.so.*
 %doc %dir %{_datadir}/doc/libclaw1
@@ -98,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 18 2011 Tom Callaway <spot at fedoraproject.org> - 1.6.1-1
+- update to 1.6.1
+
 * Fri Feb 11 2011 Lubomir Rintel <lkundrak at v3.sk> - 1.5.4-7
 - Fix Rawhide build
 
diff --git a/sources b/sources
index 194422e..815d1ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5e9902c85e6ba7213ce4bde75574b7b  libclaw-1.5.4.tar.gz
+90d4c8c834aa1e3fb5f2b24cdcfc0e07  libclaw-1.6.1.tar.gz