[sword] Fixed invalid pkg-config file

[Greg Hellings]

commit 8184b4fae45b5f75497292d8d5bbaa1e5a8ea1cd
Author: Greg Hellings <greg.hellings at gmail.com>
Date:   Tue Dec 9 23:39:29 2014 -0600

    Fixed invalid pkg-config file

 standard_cmake_args.diff |   12 ++++++++++--
 sword.spec               |    5 ++++-
 2 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/standard_cmake_args.diff b/standard_cmake_args.diff
index 215f4d5..41c892a 100644
--- a/standard_cmake_args.diff
+++ b/standard_cmake_args.diff
@@ -18,7 +18,7 @@ index 785e14b..d945a2a 100644
  
  ###############################################################################################
 diff --git a/cmake/install.cmake b/cmake/install.cmake
-index fd79545..f71f6a0 100644
+index fd79545..6c0b2c1 100644
 --- a/cmake/install.cmake
 +++ b/cmake/install.cmake
 @@ -3,34 +3,39 @@
@@ -71,7 +71,15 @@ index fd79545..f71f6a0 100644
  
  SET(VERSION		${SWORD_VERSION})
  IF(WITH_CURL)
-@@ -53,4 +58,4 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/sword.pc.in ${CMAKE_CURRENT_BINARY_DI
+@@ -49,8 +54,12 @@ ELSE(LIBSWORD_LIBRARY_TYPE STREQUAL "Static")
+ 	SET(SHAREDLIB_FALSE "#")
+ ENDIF(LIBSWORD_LIBRARY_TYPE STREQUAL "Static")
+ # The @ONLY restricts it because our ${variable} which are left there as part of pkg-config
++SET(prefix ${CMAKE_INSTALL_PREFIX})
++SET(libdir ${LIB_INSTALL_DIR})
++SET(exec_prefix ${BINDIR})
++SET(includedir ${INCLUDE_INSTALL_DIR})
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/sword.pc.in ${CMAKE_CURRENT_BINARY_DIR}/sword.pc @ONLY)
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/swversion.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/swversion.h @ONLY)
  
  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/sword.pc
diff --git a/sword.spec b/sword.spec
index 227be86..506a22a 100644
--- a/sword.spec
+++ b/sword.spec
@@ -2,7 +2,7 @@
 
 Name:           sword           
 Version:        1.7.3.900
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Free Bible Software Project
 License:        GPLv2
 URL:            http://www.crosswire.org/sword/
@@ -133,6 +133,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{python2_sitearch}/sword-%{version}-py2.7.egg-info
 
 %changelog
+* Tue Dec 09 2014 Greg Hellings <greg.hellings at gmail.com> - 1.7.3.900-3
+- Fixed invalid pkg-config
+
 * Mon Dec 08 2014 Greg Hellings <greg.hellings at gmail.com> - 1.7.3.900-2
 - Changed to CMake
 - Added Python bindings