[packages/lensfun] - added auxfun patch (fix libauxfun versioning), build auxfun library

[qboosh]

commit 08c9edf6763e58a0456f653b08211bd8e9f93f5a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 10 19:46:37 2013 +0100

    - added auxfun patch (fix libauxfun versioning), build auxfun library

 lensfun-auxfun.patch | 11 +++++++++++
 lensfun.spec         | 22 ++++++++++++++--------
 2 files changed, 25 insertions(+), 8 deletions(-)
---
diff --git a/lensfun.spec b/lensfun.spec
index 1a254a8..6813d5e 100644
--- a/lensfun.spec
+++ b/lensfun.spec
@@ -7,16 +7,18 @@ License:	LGPL v3 (library), CC-BY-SA v3.0 (lens database)
 Group:		Libraries
 Source0:	http://download.berlios.de/lensfun/%{name}-%{version}.tar.bz2
 # Source0-md5:	740e4749db04da0a597630dd6339b966
-URL:		http://developer.berlios.de/projects/lensfun/
 Patch0:		%{name}-build.patch
-BuildRequires:	cmake
+Patch1:		%{name}-auxfun.patch
+URL:		http://developer.berlios.de/projects/lensfun/
+BuildRequires:	cmake >= 2.8
 BuildRequires:	doxygen >= 1.5.0
 BuildRequires:	glib2-devel >= 2.0.0
-BuildRequires:	libpng >= 1.0
+BuildRequires:	libpng-devel >= 1.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	make >= 3.81
 BuildRequires:	python
-BuildRequires:	zlib-devel
+BuildRequires:	rpmbuild(macros) >= 1.605
+BuildRequires:	zlib-devel >= 1.0
 Obsoletes:	lensfun-apidocs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -47,16 +49,17 @@ Pliki nagłówkowe biblioteki lensfun.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 install -d build
 cd build
-%{cmake} \
+%cmake .. \
+	-DBUILD_AUXFUN:BOOL=ON \
 	-DBUILD_DOC:BOOL=ON \
-	-DBUILD_TESTS:BOOL=OFF \
-	..
+	-DBUILD_TESTS:BOOL=OFF
 
-%{__make} V=1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -73,12 +76,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README docs/cc-by-sa-3.0.txt
+%attr(755,root,root) %{_libdir}/libauxfun.so.*.*.*.*
 %attr(755,root,root) %{_libdir}/liblensfun.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblensfun.so.0
 %{_datadir}/lensfun
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libauxfun.so
 %attr(755,root,root) %{_libdir}/liblensfun.so
+%{_includedir}/auxfun
 %{_includedir}/lensfun
 %{_pkgconfigdir}/lensfun.pc
diff --git a/lensfun-auxfun.patch b/lensfun-auxfun.patch
new file mode 100644
index 0000000..346cbb2
--- /dev/null
+++ b/lensfun-auxfun.patch
@@ -0,0 +1,11 @@
+--- lensfun-0.2.6/libs/auxfun/CMakeLists.txt.orig	2012-02-12 12:19:39.000000000 +0100
++++ lensfun-0.2.6/libs/auxfun/CMakeLists.txt	2013-02-10 19:21:51.573232843 +0100
+@@ -6,7 +6,7 @@
+ ADD_LIBRARY(auxfun SHARED ${AUXFUN_SRC})
+ ENDIF()
+ 
+-SET_TARGET_PROPERTIES(auxfun PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}).${VERSION_MICRO}.${VERSION_BUGFIX}")  
++SET_TARGET_PROPERTIES(auxfun PROPERTIES VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.${VERSION_BUGFIX}")  
+ TARGET_LINK_LIBRARIES(auxfun ${PNG_LIBRARY} ${ZLIB_LIBRARY})
+ INSTALL(TARGETS auxfun 
+     RUNTIME DESTINATION ${BINDIR}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/lensfun.git/commitdiff/08c9edf6763e58a0456f653b08211bd8e9f93f5a