packages: avogadro/avogadro.spec, avogadro/avogadro-cmake.patch (NEW) - rel...

[arekm]

Author: arekm                        Date: Sat Jul 31 08:15:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; cmake file fixes

---- Files affected:
packages/avogadro:
   avogadro.spec (1.5 -> 1.6) , avogadro-cmake.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/avogadro/avogadro.spec
diff -u packages/avogadro/avogadro.spec:1.5 packages/avogadro/avogadro.spec:1.6
--- packages/avogadro/avogadro.spec:1.5	Sat Jul 31 00:06:08 2010
+++ packages/avogadro/avogadro.spec	Sat Jul 31 10:15:53 2010
@@ -5,7 +5,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
@@ -13,6 +13,7 @@
 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
@@ -54,6 +55,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 %build
 install -d build
@@ -106,6 +108,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/07/31 08:15:53  arekm
+- rel 2; cmake file fixes
+
 Revision 1.5  2010/07/30 22:06:08  shadzik
 - builds, rel 1
 

================================================================
Index: packages/avogadro/avogadro-cmake.patch
diff -u /dev/null packages/avogadro/avogadro-cmake.patch:1.1
--- /dev/null	Sat Jul 31 10:15:59 2010
+++ packages/avogadro/avogadro-cmake.patch	Sat Jul 31 10:15:53 2010
@@ -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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avogadro/avogadro.spec?r1=1.5&r2=1.6&f=u