Hello community,
here is the log from the commit of package ebook-tools for openSUSE:13.1 checked in at 2013-10-17 15:16:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/ebook-tools (Old)
and /work/SRC/openSUSE:13.1/.ebook-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ebook-tools"
Changes:
--------
--- /work/SRC/openSUSE:13.1/ebook-tools/ebook-tools.changes 2013-09-23 10:50:14.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.ebook-tools.new/ebook-tools.changes 2013-10-19 16:48:30.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Oct 12 22:13:18 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Update to 0.2.2 (bnc#845629, kde#325909)
+ * Bugfix release, no upstream changelog provided
+
+-------------------------------------------------------------------
Old:
----
ebook-tools-0.2.1.tar.gz
New:
----
ebook-tools-0.2.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ebook-tools.spec ++++++
--- /var/tmp/diff_new_pack.d9KVDd/_old 2013-10-19 16:48:30.000000000 +0200
+++ /var/tmp/diff_new_pack.d9KVDd/_new 2013-10-19 16:48:30.000000000 +0200
@@ -20,8 +20,8 @@
Summary: A library for reading ebook files
License: MIT
Group: Development/Libraries/C and C++
-Version: 0.2.1
-Release: 0
+Version: 0.2.2
+Release: 25
Url: http://sourceforge.net/projects/ebook-tools
BuildRequires: cmake
BuildRequires: gcc-c++
++++++ ebook-tools-0.2.1.tar.gz -> ebook-tools-0.2.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/CMakeLists.txt new/ebook-tools-0.2.2/CMakeLists.txt
--- old/ebook-tools-0.2.1/CMakeLists.txt 2010-02-28 18:09:46.000000000 +0100
+++ new/ebook-tools-0.2.2/CMakeLists.txt 2012-09-04 16:32:32.000000000 +0200
@@ -8,6 +8,8 @@
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+set(LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)")
+
find_package(LibXml2 REQUIRED)
find_package(LibZip REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/debian/changelog new/ebook-tools-0.2.2/debian/changelog
--- old/ebook-tools-0.2.1/debian/changelog 1970-01-01 01:00:00.000000000 +0100
+++ new/ebook-tools-0.2.2/debian/changelog 2012-09-04 16:32:32.000000000 +0200
@@ -0,0 +1,6 @@
+ebook-tools (0.1.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #475513)
+
+ -- Pino Toscano Sun, 06 Apr 2008 17:23:13 +0200
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/debian/compat new/ebook-tools-0.2.2/debian/compat
--- old/ebook-tools-0.2.1/debian/compat 1970-01-01 01:00:00.000000000 +0100
+++ new/ebook-tools-0.2.2/debian/compat 2012-09-04 16:32:32.000000000 +0200
@@ -0,0 +1 @@
+5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/debian/control new/ebook-tools-0.2.2/debian/control
--- old/ebook-tools-0.2.1/debian/control 1970-01-01 01:00:00.000000000 +0100
+++ new/ebook-tools-0.2.2/debian/control 2012-09-04 16:32:32.000000000 +0200
@@ -0,0 +1,62 @@
+Source: ebook-tools
+Priority: optional
+Maintainer: Pino Toscano
+Build-Depends: debhelper (>= 5), cmake (>= 2.4.0), cdbs (>= 0.4.51),
+ libxml2-dev, libzip-dev
+Standards-Version: 3.7.3
+Section: libs
+
+Package: libepub-dev
+Section: libdevel
+Architecture: any
+Depends: libepub0 (= ${binary:Version})
+Description: library and tools to work with the EPub file format
+ The ebook-tools provide ways for accessing and converting different
+ ebook file formats.
+ .
+ This C library is free and portable. It includes methods to parse
+ EPub files and extract their contents.
+ .
+ This package includes development headers and libraries.
+
+Package: libepub0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: library and tools to work with the EPub file format
+ The ebook-tools provide ways for accessing and converting different
+ ebook file formats.
+ .
+ This C library is free and portable. It includes methods to parse
+ EPub files and extract their contents.
+
+Package: ebook-tools-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends: libc6-dbg, libepub0 (= ${binary:Version})
+Description: library and tools to work with the EPub file format
+ The ebook-tools provide ways for accessing and converting different
+ ebook file formats.
+ .
+ This C library is free and portable. It includes methods to parse
+ EPub files and extract their contents.
+ .
+ This package includes the debug symbols for the library.
+
+Package: epub-utils
+Section: graphics
+Architecture: any
+Depends: libc6, libepub0 (= ${binary:Version})
+Suggests: clit, zip
+Description: library and tools to work with the EPub file format
+ The ebook-tools provide ways for accessing and converting different
+ ebook file formats.
+ .
+ This C library is free and portable. It includes methods to parse
+ EPub files and extract their contents.
+ .
+ This package contains the following utilities:
+ - einfo : provides some basic info about an EPub document,
+ such as metadata, reading order, etc.
+ - lit2epub : converts a LIT file to EPub (using clit).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/debian/copyright new/ebook-tools-0.2.2/debian/copyright
--- old/ebook-tools-0.2.1/debian/copyright 1970-01-01 01:00:00.000000000 +0100
+++ new/ebook-tools-0.2.2/debian/copyright 2012-09-04 16:32:32.000000000 +0200
@@ -0,0 +1,36 @@
+This package was debianized by Pino Toscano on
+Sun, 06 Apr 2008 17:23:13 +0200.
+
+It was downloaded from
+http://sourceforge.net/projects/ebook-tools
+
+Upstream Author:
+
+ Ely Levy
+
+Copyright (c) 2008 Ely Levy
+
+License:
+
+ The ebook-tools are licensed under the terms of the MIT license:
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+The Debian packaging is (C) 2008, Pino Toscano and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/debian/epub-utils.install new/ebook-tools-0.2.2/debian/epub-utils.install
--- old/ebook-tools-0.2.1/debian/epub-utils.install 1970-01-01 01:00:00.000000000 +0100
+++ new/ebook-tools-0.2.2/debian/epub-utils.install 2012-09-04 16:32:32.000000000 +0200
@@ -0,0 +1 @@
+usr/bin/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/debian/libepub-dev.install new/ebook-tools-0.2.2/debian/libepub-dev.install
--- old/ebook-tools-0.2.1/debian/libepub-dev.install 1970-01-01 01:00:00.000000000 +0100
+++ new/ebook-tools-0.2.2/debian/libepub-dev.install 2012-09-04 16:32:32.000000000 +0200
@@ -0,0 +1,2 @@
+usr/include/*
+usr/lib/lib*.so
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/debian/libepub0.install new/ebook-tools-0.2.2/debian/libepub0.install
--- old/ebook-tools-0.2.1/debian/libepub0.install 1970-01-01 01:00:00.000000000 +0100
+++ new/ebook-tools-0.2.2/debian/libepub0.install 2012-09-04 16:32:32.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/lib*.so.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/debian/rules new/ebook-tools-0.2.2/debian/rules
--- old/ebook-tools-0.2.1/debian/rules 1970-01-01 01:00:00.000000000 +0100
+++ new/ebook-tools-0.2.2/debian/rules 2012-09-04 16:32:32.000000000 +0200
@@ -0,0 +1,10 @@
+#!/usr/bin/make -f
+
+#export DH_VERBOSE=1
+
+DEB_DH_INSTALL_SOURCEDIR = debian/tmp
+DEB_DH_STRIP_ARGS = --dbg-package=libepub0
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/utils.mk
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/debian/watch new/ebook-tools-0.2.2/debian/watch
--- old/ebook-tools-0.2.1/debian/watch 1970-01-01 01:00:00.000000000 +0100
+++ new/ebook-tools-0.2.2/debian/watch 2012-09-04 16:32:32.000000000 +0200
@@ -0,0 +1,6 @@
+# Compulsory line, this is a version 3 file
+version=3
+
+# find new files on sourceforge, for devscripts >= 2.9
+http://sf.net/ebook-tools/ebook-tools-(.*)\.tar\.gz
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/src/libepub/CMakeLists.txt new/ebook-tools-0.2.2/src/libepub/CMakeLists.txt
--- old/ebook-tools-0.2.1/src/libepub/CMakeLists.txt 2010-09-13 21:31:53.000000000 +0200
+++ new/ebook-tools-0.2.2/src/libepub/CMakeLists.txt 2012-09-04 16:32:32.000000000 +0200
@@ -4,5 +4,5 @@
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/src/libepub/epub.c new/ebook-tools-0.2.2/src/libepub/epub.c
--- old/ebook-tools-0.2.1/src/libepub/epub.c 2010-08-30 22:54:51.000000000 +0200
+++ new/ebook-tools-0.2.2/src/libepub/epub.c 2012-09-04 16:32:32.000000000 +0200
@@ -11,7 +11,6 @@
struct epub *epub = malloc(sizeof(struct epub));
if (! epub) {
- _epub_err_set_oom(&epub->error);
return NULL;
}
epub->ocf = NULL;
@@ -35,7 +34,7 @@
}
epub->ocf->datapath = malloc(sizeof(char) *(strlen(opfName) +1));
- pathsep_index = strrchr(opfName, PATH_SEPARATOR);
+ pathsep_index = strrchr(opfName, '/'); // '/' is per OCF specs
if (pathsep_index) {
strncpy(epub->ocf->datapath, opfName, pathsep_index + 1 - opfName);
epub->ocf->datapath[pathsep_index - opfName + 1] = 0;
@@ -589,6 +588,10 @@
return NULL;
}
+ if (!tit->cache.link) {
+ return NULL;
+ }
+
return strdup(tit->cache.link);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/src/libepub/ocf.c new/ebook-tools-0.2.2/src/libepub/ocf.c
--- old/ebook-tools-0.2.1/src/libepub/ocf.c 2010-08-30 22:54:51.000000000 +0200
+++ new/ebook-tools-0.2.2/src/libepub/ocf.c 2012-09-04 16:32:32.000000000 +0200
@@ -21,17 +21,16 @@
}
int _ocf_parse_container(struct ocf *ocf) {
+ char *containerXml = NULL;
+ const char *name = CONTAINER_FILENAME;
+ xmlTextReaderPtr reader;
+ int ret;
_epub_print_debug(ocf->epub, DEBUG_INFO, "parsing container file %s",
METAINFO_DIR "/" CONTAINER_FILENAME);
- char *containerXml = NULL;
- const char *name = CONTAINER_FILENAME;
- if (! _ocf_get_file(ocf, METAINFO_DIR "/" CONTAINER_FILENAME, &containerXml))
+ if (_ocf_get_file(ocf, METAINFO_DIR "/" CONTAINER_FILENAME, &containerXml) == -1)
return 0;
-
- xmlTextReaderPtr reader;
- int ret;
reader = xmlReaderForMemory(containerXml, strlen(containerXml),
name, NULL, 0);
@@ -148,6 +147,8 @@
struct zip_file *file = NULL;
struct zip_stat fileStat;
+ int size;
+
zip_stat_init(&fileStat);
*fileStr = NULL;
@@ -169,7 +170,6 @@
return -1;
}
- int size;
if ((size = zip_fread(file, *fileStr, fileStat.size)) == -1) {
_epub_print_debug(epub, DEBUG_INFO, "%s - %s",
filename, zip_strerror(arch));
@@ -201,9 +201,11 @@
}
struct ocf *_ocf_parse(struct epub *epub, const char *filename) {
+ struct ocf *ocf;
+
_epub_print_debug(epub, DEBUG_INFO, "building ocf struct");
- struct ocf *ocf = malloc(sizeof(struct ocf));
+ ocf = malloc(sizeof(struct ocf));
if (!ocf) {
_epub_err_set_oom(&epub->error);
return NULL;
@@ -247,11 +249,13 @@
int _ocf_get_data_file(struct ocf *ocf, const char *filename, char **fileStr) {
int size;
+ char *fullname;
+
if (! filename) {
return -1;
}
- char *fullname = malloc((strlen(filename)+strlen(ocf->datapath)+1)*sizeof(char));
+ fullname = malloc((strlen(filename)+strlen(ocf->datapath)+1)*sizeof(char));
if (!fullname) {
_epub_print_debug(ocf->epub, DEBUG_ERROR, "Failed to allocate memory for file name");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ebook-tools-0.2.1/src/libepub/opf.c new/ebook-tools-0.2.2/src/libepub/opf.c
--- old/ebook-tools-0.2.1/src/libepub/opf.c 2010-03-01 01:17:52.000000000 +0100
+++ new/ebook-tools-0.2.2/src/libepub/opf.c 2012-09-04 16:32:32.000000000 +0200
@@ -1,18 +1,19 @@
#include "epublib.h"
struct opf *_opf_parse(struct epub *epub, char *opfStr) {
+ struct opf *opf;
+ xmlTextReaderPtr reader;
+ int ret;
+
_epub_print_debug(epub, DEBUG_INFO, "building opf struct");
- struct opf *opf = malloc(sizeof(struct opf));
+ opf = malloc(sizeof(struct opf));
if (!opf) {
_epub_err_set_oom(&epub->error);
return NULL;
}
memset(opf, 0, sizeof(struct opf));
opf->epub = epub;
-
- xmlTextReaderPtr reader;
- int ret;
reader = xmlReaderForMemory(opfStr, strlen(opfStr),
"OPF", NULL, 0);
@@ -117,6 +118,8 @@
void _opf_parse_metadata(struct opf *opf, xmlTextReaderPtr reader) {
int ret;
struct metadata *meta;
+ const xmlChar *local;
+ xmlChar *string;
_epub_print_debug(opf->epub, DEBUG_INFO, "parsing metadata");
@@ -134,8 +137,8 @@
continue;
}
- const xmlChar *local = xmlTextReaderConstLocalName(reader);
- xmlChar *string = (xmlChar *)xmlTextReaderReadString(reader);
+ local = xmlTextReaderConstLocalName(reader);
+ string = (xmlChar *)xmlTextReaderReadString(reader);
if (xmlStrcasecmp(local, (xmlChar *)"identifier") == 0) {
struct id *new = malloc(sizeof(struct id));
@@ -643,10 +646,10 @@
}
void _opf_parse_spine(struct opf *opf, xmlTextReaderPtr reader) {
- _epub_print_debug(opf->epub, DEBUG_INFO, "parsing spine");
-
int ret;
xmlChar *linear;
+
+ _epub_print_debug(opf->epub, DEBUG_INFO, "parsing spine");
opf->spine = NewListAlloc(LIST, NULL, NULL, NULL);
opf->tocName = xmlTextReaderGetAttribute(reader, (xmlChar *)"toc");
@@ -682,6 +685,7 @@
ret = xmlTextReaderRead(reader);
while (ret == 1 &&
xmlStrcasecmp(xmlTextReaderConstLocalName(reader), (xmlChar *)"spine")) {
+ struct spine *item;
// ignore non starting tags
if (xmlTextReaderNodeType(reader) != 1) {
@@ -689,7 +693,7 @@
continue;
}
- struct spine *item = malloc(sizeof(struct spine));
+ item = malloc(sizeof(struct spine));
memset(item, 0, sizeof(struct spine));
item->idref = xmlTextReaderGetAttribute(reader, (xmlChar *)"idref");
@@ -765,10 +769,12 @@
}
void _opf_parse_guide(struct opf *opf, xmlTextReaderPtr reader) {
+ int ret;
+ struct guide *item;
+
_epub_print_debug(opf->epub, DEBUG_INFO, "parsing guides");
- int ret;
- opf->guide = NewListAlloc(LIST, NULL, NULL, NULL);
+ opf->guide = NewListAlloc(LIST, NULL, NULL, NULL);
ret = xmlTextReaderRead(reader);
while (ret == 1 &&
@@ -780,7 +786,7 @@
continue;
}
- struct guide *item = malloc(sizeof(struct guide));
+ item = malloc(sizeof(struct guide));
item->type = xmlTextReaderGetAttribute(reader, (xmlChar *)"type");
item->title = xmlTextReaderGetAttribute(reader, (xmlChar *)"title");
item->href = xmlTextReaderGetAttribute(reader, (xmlChar *)"href");
@@ -796,6 +802,7 @@
listPtr _opf_parse_tour(struct opf *opf, xmlTextReaderPtr reader) {
int ret;
listPtr tour = NewListAlloc(LIST, NULL, NULL, NULL);
+ struct site *item;
ret = xmlTextReaderRead(reader);
@@ -808,7 +815,7 @@
continue;
}
- struct site *item = malloc(sizeof(struct site));
+ item = malloc(sizeof(struct site));
item->title = xmlTextReaderGetAttribute(reader, (xmlChar *)"title");
item->href = xmlTextReaderGetAttribute(reader, (xmlChar *)"href");
_epub_print_debug(opf->epub, DEBUG_INFO,
@@ -823,9 +830,11 @@
}
void _opf_parse_tours(struct opf *opf, xmlTextReaderPtr reader) {
+ int ret;
+ struct tour *item;
+
_epub_print_debug(opf->epub, DEBUG_INFO, "parsing tours");
- int ret;
opf->tours = NewListAlloc(LIST, NULL, NULL, NULL);
ret = xmlTextReaderRead(reader);
@@ -839,7 +848,7 @@
continue;
}
- struct tour *item = malloc(sizeof(struct tour));
+ item = malloc(sizeof(struct tour));
item->title = xmlTextReaderGetAttribute(reader, (xmlChar *)"title");
item->id = xmlTextReaderGetAttribute(reader, (xmlChar *)"id");
++++++ ebook-tools-64bit-installation.diff ++++++
--- /var/tmp/diff_new_pack.d9KVDd/_old 2013-10-19 16:48:30.000000000 +0200
+++ /var/tmp/diff_new_pack.d9KVDd/_new 2013-10-19 16:48:30.000000000 +0200
@@ -1,8 +1,7 @@
-Index: ebook-tools-0.2.1/CMakeLists.txt
-===================================================================
---- ebook-tools-0.2.1.orig/CMakeLists.txt 2010-02-28 18:09:46.000000000 +0100
-+++ ebook-tools-0.2.1/CMakeLists.txt 2011-03-23 10:02:24.543822958 +0100
-@@ -2,11 +2,14 @@ project (EBOOK-TOOLS C)
+diff -Naur ebook-tools-0.2.2.orig/CMakeLists.txt ebook-tools-0.2.2/CMakeLists.txt
+--- ebook-tools-0.2.2.orig/CMakeLists.txt 2012-09-04 16:32:32.000000000 +0200
++++ ebook-tools-0.2.2/CMakeLists.txt 2013-10-13 00:16:47.779199221 +0200
+@@ -2,6 +2,8 @@
cmake_minimum_required(VERSION 2.4.0)
@@ -11,24 +10,12 @@
#set(CMAKE_CURRENT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
set(LIBRARY_OUTPUT_PATH ${EBOOK-TOOLS_BINARY_DIR}/libs)
set(EXECUTABLE_OUTPUT_PATH ${EBOOK-TOOLS_BINARY_DIR}/bin)
-
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
-
- find_package(LibXml2 REQUIRED)
- find_package(LibZip REQUIRED)
-Index: ebook-tools-0.2.1/src/libepub/CMakeLists.txt
-===================================================================
---- ebook-tools-0.2.1.orig/src/libepub/CMakeLists.txt 2010-09-13 21:31:53.000000000 +0200
-+++ ebook-tools-0.2.1/src/libepub/CMakeLists.txt 2011-03-23 10:08:59.695872613 +0100
-@@ -1,8 +1,8 @@
+diff -Naur ebook-tools-0.2.2.orig/src/libepub/CMakeLists.txt ebook-tools-0.2.2/src/libepub/CMakeLists.txt
+--- ebook-tools-0.2.2.orig/src/libepub/CMakeLists.txt 2012-09-04 16:32:32.000000000 +0200
++++ ebook-tools-0.2.2/src/libepub/CMakeLists.txt 2013-10-13 00:11:35.694100822 +0200
+@@ -1,4 +1,4 @@
-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_DIR} ${ZIP_INCLUDE_DIRS} )
add_library (epub SHARED epub.c ocf.c opf.c linklist.c list.c)
target_link_libraries (epub ${LIBZIP_LIBRARY} ${LIBXML2_LIBRARIES})
- 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 )
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
