diff --git a/.gitignore b/.gitignore index 74ea318..95e10d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ebook-tools-0.2.0.tar.gz /ebook-tools-0.2.1.tar.gz +/ebook-tools-0.2.2.tar.gz diff --git a/ebook-tools-0.2.1-rmhardcoded.patch b/ebook-tools-0.2.1-rmhardcoded.patch deleted file mode 100644 index 1e4c186..0000000 --- a/ebook-tools-0.2.1-rmhardcoded.patch +++ /dev/null @@ -1,10 +0,0 @@ -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 27f0339..10d3217 100644 --- a/ebook-tools.spec +++ b/ebook-tools.spec @@ -1,6 +1,6 @@ Name: ebook-tools -Version: 0.2.1 -Release: 5%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Summary: Tools for accessing and converting various ebook file formats Group: Applications/Publishing @@ -12,8 +12,6 @@ Source0: http://downloads.sourceforge.net/ebook-tools/%{name}-%{version}.tar.gz 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 @@ -46,7 +44,6 @@ The %{name}-libs package contains libraries to be used by %prep %setup -q -%patch50 -p1 -b .rmhardcoded %patch51 -p1 -b .libzip_pkgconfig @@ -87,6 +84,10 @@ rm -rf %{buildroot} %{_libdir}/libepub.so.0* %changelog +* Fri Oct 18 2013 John5342 0.2.2-1 +- New upstream release (fixes rhbz:1014443) +- Drop rmhardcoded (-DLIB_SUFFIX now supported directly) + * Wed Aug 21 2013 Remi Collet - 0.2.1-5 - rebuild for new libzip diff --git a/sources b/sources index 5c91a13..a09aa15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cabbd2ef9148a61ca5f6e60ca63e6045 ebook-tools-0.2.1.tar.gz +67bce67ceb72dcc3578d6a81ef92b29b ebook-tools-0.2.2.tar.gz