[lensfun] pkgconfig: fix cflags so lensfun.h is found
Nils Philippsen
nphilipp at fedoraproject.org
Wed Jul 25 08:47:04 UTC 2012
commit c8b4e334de388ac9ae5f04a62972dae9a0c1eb92
Author: Nils Philippsen <nils at redhat.com>
Date: Wed Jul 25 10:46:39 2012 +0200
pkgconfig: fix cflags so lensfun.h is found
lensfun-0.2.6-cmake_pkgconfig.patch | 17 ++++++++++-------
lensfun.spec | 5 ++++-
2 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/lensfun-0.2.6-cmake_pkgconfig.patch b/lensfun-0.2.6-cmake_pkgconfig.patch
index db2920e..7c6323c 100644
--- a/lensfun-0.2.6-cmake_pkgconfig.patch
+++ b/lensfun-0.2.6-cmake_pkgconfig.patch
@@ -1,6 +1,7 @@
-diff -up lensfun-0.2.6/libs/lensfun/CMakeLists.txt.cmake_pkgconfig lensfun-0.2.6/libs/lensfun/CMakeLists.txt
---- lensfun-0.2.6/libs/lensfun/CMakeLists.txt.cmake_pkgconfig 2012-02-12 05:19:39.000000000 -0600
-+++ lensfun-0.2.6/libs/lensfun/CMakeLists.txt 2012-06-28 10:05:08.767440482 -0500
+diff --git a/libs/lensfun/CMakeLists.txt b/libs/lensfun/CMakeLists.txt
+index ef3dcf0..253a08c 100644
+--- a/libs/lensfun/CMakeLists.txt
++++ b/libs/lensfun/CMakeLists.txt
@@ -26,3 +26,8 @@ INSTALL(TARGETS lensfun
RUNTIME DESTINATION ${BINDIR}
LIBRARY DESTINATION ${LIBDIR}
@@ -10,9 +11,11 @@ diff -up lensfun-0.2.6/libs/lensfun/CMakeLists.txt.cmake_pkgconfig lensfun-0.2.6
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/lensfun.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/lensfun.pc @ONLY)
+INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/lensfun.pc DESTINATION ${LIBDIR}/pkgconfig )
+
-diff -up lensfun-0.2.6/libs/lensfun/lensfun.pc.cmake.cmake_pkgconfig lensfun-0.2.6/libs/lensfun/lensfun.pc.cmake
---- lensfun-0.2.6/libs/lensfun/lensfun.pc.cmake.cmake_pkgconfig 2012-06-28 10:05:08.767440482 -0500
-+++ lensfun-0.2.6/libs/lensfun/lensfun.pc.cmake 2012-06-28 10:37:50.337917472 -0500
+diff --git a/libs/lensfun/lensfun.pc.cmake b/libs/lensfun/lensfun.pc.cmake
+new file mode 100644
+index 0000000..6d14b12
+--- /dev/null
++++ b/libs/lensfun/lensfun.pc.cmake
@@ -0,0 +1,13 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+bindir=@CMAKE_INSTALL_PREFIX@/@BINDIR@
@@ -26,4 +29,4 @@ diff -up lensfun-0.2.6/libs/lensfun/lensfun.pc.cmake.cmake_pkgconfig lensfun-0.2
+Version: @VERSION_MAJOR at .@VERSION_MINOR at .@VERSION_MICRO at .@VERSION_BUGFIX@
+Requires.private: glib-2.0
+Libs: -L${libdir} -llensfun
-+Cflags: -I${includedir}
++Cflags: -I${includedir} -I${includedir}/lensfun
diff --git a/lensfun.spec b/lensfun.spec
index 53f48f7..6d86a9b 100644
--- a/lensfun.spec
+++ b/lensfun.spec
@@ -2,7 +2,7 @@
Name: lensfun
Version: 0.2.6
Summary: Library to rectify defects introduced by photographic lenses
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv3 and CC-BY-SA
Group: System Environment/Libraries
@@ -92,6 +92,9 @@ rm -rf %{buildroot}
%changelog
+* Wed Jul 25 2012 Nils Philippsen <nils at redhat.com> - 0.2.6-3
+- pkgconfig: fix cflags so lensfun.h is found
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list