[avogadro] Fix qmake mkspecs installation directory (broken in 1.0.3).
Kevin Kofler
kkofler at fedoraproject.org
Wed Apr 27 00:45:17 UTC 2011
commit 940f39173c155c8f760b11dfeda88455a5020251
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date: Wed Apr 27 02:44:54 2011 +0200
Fix qmake mkspecs installation directory (broken in 1.0.3).
avogadro-1.0.3-mkspecs-dir.patch | 12 ++++++++++++
avogadro.spec | 4 ++++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/avogadro-1.0.3-mkspecs-dir.patch b/avogadro-1.0.3-mkspecs-dir.patch
new file mode 100644
index 0000000..a1e9ec9
--- /dev/null
+++ b/avogadro-1.0.3-mkspecs-dir.patch
@@ -0,0 +1,12 @@
+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 --git a/avogadro.spec b/avogadro.spec
index c588a68..773c464 100644
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -12,6 +12,8 @@ Group: Applications/Editors
License: GPLv2
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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -60,6 +62,7 @@ Avogadros libraries.
%prep
%setup -q
+%patch0 -p1 -b .mkspecs-dir
# nuke unpatched copy, use working version included in cmake instead -- Rex
rm -f cmake/modules/FindPythonLibs.cmake
@@ -142,6 +145,7 @@ rm -rf $RPM_BUILD_ROOT
* 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)
+- fix qmake mkspecs installation directory (broken in 1.0.3)
* Fri Apr 08 2011 Jaroslav Reznik <jreznik at redhat.com> - 1.0.1-15
- rebuild for new boost (1.46.1)
More information about the scm-commits
mailing list