[ebook-tools] 0.2.1-1

Tue Jul 10 20:03:44 UTC 2012

commit 57584cf585b989a012a14b40fa4aa820c49a49fe
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Jul 10 15:07:06 2012 -0500

    0.2.1-1
    
    - pkgconfig-style deps
    - patch to support libzip pkgconfig dirs

 .gitignore                               |    1 +
 ebook-tools-0.2.0-rmhardcoded.patch      |   11 ----
 ebook-tools-0.2.1-libzip_pkgconfig.patch |   82 ++++++++++++++++++++++++++++++
 ebook-tools-0.2.1-rmhardcoded.patch      |   10 ++++
 ebook-tools.spec                         |   25 +++++++---
 sources                                  |    2 +-
 6 files changed, 112 insertions(+), 19 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index c79591b..74ea318 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /ebook-tools-0.2.0.tar.gz
+/ebook-tools-0.2.1.tar.gz
diff --git a/ebook-tools-0.2.1-libzip_pkgconfig.patch b/ebook-tools-0.2.1-libzip_pkgconfig.patch
new file mode 100644
index 0000000..890f8d1
--- /dev/null
+++ b/ebook-tools-0.2.1-libzip_pkgconfig.patch
@@ -0,0 +1,82 @@
+diff -up ebook-tools-0.2.1/cmake/FindLibZip.cmake.libzip_pkgconfig ebook-tools-0.2.1/cmake/FindLibZip.cmake
+--- ebook-tools-0.2.1/cmake/FindLibZip.cmake.libzip_pkgconfig	2008-04-06 12:16:33.000000000 -0500
++++ ebook-tools-0.2.1/cmake/FindLibZip.cmake	2012-07-10 14:48:32.540578446 -0500
+@@ -2,35 +2,55 @@
+ # Once done this will define
+ #
+ #  LIBZIP_FOUND - system has the zip library
+-#  LIBZIP_INCLUDE_DIR - the zip include directory
+-#  LIBZIP_LIBRARY - Link this to use the zip library
++#  LIBZIP_INCLUDE_DIRS - the zip include directories
++#  LIBZIP_LIBRARIES - Link this to use the zip library
+ #
+ # Copyright (c) 2006, Pino Toscano, <toscano.pino at tiscali.it>
+ #
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+-if (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
++if (LIBZIP_LIBRARIES AND LIBZIP_INCLUDE_DIRS)
+   # in cache already
+   set(LIBZIP_FOUND TRUE)
+-else (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
++else (LIBZIP_LIBRARIES AND LIBZIP_INCLUDE_DIRS)
++
++  # use pkg-config to get the directories and then use these values
++  # in the FIND_PATH() and FIND_LIBRARY() calls
++  FIND_PACKAGE(PkgConfig QUIET)
++  PKG_CHECK_MODULES(PC_LIBZIP libzip)
+ 
+   find_path(LIBZIP_INCLUDE_DIR zip.h
++    HINTS
++    ${GNUWIN32_DIR}/include
++    ${PC_LIBZIP_INCLUDEDIR}
++    ${PC_LIBZIP_INCLUDE_DIRS}
++    PATH_SUFFIXES libzip
++  )
++
++  find_path(LIBZIP_LIB_INCLUDE_DIR zipconf.h
++    HINTS
+     ${GNUWIN32_DIR}/include
++    ${PC_LIBZIP_INCLUDEDIR}
++    ${PC_LIBZIP_INCLUDE_DIRS}
++    PATH_SUFFIXES libzip
+   )
++  set(LIBZIP_INCLUDE_DIRS ${LIBZIP_INCLUDE_DIR} ${LIBZIP_LIB_INCLUDE_DIR})
+ 
+-  find_library(LIBZIP_LIBRARY NAMES zip
+-    PATHS
++  find_library(LIBZIP_LIBRARIES NAMES zip
++    HINTS 
++    ${PC_LIBZIP_LIBDIR}
++    ${PC_LIBZIP_LIBRARY_DIRS}
+     ${GNUWIN32_DIR}/lib
+   )
+ 
+   include(FindPackageHandleStandardArgs)
+-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR)
++  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARIES LIBZIP_INCLUDE_DIRS)
+ 
+     # ensure that they are cached
+-    set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIR} CACHE INTERNAL "The libzip include path")
+-    set(LIBZIP_LIBRARY ${LIBZIP_LIBRARY} CACHE INTERNAL "The libraries needed to use libzip")
++    set(LIBZIP_INCLUDE_DIRS ${LIBZIP_INCLUDE_DIRS} CACHE INTERNAL "The libzip include paths")
++    set(LIBZIP_LIBRARIES ${LIBZIP_LIBRARIES} CACHE INTERNAL "The libraries needed to use libzip")
+ 
+-endif (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
++endif (LIBZIP_LIBRARIES AND LIBZIP_INCLUDE_DIRS)
+ 
+-mark_as_advanced(LIBZIP_INCLUDE_DIR LIBZIP_LIBRARY)
++mark_as_advanced(LIBZIP_INCLUDE_DIRS LIBZIP_LIBRARIES)
+diff -up ebook-tools-0.2.1/src/libepub/CMakeLists.txt.libzip_pkgconfig ebook-tools-0.2.1/src/libepub/CMakeLists.txt
+--- ebook-tools-0.2.1/src/libepub/CMakeLists.txt.libzip_pkgconfig	2012-07-10 14:32:58.356257360 -0500
++++ ebook-tools-0.2.1/src/libepub/CMakeLists.txt	2012-07-10 14:32:58.359257323 -0500
+@@ -1,6 +1,6 @@
+-include_directories (${EBOOK-TOOLS_SOURCE_DIR}/src/libepub ${LIBXML2_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIR})
++include_directories (${EBOOK-TOOLS_SOURCE_DIR}/src/libepub ${LIBXML2_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIRS})
+ add_library (epub SHARED epub.c ocf.c opf.c linklist.c list.c)
+-target_link_libraries (epub ${LIBZIP_LIBRARY} ${LIBXML2_LIBRARIES})
++target_link_libraries (epub ${LIBZIP_LIBRARIES} ${LIBXML2_LIBRARIES})
+ 
+ set_target_properties (epub PROPERTIES VERSION 0.2.1 SOVERSION 0)
+ 
diff --git a/ebook-tools-0.2.1-rmhardcoded.patch b/ebook-tools-0.2.1-rmhardcoded.patch
new file mode 100644
index 0000000..1e4c186
--- /dev/null
+++ b/ebook-tools-0.2.1-rmhardcoded.patch
@@ -0,0 +1,10 @@
+diff -up ebook-tools-0.2.1/src/libepub/CMakeLists.txt.rmhardcoded ebook-tools-0.2.1/src/libepub/CMakeLists.txt
+--- ebook-tools-0.2.1/src/libepub/CMakeLists.txt.rmhardcoded	2010-09-13 14:31:53.000000000 -0500
++++ ebook-tools-0.2.1/src/libepub/CMakeLists.txt	2012-07-10 14:03:37.417272126 -0500
+@@ -4,5 +4,5 @@ target_link_libraries (epub ${LIBZIP_LIB
+ 
+ set_target_properties (epub PROPERTIES VERSION 0.2.1 SOVERSION 0)
+ 
+-install ( TARGETS epub RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
++install ( TARGETS epub RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} )
+ install ( FILES epub.h epub_shared.h epub_version.h DESTINATION include )
diff --git a/ebook-tools.spec b/ebook-tools.spec
index 5afc2ed..12179ac 100644
--- a/ebook-tools.spec
+++ b/ebook-tools.spec
@@ -1,20 +1,25 @@
 Name:		ebook-tools
-Version:	0.2.0
-Release:	4%{?dist}
+Version:	0.2.1
+Release:	1%{?dist}
 Summary:	Tools for accessing and converting various ebook file formats
 
 Group:		Applications/Publishing
 License:	MIT
-URL:		http://sourceforge.net/projects/%{name}
+URL:		http://sourceforge.net/projects/ebook-tools/
 
 Source0:	http://downloads.sourceforge.net/ebook-tools/%{name}-%{version}.tar.gz
-Patch0:		ebook-tools-0.2.0-rmhardcoded.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstreamable patches
+# support lib${LIB_SUFFIX}
+Patch50:        ebook-tools-0.2.1-rmhardcoded.patch
+# support libzip pkgconfig
+Patch51:        ebook-tools-0.2.1-libzip_pkgconfig.patch
+
 BuildRequires:	cmake
-BuildRequires:	libxml2-devel
-BuildRequires:	libzip-devel
+BuildRequires:	pkgconfig(libxml-2.0)
+BuildRequires:	pkgconfig(libzip)
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -41,7 +46,8 @@ The %{name}-libs package contains libraries to be used by
 
 %prep
 %setup -q
-%patch0 -p1 -b .rmhardcoded
+%patch50 -p1 -b .rmhardcoded
+%patch51 -p1 -b .libzip_pkgconfig
 
 
 %build
@@ -81,6 +87,11 @@ rm -rf %{buildroot}
 %{_libdir}/libepub.so.0*
 
 %changelog
+* Tue Jul 10 2012 Rex Dieter <rdieter at fedoraproject.org> - 0.2.1-1
+- ebook-tools-0.2.1
+- pkgconfig-style deps
+- patch to support libzip pkgconfig dirs 
+
 * Sat Feb 04 2012 Remi Collet <remi at fedoraproject.org> - 0.2.0-4
 - rebuild for new libzip
 
diff --git a/sources b/sources
index cd2328a..5c91a13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f6bc7c3fa174f42daebbc6c2b46255fa  ebook-tools-0.2.0.tar.gz
+cabbd2ef9148a61ca5f6e60ca63e6045  ebook-tools-0.2.1.tar.gz
