[libclaw] Rebase

[Lubomir Rintel]

commit 236f8dab9bf45774bd83dd2bc39de20d076da752
Author: Lubomir Rintel <lubo.rintel at gooddata.com>
Date:   Sun Aug 18 17:36:15 2013 +0200

    Rebase
    
    - Fix FTBFS

 .gitignore                  |    1 +
 libclaw-1.5.4-gcc46.patch   |   50 -------------------------------------------
 libclaw-1.5.4-libdir.patch  |   17 --------------
 libclaw-1.5.4-nostrip.patch |   27 -----------------------
 libclaw-1.5.4-svn172.patch  |   12 ----------
 libclaw-1.5.4-svn194.patch  |   21 ------------------
 libclaw-1.5.4-svn195.patch  |   21 ------------------
 libclaw-1.6.1-libdir.patch  |   17 --------------
 libclaw-1.7.0-libdir.patch  |   12 ----------
 libclaw-1.7.4-libdir.patch  |   25 +++++++++++++++++++++
 libclaw.spec                |   15 +++++++------
 sources                     |    2 +-
 12 files changed, 35 insertions(+), 185 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a04530f..e9fa289 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 libclaw-1.5.4.tar.gz
 /libclaw-1.7.0.tar.gz
+/libclaw-1.7.4.tar.gz
diff --git a/libclaw-1.7.4-libdir.patch b/libclaw-1.7.4-libdir.patch
new file mode 100644
index 0000000..65f9b1a
--- /dev/null
+++ b/libclaw-1.7.4-libdir.patch
@@ -0,0 +1,25 @@
+From 74926a5c21ec48290311f8cfa252d262348ecba9 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak at v3.sk>
+Date: Sun, 18 Aug 2013 17:29:42 +0200
+Subject: [PATCH] Fix library path
+
+---
+ CMakeLists.txt |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6e59482..0d6023e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -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 "lib${LIB_SUFFIX}/" )
+ set( CLAW_INSTALLDIR_DOC share/doc/libclaw${CLAW_VERSION_MAJOR}/ )
+ set( CLAW_TRANSLATIONS_INSTALL_DIR "share/locale" )
+ set( CLAW_EXECUTABLE_DIR bin/ )
+-- 
+1.7.1
+
diff --git a/libclaw.spec b/libclaw.spec
index 83d2b2e..1837d31 100644
--- a/libclaw.spec
+++ b/libclaw.spec
@@ -1,13 +1,13 @@
 Name:           libclaw
-Version:        1.7.0
-Release:        10%{?dist}
+Version:        1.7.4
+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.7.0-libdir.patch
+Patch1:         libclaw-1.7.4-libdir.patch
 Patch5:         libclaw-1.7.0-gcc46.patch
 Patch6:		libclaw-1.7.0-zlib-fix.patch
 BuildRequires:  libjpeg-devel
@@ -37,8 +37,6 @@ Claw (C++ Library Absolutely Wonderful).
 %setup -q
 %patch0 -p1 -b .nostrip
 %patch1 -p1 -b .libdir
-%patch5 -p1 -b .gcc46
-%patch6 -p1 -b .zlibfix
 
 %build
 %cmake .
@@ -66,7 +64,7 @@ make install DESTDIR=$RPM_BUILD_ROOT VERBOSE=1
 
 %files devel
 %{_bindir}/claw-config
-%{_datadir}/cmake/libclaw/libclaw-config.cmake
+%{_datadir}/cmake/%{name}
 %{_includedir}/claw
 %{_libdir}/*.so
 %exclude %{_libdir}/*.a
@@ -74,6 +72,10 @@ make install DESTDIR=$RPM_BUILD_ROOT VERBOSE=1
 %doc examples
 
 %changelog
+* Sun Aug 18 2013 Lubomir Rintel <lkundrak at v3.sk> - 1.7.4-1
+- Rebase
+- Fix FTBFS
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -131,6 +133,5 @@ make install DESTDIR=$RPM_BUILD_ROOT VERBOSE=1
 - Fix examples encoding
 - Let -devel require cmake
 
-
 * Fri Sep 18 2009 Lubomir Rintel <lkundrak at v3.sk> - 1.5.4-1
 - Initial packaging
diff --git a/sources b/sources
index 38b4ac3..accd20c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a8b1ad1887484d39263243755b64b28e  libclaw-1.7.0.tar.gz
+f27ed8936420abb8835d59f35a4101d9  libclaw-1.7.4.tar.gz