[libmygpo-qt] 1.0.5

[Rex Dieter]

commit 7049b9adb22a67c72e53ee7dc6df7b2f207fbde1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Nov 9 06:58:46 2011 -0600

    1.0.5

 libmygpo-qt-1.0.5-LIB_SUFFIX.patch |   12 ++++++++++++
 libmygpo-qt.spec                   |   21 ++++++++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)
---
diff --git a/libmygpo-qt-1.0.5-LIB_SUFFIX.patch b/libmygpo-qt-1.0.5-LIB_SUFFIX.patch
new file mode 100644
index 0000000..b62024d
--- /dev/null
+++ b/libmygpo-qt-1.0.5-LIB_SUFFIX.patch
@@ -0,0 +1,12 @@
+diff -up libmygpo-qt.1.0.5/CMakeLists.txt.LIB_SUFFIX libmygpo-qt.1.0.5/CMakeLists.txt
+--- libmygpo-qt.1.0.5/CMakeLists.txt.LIB_SUFFIX	2011-11-08 17:11:00.000000000 -0600
++++ libmygpo-qt.1.0.5/CMakeLists.txt	2011-11-09 06:51:31.760938782 -0600
+@@ -46,7 +46,7 @@ set( CPACK_DEBIAN_PACKAGE_MAINTAINER "gp
+ set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "A c++/qt library to access the APIs provided by gpodder.net." )
+ 
+ set(LIB_INSTALL_DIR_SUFFIX "" CACHE STRING "The directories where to install libraries to")
+-set(LIB_INSTALL_DIR lib${LIB_INSTALL_DIR_SUFFIX} )
++set(LIB_INSTALL_DIR lib${LIB_SUFFIX} )
+ set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/mygpo-qt" CACHE PATH "The directory the headers are installed in")
+ set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/mygpo-qt ) 
+ # SET (CMAKE_MODULES_INSTALL_DIR "${CMAKE_ROOT}/Modules" CACHE PATH "The directory to install FindLibmygpo-qt.cmake to")
diff --git a/libmygpo-qt.spec b/libmygpo-qt.spec
index c881007..bfd1404 100644
--- a/libmygpo-qt.spec
+++ b/libmygpo-qt.spec
@@ -1,7 +1,7 @@
 
 Name:    libmygpo-qt
 Summary: Qt Library that wraps the gpodder.net Web API
-Version: 1.0.4
+Version: 1.0.5
 Release: 1%{?dist}
 
 License: LGPLv2+
@@ -9,12 +9,13 @@ Url:     http://wiki.gpodder.org/wiki/Libmygpo-qt
 Source0: http://stefan.derkits.at/files/libmygpo-qt/libmygpo-qt.%{version}.tar.gz
 
 ## upstreamable patches
+Patch50: libmygpo-qt-1.0.5-LIB_SUFFIX.patch
 
-BuildRequires:  automoc4
-BuildRequires:  cmake
-BuildRequires:  doxygen
-BuildRequires:  qjson-devel
-BuildRequires:  qt4-devel
+BuildRequires: automoc4
+BuildRequires: cmake
+BuildRequires: doxygen
+BuildRequires: pkgconfig(QJson)
+BuildRequires: pkgconfig(QtNetwork) 
  
 %description
 libmygpo-qt is a Qt Library that wraps the gpodder.net Web API,
@@ -29,7 +30,9 @@ Requires: qt4-devel
 
  
 %prep
-%setup -q -n libmygpo-qt
+%setup -q -n %{name}.%{version}
+
+%patch50 -p1 -b .LIB_SUFFIX
 
 
 %build
@@ -62,9 +65,13 @@ make test -C %{_target_platform}
 %{_includedir}/mygpo-qt/
 %{_libdir}/libmygpo-qt.so
 %{_libdir}/pkgconfig/libmygpo-qt.pc
+%{_libdir}/cmake/mygpo-qt/
  
  
 %changelog
+* Wed Nov 09 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.5-1
+- 1.0.5
+
 * Wed Sep 14 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.4-1
 - 1.0.4