[packages/avogadro] - rel 3; better cmake fix; mkspecs fixed in cmake directly
arekm
arekm at pld-linux.org
Sat Aug 25 22:36:18 CEST 2012
commit ee72a804d3bb2db1017f7d685b71012111afdff1
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Aug 25 22:36:14 2012 +0200
- rel 3; better cmake fix; mkspecs fixed in cmake directly
avogadro-cmake.patch | 40 ++++++++++++++++++++++++----------------
avogadro.spec | 4 +---
2 files changed, 25 insertions(+), 19 deletions(-)
---
diff --git a/avogadro.spec b/avogadro.spec
index 9760279..8a5bf9f 100644
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -1,7 +1,7 @@
Summary: An advanced molecular editor for chemical purposes
Name: avogadro
Version: 1.0.3
-Release: 2
+Release: 3
License: GPL v2
Group: Applications/Editors
Source0: http://downloads.sourceforge.net/avogadro/%{name}-%{version}.tar.bz2
@@ -76,8 +76,6 @@ install -d $RPM_BUILD_ROOT%{_datadir}/qt4/mkspecs/features
%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
-%{__mv} $RPM_BUILD_ROOT{%{_prefix},%{_datadir}/qt4/mkspecs}/features/avogadro.prf
-
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
diff --git a/avogadro-cmake.patch b/avogadro-cmake.patch
index 741dc6d..63f8904 100644
--- a/avogadro-cmake.patch
+++ b/avogadro-cmake.patch
@@ -1,16 +1,24 @@
---- avogadro-1.0.0/cmake/modules/AvogadroConfig.cmake.in~ 2009-10-23 21:06:32.000000000 +0200
-+++ avogadro-1.0.0/cmake/modules/AvogadroConfig.cmake.in 2010-07-31 09:34:49.143410698 +0200
-@@ -13,10 +13,10 @@
-
- set(Avogadro_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
- set(Avogadro_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include")
--set(Avogadro_LIBRARY_DIRS "@CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@")
-+set(Avogadro_LIBRARY_DIRS "@LIB_INSTALL_DIR@")
- set(Avogadro_LIB_SUFFIX "@LIB_SUFFIX@")
--set(Avogadro_PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@Avogadro_PLUGIN_INSTALL_DIR@")
--set(Avogadro_BIN_DIRS "@CMAKE_INSTALL_PREFIX@/@BIN_INSTALL_DIR@")
-+set(Avogadro_PLUGIN_DIR "@Avogadro_PLUGIN_INSTALL_DIR@")
-+set(Avogadro_BIN_DIRS "@CMAKE_INSTALL_PREFIX@/@BIN_INSTALL_DIR@")
-
- # Tell the user where to find our build settings and library deps
- set(Avogadro_BUILD_SETTINGS_FILE
+diff -ur avogadro-1.0.3/CMakeLists.txt avogadro-1.0.3-mkspecs-dir/CMakeLists.txt
+--- avogadro-1.0.3/CMakeLists.txt 2011-04-25 07:29:58.000000000 +0200
++++ avogadro-1.0.3-mkspecs-dir/CMakeLists.txt 2011-04-27 02:42:26.000000000 +0200
+@@ -491,7 +491,7 @@
+ if(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF)
+ install(FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/avogadro.prf"
+- DESTINATION "${CMAKE_INSTALL_PREFIX}/${QT_MKSPECS_RELATIVE}/features"
++ DESTINATION "${QT_MKSPECS_DIR}/features"
+ )
+ else(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF)
+ message(WARNING "Qt mkspecs directory not found. File 'avogadro.prf' will be installed to ${SHARE_INSTALL_PREFIX}/avogadro/qmake.")
+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}")
More information about the pld-cvs-commit
mailing list