diff --git a/codelite-5.4-libdir.patch b/codelite-5.4-libdir.patch new file mode 100644 index 0000000..26f955d --- /dev/null +++ b/codelite-5.4-libdir.patch @@ -0,0 +1,14 @@ +diff -urN codelite-orig/CMakeLists.txt codelite-patched/CMakeLists.txt +--- codelite-orig/CMakeLists.txt 2014-02-14 16:08:02.371570174 +1100 ++++ codelite-patched/CMakeLists.txt 2014-02-14 18:31:35.085719522 +1100 +@@ -105,7 +105,9 @@ + ## Override defaults with user input + ######################################## + +-set( CL_INSTALL_LIBDIR "lib" ) ++if ( NOT CL_INSTALL_LIBDIR ) ++ set( CL_INSTALL_LIBDIR "lib" ) ++endif() + if ( PREFIX ) + set ( CL_PREFIX ${PREFIX} ) + else() diff --git a/codelite.spec b/codelite.spec index ccff2b1..964a419 100644 --- a/codelite.spec +++ b/codelite.spec @@ -1,13 +1,14 @@ Summary: A powerful open-source, cross platform code editor for C/C++ Name: codelite Version: 5.4 -Release: 1 +Release: 2 License: GPLv2+ Group: Development/Other Url: http://codelite.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-gtk.src.tar.gz Patch0: codelite-5.4-desktop.patch Patch1: codelite-5.4-linkage.patch +Patch2: codelite-5.4-libdir.patch BuildRequires: cmake BuildRequires: wxgtku3.0-devel BuildRequires: pkgconfig(freetype2) @@ -45,10 +46,12 @@ users to easily create, build and debug complex projects. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %cmake \ - -DPREFIX:PATH=%{_prefix} + -DPREFIX:PATH=%{_prefix} \ + -DCL_INSTALL_LIBDIR=%{_lib} %make %install