From 2c3a60a8b867161e6b52ccc880b1c8f2058f1d39 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: May 13 2015 13:57:49 +0000
Subject: update patches


---

diff --git a/lensfun-0.3.0-INSTALL_HELPER_SCRIPTS.patch b/lensfun-0.3.0-INSTALL_HELPER_SCRIPTS.patch
deleted file mode 100644
index b70bef6..0000000
--- a/lensfun-0.3.0-INSTALL_HELPER_SCRIPTS.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up lensfun-0.3.0/docs/CMakeLists.txt.orig lensfun-0.3.0/docs/CMakeLists.txt
---- lensfun-0.3.0/docs/CMakeLists.txt.orig	2014-11-17 11:06:01.842490051 -0600
-+++ lensfun-0.3.0/docs/CMakeLists.txt	2014-11-17 11:03:25.823906935 -0600
-@@ -22,6 +22,7 @@ ADD_CUSTOM_TARGET(doc
- # install documentation  
- INSTALL(DIRECTORY ${CMAKE_DOC_OUT}/ DESTINATION ${DOCDIR})
- 
-+IF(INSTALL_HELPER_SCRIPTS)
- # create and install man pages
- ADD_CUSTOM_TARGET(man ALL)
- ADD_CUSTOM_COMMAND(
-@@ -38,3 +39,4 @@ INSTALL(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/lensfun-add-adapter.1 
-     DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1
- )
-+ENDIF(INSTALL_HELPER_SCRIPTS)
diff --git a/lensfun-0.3.0-mandir.patch b/lensfun-0.3.0-mandir.patch
deleted file mode 100644
index 1e19521..0000000
--- a/lensfun-0.3.0-mandir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up lensfun-0.3.0/CMakeLists.txt.mandir lensfun-0.3.0/CMakeLists.txt
---- lensfun-0.3.0/CMakeLists.txt.mandir	2014-09-30 19:37:34.000000000 +0200
-+++ lensfun-0.3.0/CMakeLists.txt	2014-11-19 17:48:07.874096303 +0100
-@@ -87,6 +87,7 @@ SET(INCLUDEDIR include CACHE PATH "Direc
- SET(DATADIR share/lensfun CACHE PATH "Directory for library data files")
- SET(TESTSBINDIR share/lensfun/tests CACHE PATH "Directory for test and example programs")
- SET(SCRIPTDIR ${BINDIR} CACHE PATH "Directory for helper scripts")
-+SET(MANDIR share/man CACHE PATH "Root directory for man page files")
- 
- IF(INSTALL_HELPER_SCRIPTS)
-   FILE(GLOB HELPER_SCRIPTS apps/*)
-diff -up lensfun-0.3.0/docs/CMakeLists.txt.mandir lensfun-0.3.0/docs/CMakeLists.txt
---- lensfun-0.3.0/docs/CMakeLists.txt.mandir	2014-11-19 17:48:07.874096303 +0100
-+++ lensfun-0.3.0/docs/CMakeLists.txt	2014-11-19 17:51:27.562844291 +0100
-@@ -37,6 +37,6 @@ INSTALL(FILES
-     ${CMAKE_CURRENT_BINARY_DIR}/g-lensfun-update-data.1 
-     ${CMAKE_CURRENT_BINARY_DIR}/lensfun-update-data.1 
-     ${CMAKE_CURRENT_BINARY_DIR}/lensfun-add-adapter.1 
--    DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1
-+    DESTINATION ${CMAKE_INSTALL_PREFIX}/${MANDIR}/man1
- )
- ENDIF(INSTALL_HELPER_SCRIPTS)
diff --git a/lensfun-0.3.1-INSTALL_HELPER_SCRIPTS.patch b/lensfun-0.3.1-INSTALL_HELPER_SCRIPTS.patch
new file mode 100644
index 0000000..2dc521b
--- /dev/null
+++ b/lensfun-0.3.1-INSTALL_HELPER_SCRIPTS.patch
@@ -0,0 +1,16 @@
+diff -up lensfun-0.3.1/docs/CMakeLists.txt.INSTALL_HELPER_SCRIPTS lensfun-0.3.1/docs/CMakeLists.txt
+--- lensfun-0.3.1/docs/CMakeLists.txt.INSTALL_HELPER_SCRIPTS	2015-05-10 14:04:53.000000000 +0200
++++ lensfun-0.3.1/docs/CMakeLists.txt	2015-05-13 15:28:13.569986646 +0200
+@@ -22,6 +22,7 @@ ADD_CUSTOM_TARGET(doc
+ # install documentation  
+ INSTALL(DIRECTORY ${CMAKE_DOC_OUT}/ DESTINATION ${DOCDIR})
+ 
++IF(INSTALL_HELPER_SCRIPTS)
+ # create and install man pages
+ FIND_PROGRAM(RST2MAN_EXECUTABLE NAMES rst2man rst2man.py rst2man2 rst2man2.py)
+ ADD_CUSTOM_TARGET(man ALL)
+@@ -39,3 +40,4 @@ INSTALL(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/lensfun-add-adapter.1 
+     DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1
+ )
++ENDIF(INSTALL_HELPER_SCRIPTS)
diff --git a/lensfun-0.3.1-mandir.patch b/lensfun-0.3.1-mandir.patch
new file mode 100644
index 0000000..a16eed0
--- /dev/null
+++ b/lensfun-0.3.1-mandir.patch
@@ -0,0 +1,22 @@
+diff -up lensfun-0.3.1/CMakeLists.txt.mandir lensfun-0.3.1/CMakeLists.txt
+--- lensfun-0.3.1/CMakeLists.txt.mandir	2015-05-13 15:30:51.240533510 +0200
++++ lensfun-0.3.1/CMakeLists.txt	2015-05-13 15:33:37.381948578 +0200
+@@ -48,6 +48,7 @@ SET(BINDIR bin CACHE PATH "Main binary d
+ SET(LIBDIR lib${LIB_SUFFIX} CACHE PATH "Directory for library itself")
+ SET(INCLUDEDIR include CACHE PATH "Directory for library header files")
+ SET(DATADIR share/lensfun CACHE PATH "Directory for library data files")
++SET(MANDIR share/man CACHE PATH "Root directory for man page files")
+ 
+ IF(BUILD_FOR_SSE)
+   SET(VECTORIZATION_SSE 1)
+diff -up lensfun-0.3.1/docs/CMakeLists.txt.mandir lensfun-0.3.1/docs/CMakeLists.txt
+--- lensfun-0.3.1/docs/CMakeLists.txt.mandir	2015-05-13 15:30:51.238533541 +0200
++++ lensfun-0.3.1/docs/CMakeLists.txt	2015-05-13 15:30:51.240533510 +0200
+@@ -38,6 +38,6 @@ INSTALL(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/g-lensfun-update-data.1 
+     ${CMAKE_CURRENT_BINARY_DIR}/lensfun-update-data.1 
+     ${CMAKE_CURRENT_BINARY_DIR}/lensfun-add-adapter.1 
+-    DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/${MANDIR}/man1
+ )
+ ENDIF(INSTALL_HELPER_SCRIPTS)
diff --git a/lensfun.spec b/lensfun.spec
index cf78104..910c97e 100644
--- a/lensfun.spec
+++ b/lensfun.spec
@@ -19,9 +19,9 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
 ## upstreamable patches
 # install manpages only when INSTALL_HELPER_SCRIPTS=ON
-Patch1: lensfun-0.3.0-INSTALL_HELPER_SCRIPTS.patch
+Patch1: lensfun-0.3.1-INSTALL_HELPER_SCRIPTS.patch
 # install manpages in the correct place
-Patch2: lensfun-0.3.0-mandir.patch
+Patch2: lensfun-0.3.1-mandir.patch
 
 BuildRequires: cmake >= 2.8
 BuildRequires: doxygen
@@ -114,6 +114,7 @@ rm -fv %{buildroot}%{_bindir}/g-lensfun-update-data \
 * Wed May 13 2015 Nils Philippsen <nils@redhat.com> - 0.3.1-1
 - version 0.3.1 (with API/ABI changes)
 - fix source URL (no tar.bz2 available)
+- update patches
 
 * Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.3.0-5
 - Rebuilt for GCC 5 C++11 ABI change