[lensfun] install man pages into their correct place
Nils Philippsen
nphilipp at fedoraproject.org
Wed Nov 19 18:16:57 UTC 2014
commit 8bf698f497f777e2e08ebb6113802fc110d48b4d
Author: Nils Philippsen <nils at redhat.com>
Date: Wed Nov 19 19:13:03 2014 +0100
install man pages into their correct place
lensfun-0.3.0-mandir.patch | 22 ++++++++++++++++++++++
lensfun.spec | 4 ++++
2 files changed, 26 insertions(+), 0 deletions(-)
---
diff --git a/lensfun-0.3.0-mandir.patch b/lensfun-0.3.0-mandir.patch
new file mode 100644
index 0000000..1e19521
--- /dev/null
+++ b/lensfun-0.3.0-mandir.patch
@@ -0,0 +1,22 @@
+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.spec b/lensfun.spec
index c342460..5c8f899 100644
--- a/lensfun.spec
+++ b/lensfun.spec
@@ -20,6 +20,8 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
## upstreamable patches
# install manpages only when INSTALL_HELPER_SCRIPTS=ON
Patch1: lensfun-0.3.0-INSTALL_HELPER_SCRIPTS.patch
+# install manpages in the correct place
+Patch2: lensfun-0.3.0-mandir.patch
BuildRequires: cmake >= 2.8
BuildRequires: doxygen
@@ -58,6 +60,7 @@ adapters in lensfun.
%setup
%patch1 -p1 -b .INSTALL_HELPER_SCRIPTS
+%patch2 -p1 -b .mandir
%build
@@ -110,6 +113,7 @@ rm -fv %{buildroot}%{_bindir}/g-lensfun-update-data \
%changelog
* Wed Nov 19 2014 Nils Philippsen <nils at redhat.com>
- reenable helper scripts
+- install man pages into their correct place
* Mon Nov 17 2014 Rex Dieter <rdieter at fedoraproject.org> 0.3.0-3
- enable sse only in %%ix86 x86_64, sse2 on x86_64, disable elsewhere
More information about the scm-commits
mailing list