[indi-gphoto] Added patch to force cmake to honor compiler flags

Christian Dersch lupinix at fedoraproject.org
Sat Oct 25 17:19:27 UTC 2014


commit 8e5bc7cd196a41bcf4b5af131879169d6a1219d8
Author: Christian Dersch <lupinix at fedoraproject.org>
Date:   Sat Oct 25 19:16:48 2014 +0200

    Added patch to force cmake to honor compiler flags

 cmake_use_compilerflags.patch |   14 ++++++++++++++
 indi-gphoto.spec              |   13 ++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/cmake_use_compilerflags.patch b/cmake_use_compilerflags.patch
new file mode 100644
index 0000000..7de484e
--- /dev/null
+++ b/cmake_use_compilerflags.patch
@@ -0,0 +1,14 @@
+--- indi-gphoto-0.9.9.20141015svn1783/CMakeLists.txt	2013-12-21 04:23:39.000000000 +0200
++++ indi-gphoto-0.9.9.20141015svn1783/CMakeLists.txt	2014-10-25 10:20:52.115443058 +0300
+@@ -3,9 +3,9 @@ PROJECT(indi_gphoto C CXX)
+ 
+ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
+ 
+-SET(CMAKE_CXX_FLAGS "-Wall" )
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall" )
+ SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -DDEBUG_FITS" )
+-SET(CMAKE_C_FLAGS "-Wall" )
++SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall" )
+ SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -DDEBUG_FITS" )
+ 
+ find_package(USB REQUIRED)
diff --git a/indi-gphoto.spec b/indi-gphoto.spec
index f1ea3af..99c3b9e 100644
--- a/indi-gphoto.spec
+++ b/indi-gphoto.spec
@@ -7,7 +7,7 @@
 Name:           indi-%{driver}
 Version:        0.9.9
 # Post-Release checkout containing some improvements
-Release:        2.%{checkout}%{?dist}
+Release:        3.%{checkout}%{?dist}
 Summary:        INDI driver providing support for gPhoto
 
 License:        LGPLv2+
@@ -17,6 +17,9 @@ URL:            http://indilib.org/
 # tar -cJvf %{name}-%{version}.%{checkout}.tar.xz %{name}-%{version}.%{checkout}
 Source0:        %{name}-%{version}.%{checkout}.tar.xz
 
+# Patch submitted upstream: https://sourceforge.net/p/indi/bugs/55/
+Patch0:         cmake_use_compilerflags.patch
+
 BuildRequires:  cfitsio-devel
 BuildRequires:	cmake
 BuildRequires:	dcraw
@@ -36,7 +39,7 @@ This includes many DSLR, e.g. Canon or Nikon.
 
 %prep
 %setup -q -n%{name}-%{version}.%{checkout}
-
+%patch0 -p1
 
 %build
 %cmake
@@ -48,12 +51,16 @@ make install DESTDIR=%{buildroot}
 
 
 %files
-%doc AUTHORS COPYING.LIB INSTALL README
+%doc AUTHORS COPYING.LIB README
 %{_bindir}/indi_gphoto_ccd
 %{_datadir}/indi/indi_gphoto.xml
 
 
 %changelog
+* Sat Oct 25 2014 Christian Dersch <lupinix at fedoraproject.org> - 0.9.9-3.%{checkout}
+- added patch forcing cmake to honor compiler flags, required for useful debuginfo
+- removed INSTALL from %doc section
+
 * Wed Oct 15 2014 Christian Dersch <lupinix at fedoraproject.org> - 0.9.9-2.%{checkout}
 - small spec fix
 


More information about the scm-commits mailing list