- updated to 0.2.1

- updated lib64 patch

Changed files:
    ebook-tools-lib64.patch -> 1.2
    ebook-tools.spec -> 1.11

diff --git a/ebook-tools-lib64.patch b/ebook-tools-lib64.patch
index f7751f21226e500ded8e7239e57867121419da8b..43ac62d6dba33742294acfc0cf73877131ad4631 100644 (file)
--- a/ebook-tools-lib64.patch
+++ b/ebook-tools-lib64.patch
@@ -2,8 +2,8 @@
 +++ src/libepub/CMakeLists.txt-new     2008-06-20 21:09:54.824756750 +0200
 @@ -4,5 +4,5 @@
  
- set_target_properties (epub PROPERTIES VERSION 0.1.1 SOVERSION 0)
+ 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 DESTINATION include )
+ install ( FILES epub.h epub_shared.h epub_version.h DESTINATION include )

diff --git a/ebook-tools.spec b/ebook-tools.spec
index fc358ddaf7df21f224e62ca471c670d4ccde9f6e..3a11d7336a14967344f65429199485764bf7ecb7 100644 (file)
--- a/ebook-tools.spec
+++ b/ebook-tools.spec
@@ -1,14 +1,14 @@
-Summary:       tools for accessing and converting ebook file formats
-Summary(pl.UTF-8):     tools for accessing and converting ebook file formats
+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.1.1
-Release:       2
+Version:       0.2.1
+Release:       1
 License:       GPL v3
 Group:         X11/Libraries
-Source0:       http://dl.sourceforge.net/ebook-tools/%{name}-%{version}.tar.gz
-# Source0-md5: 15946af6f946eabe8247cdef9ada2b88
+Source0:       http://downloads.sourceforge.net/ebook-tools/%{name}-%{version}.tar.gz
+# Source0-md5: cabbd2ef9148a61ca5f6e60ca63e6045
 Patch0:                %{name}-lib64.patch
-URL:           http://sourceforge.net/projects/ebook-tools
+URL:           http://ebook-tools.sourceforge.net/
 BuildRequires: cmake
 BuildRequires: libxml2-devel
 BuildRequires: libzip-devel
@@ -20,20 +20,21 @@ ebook-tools provides tools for accessing and converting various ebook
 file formats.
 
 %description -l pl.UTF-8
-ebook-tools provides tools for accessing and converting various ebook
-file formats.
+Pakiet ebook-tools dostarcza narzędzia do odczytu i konwersji różnych
+formatów plików ebooków.
 
 %package devel
-Summary:       ebook-tools - header files
-Summary(pl.UTF-8):     ebook-tools - pliki nagłówkowe
+Summary:       ebook-tools - header files for libepub library
+Summary(pl.UTF-8):     ebook-tools - pliki nagłówkowe biblioteki libepub
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description devel
-This package contains header files for ebook-tools.
+This package contains header files for ebook-tools libepub library.
 
 %description devel -l pl.UTF-8
-Pakiet ten zawiera pliki nagłówkowe do ebook-tools.
+Pakiet ten zawiera pliki nagłówkowe biblioteki libepub z pakietu
+ebook-tools.
 
 %prep
 %setup -q
@@ -42,14 +43,15 @@ Pakiet ten zawiera pliki nagłówkowe do ebook-tools.
 %build
 install -d build
 cd build
-%cmake \
+%cmake .. \
        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DCMAKE_CXX_COMPILER_WORKS=1 \
        -DCMAKE_CXX_COMPILER="%{__cc}" \
+       -DCMAKE_VERBOSE_MAKEFILE=1 \
 %if "%{_lib}" == "lib64"
-       -DLIB_SUFFIX=64 \
+       -DLIB_SUFFIX=64
 %endif
-       ../
+
 %{__make}
 
 %install
@@ -68,11 +70,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/einfo
 %attr(755,root,root) %{_bindir}/lit2epub
-%attr(755,root,root) %ghost %{_libdir}/libepub.so.?
 %attr(755,root,root) %{_libdir}/libepub.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libepub.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libepub.so
 %{_includedir}/epub.h
 %{_includedir}/epub_shared.h
+%{_includedir}/epub_version.h