rpms/picviz/devel picviz-0.2.3-plugin-path.patch, NONE, 1.1 picviz.spec, 1.1, 1.2

[Tomas Heinrich]

Author: theinric

Update of /cvs/extras/rpms/picviz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17416

Modified Files:
	picviz.spec 
Added Files:
	picviz-0.2.3-plugin-path.patch 
Log Message:
fix plugin path (#462700)


picviz-0.2.3-plugin-path.patch:

--- NEW FILE picviz-0.2.3-plugin-path.patch ---
diff -up picviz-0.2.3/CMakeLists.txt.pluginpath picviz-0.2.3/CMakeLists.txt
--- picviz-0.2.3/CMakeLists.txt.pluginpath	2008-09-19 21:17:09.000000000 +0200
+++ picviz-0.2.3/CMakeLists.txt	2008-09-20 14:35:31.000000000 +0200
@@ -5,14 +5,14 @@ project(picviz)
 cmake_minimum_required(VERSION 2.4)
 
 IF(NOT LIB_INSTALL_DIR)
-   SET(LIB_INSTALL_DIR lib)
+   SET(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib)
 ENDIF(NOT LIB_INSTALL_DIR)
 
 IF(NOT MOD_INSTALL_DIR)
    SET(MOD_INSTALL_DIR ${LIB_INSTALL_DIR}/${PROJECT_NAME})
 ENDIF(NOT MOD_INSTALL_DIR)
 
-add_definitions(-DPLUGIN_PATH=\\\"${CMAKE_INSTALL_PREFIX}/${MOD_INSTALL_DIR}\\\")
+add_definitions(-DPLUGIN_PATH=\\\"${MOD_INSTALL_DIR}\\\")
 
 configure_file(
 ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake


Index: picviz.spec
===================================================================
RCS file: /cvs/extras/rpms/picviz/devel/picviz.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- picviz.spec	14 Aug 2008 12:11:31 -0000	1.1
+++ picviz.spec	21 Sep 2008 22:38:20 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name: picviz
 Version: 0.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Parallel coordinates plotter
 
 License: GPLv3+
@@ -11,6 +11,7 @@
 Source0: http://www.wallinfire.net/picviz/attachment/wiki/ReleasesDownload/%{name}-%{version}.tar.gz
 Source1: %{name}.desktop
 Patch0: picviz-0.2.3-pkgconfig-path.patch
+Patch1: picviz-0.2.3-plugin-path.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -68,6 +69,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .pkgconfig-path
+%patch1 -p1 -b .plugin-path
 
 %build
 mkdir -p build
@@ -141,5 +143,8 @@
 %{_libdir}/%{name}/libpicvizoutplplot.so
 
 %changelog
+* Mon Sep 22 2008 Tomas Heinrich <theinric at redhat.com> 0.2.3-2
+- fix plugin path (#462700)
+
 * Thu Aug  7 2008 Tomas Heinrich <theinric at redhat.com> 0.2.3-1
 - Initial build