[avogadro] * Wed Apr 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.3-2 - remove -Wl, -s from the compiler

[Kevin Kofler]

commit af1018fa99f973a42d5274e8a27b74b9fd80b6d1
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Wed Apr 27 18:47:32 2011 +0200

    * Wed Apr 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.3-2
    - remove -Wl,-s from the compiler flags, fixes -debuginfo (#700080)

 avogadro-1.0.3-no-strip.patch |   12 ++++++++++++
 avogadro.spec                 |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/avogadro-1.0.3-no-strip.patch b/avogadro-1.0.3-no-strip.patch
new file mode 100644
index 0000000..8e9821a
--- /dev/null
+++ b/avogadro-1.0.3-no-strip.patch
@@ -0,0 +1,12 @@
+diff -ur avogadro-1.0.3/CMakeLists.txt avogadro-1.0.3-no-strip/CMakeLists.txt
+--- avogadro-1.0.3/CMakeLists.txt	2011-04-25 07:29:58.000000000 +0200
++++ avogadro-1.0.3-no-strip/CMakeLists.txt	2011-04-27 18:44:02.000000000 +0200
+@@ -98,7 +98,7 @@
+ 	endif (NOT APPLE)
+   # Set up additional build flags for particular build types. These will be added to CMAKE_CXX_FLAGS,
+   # they will not replace them.
+-  set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT -Wl,-s")
++  set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG_OUTPUT")
+   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
+     "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${CMAKE_CXX_FLAGS_WARN}")
+   set(CMAKE_CXX_FLAGS_DEBUG   "-g3 -fno-inline ${CMAKE_CXX_FLAGS_WARN}")
diff --git a/avogadro.spec b/avogadro.spec
index d6ec770..5d939f4 100644
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -5,7 +5,7 @@
 
 Name:           avogadro
 Version:        1.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 Group:          Applications/Editors
@@ -14,6 +14,8 @@ URL:            http://avogadro.openmolecules.net/
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 # Fix qmake mkspecs installation directory (broken in 1.0.3)
 Patch0:         avogadro-1.0.3-mkspecs-dir.patch
+# Remove -Wl,-s from the compiler flags, fixes -debuginfo (#700080)
+Patch1:         avogadro-1.0.3-no-strip.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -63,6 +65,7 @@ Avogadros libraries.
 %prep
 %setup -q
 %patch0 -p1 -b .mkspecs-dir
+%patch1 -p1 -b .no-strip
 
 # nuke unpatched copy, use working version included in cmake instead -- Rex
 rm -f cmake/modules/FindPythonLibs.cmake
@@ -146,6 +149,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 27 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.3-2
+- remove -Wl,-s from the compiler flags, fixes -debuginfo (#700080)
+
 * Tue Apr 26 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1.0.3-1
 - update to 1.0.3
 - drop all patches (fixed upstream)