[ebook-tools] - ebook-tools-0.2.0 - %files: track lib soname - tighten subpkg deps with %_isa

[Rex Dieter]

commit 7df99a070b532f096918125e5436ed7533126e46
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 9 17:31:53 2010 -0500

    - ebook-tools-0.2.0
    - %files: track lib soname
    - tighten subpkg deps with %_isa

 .gitignore                          |    2 +-
 ebook-tools-0.1.1-rmhardcoded.patch |   11 ---------
 ebook-tools-0.2.0-rmhardcoded.patch |   11 +++++++++
 ebook-tools.spec                    |   40 ++++++++++++++++++++--------------
 sources                             |    2 +-
 5 files changed, 36 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aac9903..c79591b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-ebook-tools-0.1.1.tar.gz
+/ebook-tools-0.2.0.tar.gz
diff --git a/ebook-tools-0.2.0-rmhardcoded.patch b/ebook-tools-0.2.0-rmhardcoded.patch
new file mode 100644
index 0000000..2607534
--- /dev/null
+++ b/ebook-tools-0.2.0-rmhardcoded.patch
@@ -0,0 +1,11 @@
+diff -up ebook-tools-0.2.0/src/libepub/CMakeLists.txt.orig ebook-tools-0.2.0/src/libepub/CMakeLists.txt
+--- ebook-tools-0.2.0/src/libepub/CMakeLists.txt.orig	2008-04-06 12:18:24.000000000 -0500
++++ ebook-tools-0.2.0/src/libepub/CMakeLists.txt	2010-09-09 17:19:56.432440266 -0500
+@@ -4,5 +4,5 @@ target_link_libraries (epub ${LIBZIP_LIB
+ 
+ set_target_properties (epub PROPERTIES VERSION 0.1.0 SOVERSION 0)
+ 
+-install ( TARGETS epub RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
+-install ( FILES epub.h epub_shared.h DESTINATION include )
++install ( TARGETS epub RUNTIME DESTINATION bin LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} )
++install ( FILES epub.h epub_shared.h DESTINATION ${INCLUDE_INSTALL_DIR} )
diff --git a/ebook-tools.spec b/ebook-tools.spec
index 2a5a3c3..e47515a 100644
--- a/ebook-tools.spec
+++ b/ebook-tools.spec
@@ -1,21 +1,22 @@
 Name:		ebook-tools
-Version:	0.1.1
-Release:	5%{?dist}
+Version:	0.2.0
+Release:	1%{?dist}
 Summary:	Tools for accessing and converting various ebook file formats
 
 Group:		Applications/Publishing
 License:	MIT
 URL:		http://sourceforge.net/projects/%{name}
 
-Source0:	http://prdownloads.sourceforge.net/sourceforge/ebook-tools/%{name}-%{version}.tar.gz
-Patch0:		ebook-tools-0.1.1-rmhardcoded.patch
+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)
 
+BuildRequires:	cmake
 BuildRequires:	libxml2-devel
 BuildRequires:	libzip-devel
-BuildRequires:	cmake
-Requires:	%{name}-libs = %{version}-%{release}
+
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description
 Tools for accessing and converting various ebook file formats.
@@ -24,7 +25,7 @@ Tools for accessing and converting various ebook file formats.
 Summary:	Development files for %{name}
 Group:		Development/Libraries
 
-Requires:	%{name}-libs = %{version}-%{release}
+Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package contains libraries and header files for
@@ -40,20 +41,21 @@ The %{name}-libs package contains libraries to be used by
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .rmhardcoded
 
 
 %build
-mkdir build
-cd build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
 %{cmake} ..
-make
+popd
+make %{_smp_mflags} -C %{_target_platform}
 
 
 %install
 rm -rf %{buildroot}
-cd build
-make install DESTDIR=%{buildroot}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform} 
+
 #remove because it doesnt work without clit
 rm -f %{buildroot}%{_bindir}/lit2epub
 
@@ -66,20 +68,24 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc
 %{_bindir}/einfo
 
 %files	devel
 %defattr(-,root,root,-)
-%{_libdir}/*.so
-%{_includedir}/*
+%{_libdir}/libepub.so
+%{_includedir}/epub*.h
 
 %files	libs
 %defattr(-,root,root,-)
 %doc README LICENSE
-%{_libdir}/*.so.*
+%{_libdir}/libepub.so.0*
 
 %changelog
+* Thu Sep 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 0.2.0-1
+- ebook-tools-0.2.0
+- %%files: track lib soname
+- tighten subpkg deps with %%_isa
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 1ce081f..cd2328a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-15946af6f946eabe8247cdef9ada2b88  ebook-tools-0.1.1.tar.gz
+f6bc7c3fa174f42daebbc6c2b46255fa  ebook-tools-0.2.0.tar.gz