- rel 2; cmake file fixes

Changed files:
    avogadro-cmake.patch -> 1.1
    avogadro.spec -> 1.6

diff --git a/avogadro-cmake.patch b/avogadro-cmake.patch
new file mode 100644 (file)
index 0000000..741dc6d
--- /dev/null
+++ b/avogadro-cmake.patch
@@ -0,0 +1,16 @@
+--- 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 --git a/avogadro.spec b/avogadro.spec
index ab84a57941146cf3d8067ea6944af6fa795a06cd..c909b3d6f7283a9103ba70c06bce525552bcad5f 100644 (file)
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -4,7 +4,7 @@
 Summary:       An advanced molecular editor for chemical purposes
 Name:          avogadro
 Version:       1.0.0
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/Editors
 Source0:       http://downloads.sourceforge.net/avogadro/%{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@ Source0:      http://downloads.sourceforge.net/avogadro/%{name}-%{version}.tar.bz2
 URL:           http://avogadro.openmolecules.net/
 Patch0:                %{name}-sip.patch
 Patch1:                %{name}-linguist.patch
+Patch2:                %{name}-cmake.patch
 BuildRequires: boost-devel >= 1.35
 BuildRequires: cmake >= 2.8.0
 BuildRequires: desktop-file-utils
@@ -53,6 +54,7 @@ libraries.
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 %build
 install -d build