- added findlibzip.patch (libzip was not detected on x32)

- rel 2

diff --git a/ebook-tools.spec b/ebook-tools.spec
index 832b60ee744e64b89b8e06bce027e96051cc5fc9..cf178610fd8beba40f653dc46ba4e3ae189276de 100644 (file)
--- a/ebook-tools.spec
+++ b/ebook-tools.spec
@@ -2,11 +2,12 @@ Summary:      Tools for accessing and converting ebook file formats
 Summary(pl.UTF-8):     Narzędzia do odczytu i konwersji formatów plików ebooków
 Name:          ebook-tools
 Version:       0.2.2
-Release:       1
+Release:       2
 License:       MIT
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/ebook-tools/%{name}-%{version}.tar.gz
 # Source0-md5: 67bce67ceb72dcc3578d6a81ef92b29b
+Patch0:                findlibzip.patch
 URL:           http://ebook-tools.sourceforge.net/
 BuildRequires: cmake >= 2.4.0
 BuildRequires: libxml2-devel
@@ -37,6 +38,7 @@ ebook-tools.
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 install -d build

diff --git a/findlibzip.patch b/findlibzip.patch
new file mode 100644 (file)
index 0000000..07ef5df
--- /dev/null
+++ b/findlibzip.patch
@@ -0,0 +1,30 @@
+--- ebook-tools-0.2.2/cmake/FindLibZip.cmake.orig      2015-03-09 17:37:02.000000000 +0000
++++ ebook-tools-0.2.2/cmake/FindLibZip.cmake   2015-03-09 17:48:51.000000000 +0000
+@@ -15,9 +15,11 @@ if (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DI
+   set(LIBZIP_FOUND TRUE)
+ else (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
+ 
+-  find_path(LIBZIP_INCLUDE_DIR zip.h
+-    ${GNUWIN32_DIR}/include
+-  )
++  pkg_check_modules(LIBZIP REQUIRED libzip)
++
++#  find_path(LIBZIP_INCLUDE_DIR zip.h
++#    ${GNUWIN32_DIR}/include
++# )
+ 
+   find_library(LIBZIP_LIBRARY NAMES zip
+     PATHS
+@@ -25,10 +27,10 @@ else (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_
+   )
+ 
+   include(FindPackageHandleStandardArgs)
+-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR)
++  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIRS)
+ 
+     # ensure that they are cached
+-    set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIR} CACHE INTERNAL "The libzip include path")
++    set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIRS} CACHE INTERNAL "The libzip include path")
+     set(LIBZIP_LIBRARY ${LIBZIP_LIBRARY} CACHE INTERNAL "The libraries needed to use libzip")
+ 
+ endif (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)