From 47619d8bf83f3d044d07b2f4e8edc88dd54fdd9898fb52db8235dc2f10d06b86 Mon Sep 17 00:00:00 2001 From: Guido Berhoerster Date: Mon, 4 Jun 2012 08:57:36 +0000 Subject: [PATCH] - enable guile scripting support introduced in 0.3.7 - dropped unnecessary weechat-0.3.3-fix-strftime.patch - added weechat-fix-cmake-guile.patch which fixes the include dir for guile no being passed to the guild script plugin cmake file OBS-URL: https://build.opensuse.org/package/show/server:irc/weechat?expand=0&rev=43 --- weechat-0.3.3-fix-strftime.patch | 11 ----------- weechat-fix-cmake-guile.patch | 13 +++++++++++++ weechat.changes | 8 ++++++++ weechat.spec | 24 +++++++++++++++++++++--- 4 files changed, 42 insertions(+), 14 deletions(-) delete mode 100644 weechat-0.3.3-fix-strftime.patch create mode 100644 weechat-fix-cmake-guile.patch diff --git a/weechat-0.3.3-fix-strftime.patch b/weechat-0.3.3-fix-strftime.patch deleted file mode 100644 index faa26a4..0000000 --- a/weechat-0.3.3-fix-strftime.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN weechat-0.3.3.orig/src/plugins/scripts/ruby/weechat-ruby.c weechat-0.3.3/src/plugins/scripts/ruby/weechat-ruby.c ---- weechat-0.3.3.orig/src/plugins/scripts/ruby/weechat-ruby.c 2010-06-21 12:33:42.000000000 +0200 -+++ weechat-0.3.3/src/plugins/scripts/ruby/weechat-ruby.c 2010-11-08 16:33:02.000000000 +0100 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include "../../weechat-plugin.h" - #include "../script.h" diff --git a/weechat-fix-cmake-guile.patch b/weechat-fix-cmake-guile.patch new file mode 100644 index 0000000..6d988da --- /dev/null +++ b/weechat-fix-cmake-guile.patch @@ -0,0 +1,13 @@ +Index: weechat-0.3.8/src/plugins/scripts/guile/CMakeLists.txt +=================================================================== +--- weechat-0.3.8.orig/src/plugins/scripts/guile/CMakeLists.txt ++++ weechat-0.3.8/src/plugins/scripts/guile/CMakeLists.txt +@@ -23,7 +23,7 @@ weechat-guile-api.c weechat-guile-api.h) + SET_TARGET_PROPERTIES(guile PROPERTIES PREFIX "") + + IF(GUILE_FOUND) +- INCLUDE_DIRECTORIES(${GUILE_INCLUDE_PATH}) ++ INCLUDE_DIRECTORIES(${GUILE_INCLUDE_DIRS}) + SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${GUILE_LFLAGS}") + TARGET_LINK_LIBRARIES(guile ${GUILE_LIBRARY} weechat_scripts) + ENDIF(GUILE_FOUND) diff --git a/weechat.changes b/weechat.changes index 4d17fba..b517f97 100644 --- a/weechat.changes +++ b/weechat.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Jun 4 08:45:44 UTC 2012 - gber@opensuse.org + +- enable guile scripting support introduced in 0.3.7 +- dropped unnecessary weechat-0.3.3-fix-strftime.patch +- added weechat-fix-cmake-guile.patch which fixes the include dir + for guile no being passed to the guild script plugin cmake file + ------------------------------------------------------------------- Mon Jun 4 07:22:22 UTC 2012 - gber@opensuse.org diff --git a/weechat.spec b/weechat.spec index 2fbe02d..e8d7b29 100644 --- a/weechat.spec +++ b/weechat.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%define guile_ver 2.0 Name: weechat Version: 0.3.8 @@ -24,7 +25,8 @@ License: GPL-3.0+ Group: Productivity/Networking/IRC Source: http://www.weechat.org/files/src/weechat-%{version}.tar.bz2 Source1: weechat.desktop -Patch1: weechat-0.3.3-fix-strftime.patch +# PATCH-FIX-UPSTREAM weechat-fix-cmake-guile.patch https://savannah.nongnu.org/patch/index.php?7790 gber@opensuse.org -- Fixes the include dir for guile no being passed to the guild script plugin cmake file +Patch0: weechat-fix-cmake-guile.patch Url: http://www.weechat.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake @@ -47,6 +49,7 @@ BuildRequires: libgnutls-devel BuildRequires: gnutls-devel %endif BuildRequires: aspell-devel +BuildRequires: guile-devel BuildRequires: libgcrypt-devel BuildRequires: libgpg-error-devel BuildRequires: lzo-devel @@ -72,6 +75,14 @@ Requires: %{name} = %{version}-%{release} %description devel Development environment for authoring %{name} plugins. +%package guile +Summary: Guile Scripting Support for %{name} +Group: Productivity/Networking/IRC +Requires: %{name} = %{version}-%{release} + +%description guile +Support for %{name} scripts written in the Guile language. + %package lua Summary: Lua Scripting Support for %{name} Group: Productivity/Networking/IRC @@ -122,7 +133,7 @@ Spell-checking support for %{name}, using the aspell library. %prep %setup -q -%patch1 -p1 +%patch0 -p1 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" TIME="\"$(date -d "${modified}" "+%%R")\"" @@ -136,7 +147,10 @@ pushd build cmake \ -DCMAKE_INSTALL_PREFIX="%{_prefix}" \ -DLIBDIR="%{_libdir}" \ - -DPYTHON_LIBRARY="%{_libdir}/libpython%{py_ver}.so" .. + -DGUILE_INCLUDE_DIR="%{_includedir}/guile/2.0" \ + -DGUILE_LIBRARY="%{_libdir}/libguile-%{guile_ver}.so" \ + -DPYTHON_LIBRARY="%{_libdir}/libpython%{py_ver}.so" \ + .. %__make %{?_smp_flags} VERBOSE=1 popd #build @@ -190,6 +204,10 @@ popd #build %{_includedir}/weechat %{_libdir}/pkgconfig/weechat.pc +%files guile +%defattr(-,root,root) +%{_libdir}/weechat/plugins/guile.so + %files lua %defattr(-,root,root) %{_libdir}/weechat/plugins/lua.so