[weechat: 15/15] New upstream version.
Paul P Komkoff Jr
stingray at fedoraproject.org
Fri Aug 27 18:57:20 UTC 2010
commit 9e645df4d5d365cacba8819fc12dcb50f50f8c8f
Author: Paul P. Komkoff Jr <i at stingr.net>
Date: Wed Aug 25 19:04:41 2010 +0100
New upstream version.
.gitignore | 1 +
sources | 2 +-
weechat-cmake-paths.patch | 66 +++++++++++++-------------
weechat-cmake-pie.patch | 18 ++++----
weechat-enchant.patch | 118 ++++++++++++++++++++++----------------------
weechat.spec | 14 +++---
6 files changed, 110 insertions(+), 109 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cffe88d..e132442 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
weechat-0.3.2.tar.bz2
+/weechat-0.3.3.tar.bz2
diff --git a/sources b/sources
index de277cb..4c9a259 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0b00b321203dd5746a25248a9adaa92 weechat-0.3.2.tar.bz2
+01648f8717ab1ea5233f9818d45a7c24 weechat-0.3.3.tar.bz2
diff --git a/weechat-cmake-paths.patch b/weechat-cmake-paths.patch
index 88c7de7..8425a06 100644
--- a/weechat-cmake-paths.patch
+++ b/weechat-cmake-paths.patch
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8cce7fe..5f2fb3b 100644
+index f3e1c9f..ae867ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -32,27 +32,13 @@ SET(VERSION_PATCH "2")
+@@ -37,27 +37,13 @@ SET(VERSION_PATCH "3")
SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
SET(LICENSE "GPL3")
SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -35,7 +35,7 @@ index 8cce7fe..5f2fb3b 100644
OPTION(DISABLE_NCURSES "Disable Ncurses interface")
OPTION(ENABLE_GTK "Enable GTK interface")
-@@ -108,10 +94,10 @@ ADD_CUSTOM_TARGET(dist
+@@ -113,10 +99,10 @@ ADD_CUSTOM_TARGET(dist
SET(PACKAGE "${PROJECT_NAME}")
SET(prefix "${CMAKE_INSTALL_PREFIX}")
SET(exec_prefix "\${prefix}")
@@ -49,10 +49,10 @@ index 8cce7fe..5f2fb3b 100644
# packages
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client")
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
-index e4f0a84..a24c693 100644
+index 80bcbad..e329c30 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
-@@ -23,6 +23,8 @@ plugin-config.h plugin-config.c)
+@@ -27,6 +27,8 @@ plugin-config.h plugin-config.c)
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
ADD_LIBRARY(weechat_plugins STATIC ${LIB_PLUGINS_SRC})
@@ -62,140 +62,140 @@ index e4f0a84..a24c693 100644
INCLUDE(CheckFunctionExists)
INCLUDE(CheckLibraryExists)
diff --git a/src/plugins/alias/CMakeLists.txt b/src/plugins/alias/CMakeLists.txt
-index b9b0c0b..5d25f42 100644
+index 70bf295..c71cebb 100644
--- a/src/plugins/alias/CMakeLists.txt
+++ b/src/plugins/alias/CMakeLists.txt
-@@ -22,4 +22,4 @@ SET_TARGET_PROPERTIES(alias PROPERTIES PREFIX "")
+@@ -25,4 +25,4 @@ SET_TARGET_PROPERTIES(alias PROPERTIES PREFIX "")
TARGET_LINK_LIBRARIES(alias)
-INSTALL(TARGETS alias LIBRARY DESTINATION ${LIBDIR}/plugins)
+INSTALL(TARGETS alias LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/aspell/CMakeLists.txt b/src/plugins/aspell/CMakeLists.txt
-index ed3c408..5cadbac 100644
+index 894fba0..b0a273a 100644
--- a/src/plugins/aspell/CMakeLists.txt
+++ b/src/plugins/aspell/CMakeLists.txt
-@@ -25,4 +25,4 @@ IF(ASPELL_FOUND)
+@@ -29,4 +29,4 @@ IF(ASPELL_FOUND)
TARGET_LINK_LIBRARIES(aspell ${ASPELL_LIBRARY})
ENDIF(ASPELL_FOUND)
-INSTALL(TARGETS aspell LIBRARY DESTINATION ${LIBDIR}/plugins)
+INSTALL(TARGETS aspell LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/charset/CMakeLists.txt b/src/plugins/charset/CMakeLists.txt
-index eee2eb7..58a0868 100644
+index 64ce12c..f93d142 100644
--- a/src/plugins/charset/CMakeLists.txt
+++ b/src/plugins/charset/CMakeLists.txt
-@@ -26,4 +26,4 @@ IF(ICONV_FOUND)
+@@ -29,4 +29,4 @@ IF(ICONV_FOUND)
ENDIF(ICONV_LIBRARY)
ENDIF(ICONV_FOUND)
-INSTALL(TARGETS charset LIBRARY DESTINATION ${LIBDIR}/plugins)
+INSTALL(TARGETS charset LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/demo/CMakeLists.txt b/src/plugins/demo/CMakeLists.txt
-index 99ff266..f0d51ee 100644
+index 7658ec3..d1f0534 100644
--- a/src/plugins/demo/CMakeLists.txt
+++ b/src/plugins/demo/CMakeLists.txt
-@@ -19,4 +19,4 @@ SET_TARGET_PROPERTIES(demo PROPERTIES PREFIX "")
+@@ -22,4 +22,4 @@ SET_TARGET_PROPERTIES(demo PROPERTIES PREFIX "")
TARGET_LINK_LIBRARIES(demo)
-INSTALL(TARGETS demo LIBRARY DESTINATION ${LIBDIR}/plugins)
+INSTALL(TARGETS demo LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/fifo/CMakeLists.txt b/src/plugins/fifo/CMakeLists.txt
-index b7c43e2..23bbe15 100644
+index f41af5a..eec83db 100644
--- a/src/plugins/fifo/CMakeLists.txt
+++ b/src/plugins/fifo/CMakeLists.txt
-@@ -21,4 +21,4 @@ SET_TARGET_PROPERTIES(fifo PROPERTIES PREFIX "")
+@@ -24,4 +24,4 @@ SET_TARGET_PROPERTIES(fifo PROPERTIES PREFIX "")
TARGET_LINK_LIBRARIES(fifo)
-INSTALL(TARGETS fifo LIBRARY DESTINATION ${LIBDIR}/plugins)
+INSTALL(TARGETS fifo LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/irc/CMakeLists.txt b/src/plugins/irc/CMakeLists.txt
-index 65a22a6..568fc21 100644
+index d751b90..a1c9b11 100644
--- a/src/plugins/irc/CMakeLists.txt
+++ b/src/plugins/irc/CMakeLists.txt
-@@ -55,4 +55,4 @@ ENDIF(GCRYPT_FOUND)
+@@ -58,4 +58,4 @@ ENDIF(GCRYPT_FOUND)
TARGET_LINK_LIBRARIES(irc ${LINK_LIBS})
-INSTALL(TARGETS irc LIBRARY DESTINATION ${LIBDIR}/plugins)
+INSTALL(TARGETS irc LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/logger/CMakeLists.txt b/src/plugins/logger/CMakeLists.txt
-index 7865abb..413ee2b 100644
+index 6cd9b6c..aa74495 100644
--- a/src/plugins/logger/CMakeLists.txt
+++ b/src/plugins/logger/CMakeLists.txt
-@@ -24,4 +24,4 @@ SET_TARGET_PROPERTIES(logger PROPERTIES PREFIX "")
+@@ -27,4 +27,4 @@ SET_TARGET_PROPERTIES(logger PROPERTIES PREFIX "")
TARGET_LINK_LIBRARIES(logger)
-INSTALL(TARGETS logger LIBRARY DESTINATION ${LIBDIR}/plugins)
+INSTALL(TARGETS logger LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/relay/CMakeLists.txt b/src/plugins/relay/CMakeLists.txt
-index 401e61c..2e87109 100644
+index 9a36b5e..26bd162 100644
--- a/src/plugins/relay/CMakeLists.txt
+++ b/src/plugins/relay/CMakeLists.txt
-@@ -30,4 +30,4 @@ SET_TARGET_PROPERTIES(relay PROPERTIES PREFIX "")
+@@ -33,4 +33,4 @@ SET_TARGET_PROPERTIES(relay PROPERTIES PREFIX "")
TARGET_LINK_LIBRARIES(relay)
-INSTALL(TARGETS relay LIBRARY DESTINATION ${LIBDIR}/plugins)
+INSTALL(TARGETS relay LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/lua/CMakeLists.txt b/src/plugins/scripts/lua/CMakeLists.txt
-index eede053..3c9d00a 100644
+index 6c050d9..6779052 100644
--- a/src/plugins/scripts/lua/CMakeLists.txt
+++ b/src/plugins/scripts/lua/CMakeLists.txt
-@@ -28,4 +28,4 @@ IF(LUA_FOUND)
+@@ -32,4 +32,4 @@ IF(LUA_FOUND)
ENDIF(LUA_LIBRARY AND LUALIB_LIBRARY)
ENDIF(LUA_FOUND)
-INSTALL(TARGETS lua LIBRARY DESTINATION ${LIBDIR}/plugins)
+INSTALL(TARGETS lua LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/perl/CMakeLists.txt b/src/plugins/scripts/perl/CMakeLists.txt
-index 4fde8fc..6916689 100644
+index 36ca082..85aa791 100644
--- a/src/plugins/scripts/perl/CMakeLists.txt
+++ b/src/plugins/scripts/perl/CMakeLists.txt
-@@ -35,4 +35,4 @@ IF(PERL_FOUND)
+@@ -38,4 +38,4 @@ IF(PERL_FOUND)
ENDIF(PERL_DYNALOADER)
ENDIF(PERL_FOUND)
-INSTALL(TARGETS perl LIBRARY DESTINATION ${LIBDIR}/plugins)
+INSTALL(TARGETS perl LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/python/CMakeLists.txt b/src/plugins/scripts/python/CMakeLists.txt
-index 484df59..2204831 100644
+index 4cd7f56..1237251 100644
--- a/src/plugins/scripts/python/CMakeLists.txt
+++ b/src/plugins/scripts/python/CMakeLists.txt
-@@ -25,4 +25,4 @@ IF(PYTHON_FOUND)
+@@ -28,4 +28,4 @@ IF(PYTHON_FOUND)
TARGET_LINK_LIBRARIES(python ${PYTHON_LIBRARY} weechat_scripts)
ENDIF(PYTHON_FOUND)
-INSTALL(TARGETS python LIBRARY DESTINATION ${LIBDIR}/plugins)
+INSTALL(TARGETS python LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/ruby/CMakeLists.txt b/src/plugins/scripts/ruby/CMakeLists.txt
-index f9b8538..2ab4d3f 100644
+index e6b7697..949ba93 100644
--- a/src/plugins/scripts/ruby/CMakeLists.txt
+++ b/src/plugins/scripts/ruby/CMakeLists.txt
-@@ -24,4 +24,4 @@ IF(RUBY_FOUND)
+@@ -27,4 +27,4 @@ IF(RUBY_FOUND)
TARGET_LINK_LIBRARIES(ruby ${RUBY_LIBRARY} weechat_scripts)
ENDIF(RUBY_FOUND)
-INSTALL(TARGETS ruby LIBRARY DESTINATION ${LIBDIR}/plugins)
+INSTALL(TARGETS ruby LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/scripts/tcl/CMakeLists.txt b/src/plugins/scripts/tcl/CMakeLists.txt
-index 1ac87f2..586f6e5 100644
+index 6c5b552..09cec7f 100644
--- a/src/plugins/scripts/tcl/CMakeLists.txt
+++ b/src/plugins/scripts/tcl/CMakeLists.txt
-@@ -29,4 +29,4 @@ IF(TCL_FOUND)
+@@ -34,4 +34,4 @@ IF(TCL_FOUND)
ENDIF(TCL_FOUND)
-INSTALL(TARGETS tcl LIBRARY DESTINATION ${LIBDIR}/plugins)
+INSTALL(TARGETS tcl LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/xfer/CMakeLists.txt b/src/plugins/xfer/CMakeLists.txt
-index 22d81e7..e261439 100644
+index 6ec34d3..453f2a2 100644
--- a/src/plugins/xfer/CMakeLists.txt
+++ b/src/plugins/xfer/CMakeLists.txt
-@@ -30,4 +30,4 @@ SET_TARGET_PROPERTIES(xfer PROPERTIES PREFIX "")
+@@ -33,4 +33,4 @@ SET_TARGET_PROPERTIES(xfer PROPERTIES PREFIX "")
TARGET_LINK_LIBRARIES(xfer)
diff --git a/weechat-cmake-pie.patch b/weechat-cmake-pie.patch
index fe26925..57c71af 100644
--- a/weechat-cmake-pie.patch
+++ b/weechat-cmake-pie.patch
@@ -1,8 +1,8 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 977f23b..aaa5162 100644
+index 9fd5ee3..19809c9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -18,6 +18,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
+@@ -23,6 +23,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
INCLUDE(CheckIncludeFiles)
INCLUDE(CheckFunctionExists)
@@ -10,7 +10,7 @@ index 977f23b..aaa5162 100644
CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
CHECK_INCLUDE_FILES("limits.h" HAVE_LIMITS_H)
-@@ -57,6 +58,13 @@ CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK)
+@@ -62,6 +63,13 @@ CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK)
CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR)
CHECK_FUNCTION_EXISTS(strstr HAVE_STRSTR)
@@ -25,10 +25,10 @@ index 977f23b..aaa5162 100644
#needs to be splitted in subdirectories
# FIXME: weechat_gui_common MUST be the first lib in the list
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 79ca890..27ae058 100644
+index c1a22c8..78901f2 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
-@@ -34,6 +34,8 @@ wee-upgrade-file.c wee-upgrade-file.h
+@@ -40,6 +40,8 @@ wee-upgrade-file.c wee-upgrade-file.h
wee-utf8.c wee-utf8.h
wee-util.c wee-util.h)
@@ -38,10 +38,10 @@ index 79ca890..27ae058 100644
INCLUDE(CheckSymbolExists)
CHECK_INCLUDE_FILES("sys/file.h" HAVE_SYS_FILE_H)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 8ee717f..0aa8888 100644
+index c310ded..2f29318 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
-@@ -33,6 +33,11 @@ gui-main.h
+@@ -36,6 +36,11 @@ gui-main.h
gui-nicklist.c gui-nicklist.h
gui-window.c gui-window.h)
@@ -54,10 +54,10 @@ index 8ee717f..0aa8888 100644
ADD_LIBRARY(weechat_gui_common STATIC ${LIB_GUI_COMMON_SRC})
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
-index a24c693..bdd7b6d 100644
+index e329c30..28ca7fa 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
-@@ -23,6 +23,9 @@ plugin-config.h plugin-config.c)
+@@ -27,6 +27,9 @@ plugin-config.h plugin-config.c)
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
ADD_LIBRARY(weechat_plugins STATIC ${LIB_PLUGINS_SRC})
diff --git a/weechat-enchant.patch b/weechat-enchant.patch
index cd1e2ea..88cfb5c 100644
--- a/weechat-enchant.patch
+++ b/weechat-enchant.patch
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8cce7fe..4149391 100644
+index ae867ee..6cdc9e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -61,7 +61,7 @@ OPTION(DISABLE_GCRYPT "Disable libgcrypt support")
+@@ -52,7 +52,7 @@ OPTION(DISABLE_GCRYPT "Disable libgcrypt support")
OPTION(DISABLE_GNUTLS "Disable SSLv3/TLS connection support")
OPTION(DISABLE_LARGEFILE "Disable Large File Support")
OPTION(DISABLE_ALIAS "Disable Alias plugin")
@@ -12,10 +12,10 @@ index 8cce7fe..4149391 100644
OPTION(ENABLE_DEMO "Enable Demo plugin")
OPTION(DISABLE_FIFO "Disable FIFO plugin")
diff --git a/Makefile.am b/Makefile.am
-index a82532f..77ca71c 100644
+index cc5605d..ceca668 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -26,6 +26,7 @@ EXTRA_DIST = CMakeLists.txt \
+@@ -31,6 +31,7 @@ EXTRA_DIST = CMakeLists.txt \
cmake/cmake_uninstall.cmake.in \
cmake/FindAsciidoc.cmake \
cmake/FindAspell.cmake \
@@ -74,10 +74,10 @@ index 0000000..9c13c48
+
+endif (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
diff --git a/configure.in b/configure.in
-index 70d29b8..ae4b309 100644
+index 3c85871..e37506c 100644
--- a/configure.in
+++ b/configure.in
-@@ -101,7 +101,7 @@ AH_VERBATIM([HAVE_GCRYPT], [#undef HAVE_GCRYPT])
+@@ -107,7 +107,7 @@ AH_VERBATIM([HAVE_GCRYPT], [#undef HAVE_GCRYPT])
AH_VERBATIM([HAVE_GNUTLS], [#undef HAVE_GNUTLS])
AH_VERBATIM([HAVE_FLOCK], [#undef HAVE_FLOCK])
AH_VERBATIM([PLUGIN_ALIAS], [#undef PLUGIN_ALIAS])
@@ -86,7 +86,7 @@ index 70d29b8..ae4b309 100644
AH_VERBATIM([PLUGIN_CHARSET], [#undef PLUGIN_CHARSET])
AH_VERBATIM([PLUGIN_DEMO], [#undef PLUGIN_DEMO])
AH_VERBATIM([PLUGIN_FIFO], [#undef PLUGIN_FIFO])
-@@ -126,7 +126,7 @@ AC_ARG_ENABLE(gcrypt, [ --disable-gcrypt turn off gcrypt support (
+@@ -132,7 +132,7 @@ AC_ARG_ENABLE(gcrypt, [ --disable-gcrypt turn off gcrypt support (
AC_ARG_ENABLE(gnutls, [ --disable-gnutls turn off gnutls support (default=compiled if found)],enable_gnutls=$enableval,enable_gnutls=yes)
AC_ARG_ENABLE(largefile, [ --disable-largefile turn off Large File Support (default=on)],enable_largefile=$enableval,enable_largefile=yes)
AC_ARG_ENABLE(alias, [ --disable-alias turn off Alias plugin (default=compiled)],enable_alias=$enableval,enable_alias=yes)
@@ -95,7 +95,7 @@ index 70d29b8..ae4b309 100644
AC_ARG_ENABLE(charset, [ --disable-charset turn off Charset plugin (default=compiled if found)],enable_charset=$enableval,enable_charset=yes)
AC_ARG_ENABLE(demo, [ --enable-demo turn on Demo plugin (default=off)],enable_demo=$enableval,enable_demo=no)
AC_ARG_ENABLE(fifo, [ --disable-fifo turn off Fifo plugin (default=compiled)],enable_fifo=$enableval,enable_fifo=yes)
-@@ -302,36 +302,41 @@ else
+@@ -308,36 +308,41 @@ else
not_asked="$not_asked alias"
fi
@@ -155,7 +155,7 @@ index 70d29b8..ae4b309 100644
fi
# --------------------------------- charset ------------------------------------
-@@ -973,7 +978,7 @@ AM_CONDITIONAL(GUI_WXWIDGETS, test "$enable_wxwidgets" = "yes")
+@@ -979,7 +984,7 @@ AM_CONDITIONAL(GUI_WXWIDGETS, test "$enable_wxwidgets" = "yes")
AM_CONDITIONAL(GUI_GTK, test "$enable_gtk" = "yes")
AM_CONDITIONAL(GUI_QT, test "$enable_qt" = "yes")
AM_CONDITIONAL(PLUGIN_ALIAS, test "$enable_alias" = "yes")
@@ -164,7 +164,7 @@ index 70d29b8..ae4b309 100644
AM_CONDITIONAL(PLUGIN_CHARSET, test "$enable_charset" = "yes")
AM_CONDITIONAL(PLUGIN_DEMO, test "$enable_demo" = "yes")
AM_CONDITIONAL(PLUGIN_FIFO, test "$enable_fifo" = "yes")
-@@ -1051,8 +1056,8 @@ listplugins=""
+@@ -1057,8 +1062,8 @@ listplugins=""
if test "x$enable_alias" = "xyes"; then
listplugins="$listplugins alias"
fi
@@ -176,10 +176,10 @@ index 70d29b8..ae4b309 100644
if test "x$enable_charset" = "xyes"; then
listplugins="$listplugins charset"
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
-index e4f0a84..19ebd8f 100644
+index 28ca7fa..17523e3 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
-@@ -31,13 +31,19 @@ IF(NOT DISABLE_ALIAS)
+@@ -40,13 +40,19 @@ IF(NOT DISABLE_ALIAS)
ADD_SUBDIRECTORY( alias )
ENDIF(NOT DISABLE_ALIAS)
@@ -206,10 +206,10 @@ index e4f0a84..19ebd8f 100644
IF(NOT DISABLE_CHARSET)
# Check for iconv support.
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
-index 802e62b..f163afb 100644
+index 0c2c4d6..ed76f83 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
-@@ -30,7 +30,7 @@ if PLUGIN_ALIAS
+@@ -34,7 +34,7 @@ if PLUGIN_ALIAS
alias_dir = alias
endif
@@ -219,10 +219,10 @@ index 802e62b..f163afb 100644
endif
diff --git a/src/plugins/aspell/CMakeLists.txt b/src/plugins/aspell/CMakeLists.txt
-index ed3c408..5df5543 100644
+index b0a273a..ad120e6 100644
--- a/src/plugins/aspell/CMakeLists.txt
+++ b/src/plugins/aspell/CMakeLists.txt
-@@ -20,9 +20,15 @@ weechat-aspell-config.c weechat-aspell-config.h
+@@ -24,9 +24,15 @@ weechat-aspell-config.c weechat-aspell-config.h
weechat-aspell-speller.c weechat-aspell-speller.h)
SET_TARGET_PROPERTIES(aspell PROPERTIES PREFIX "")
@@ -241,13 +241,13 @@ index ed3c408..5df5543 100644
+ ENDIF(ASPELL_FOUND)
+ENDIF(ENCHANT_FOUND)
- INSTALL(TARGETS aspell LIBRARY DESTINATION ${LIBDIR}/plugins)
+ INSTALL(TARGETS aspell LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/src/plugins/aspell/Makefile.am b/src/plugins/aspell/Makefile.am
-index b1bde9d..e5fedc5 100644
+index 61da155..48a82fc 100644
--- a/src/plugins/aspell/Makefile.am
+++ b/src/plugins/aspell/Makefile.am
-@@ -14,7 +14,7 @@
- # along with this program. If not, see <http://www.gnu.org/licenses/>.
+@@ -18,7 +18,7 @@
+ # along with WeeChat. If not, see <http://www.gnu.org/licenses/>.
#
-INCLUDES = -DLOCALEDIR=\"$(datadir)/locale\" $(ASPELL_CFLAGS)
@@ -255,7 +255,7 @@ index b1bde9d..e5fedc5 100644
libdir = ${weechat_libdir}/plugins
-@@ -27,6 +27,6 @@ aspell_la_SOURCES = weechat-aspell.c \
+@@ -31,6 +31,6 @@ aspell_la_SOURCES = weechat-aspell.c \
weechat-aspell-speller.c \
weechat-aspell-speller.h
aspell_la_LDFLAGS = -module
@@ -264,10 +264,10 @@ index b1bde9d..e5fedc5 100644
EXTRA_DIST = CMakeLists.txt
diff --git a/src/plugins/aspell/weechat-aspell-config.c b/src/plugins/aspell/weechat-aspell-config.c
-index 9f036be..5c11c56 100644
+index 927373b..2ef1c39 100644
--- a/src/plugins/aspell/weechat-aspell-config.c
+++ b/src/plugins/aspell/weechat-aspell-config.c
-@@ -210,7 +210,7 @@ weechat_aspell_config_dict_create_option (void *data,
+@@ -211,7 +211,7 @@ weechat_aspell_config_dict_create_option (void *data,
{
weechat_printf (NULL,
_("%s%s: error creating aspell dictionary \"%s\" => \"%s\""),
@@ -276,7 +276,7 @@ index 9f036be..5c11c56 100644
option_name, value);
}
else
-@@ -255,7 +255,7 @@ weechat_aspell_config_init ()
+@@ -256,7 +256,7 @@ weechat_aspell_config_init ()
{
struct t_config_section *ptr_section;
@@ -286,10 +286,10 @@ index 9f036be..5c11c56 100644
if (!weechat_aspell_config_file)
return 0;
diff --git a/src/plugins/aspell/weechat-aspell-config.h b/src/plugins/aspell/weechat-aspell-config.h
-index 295401d..28b1dc0 100644
+index fff053a..33c338d 100644
--- a/src/plugins/aspell/weechat-aspell-config.h
+++ b/src/plugins/aspell/weechat-aspell-config.h
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
#ifndef __WEECHAT_ASPELL_CONFIG_H
#define __WEECHAT_ASPELL_CONFIG_H 1
@@ -299,10 +299,10 @@ index 295401d..28b1dc0 100644
extern struct t_config_option *weechat_aspell_config_look_color;
diff --git a/src/plugins/aspell/weechat-aspell-speller.c b/src/plugins/aspell/weechat-aspell-speller.c
-index c68339b..2ec2b9d 100644
+index 42db115..d46c852 100644
--- a/src/plugins/aspell/weechat-aspell-speller.c
+++ b/src/plugins/aspell/weechat-aspell-speller.c
-@@ -32,6 +32,9 @@
+@@ -33,6 +33,9 @@
struct t_aspell_speller *weechat_aspell_spellers = NULL;
struct t_aspell_speller *last_weechat_aspell_speller = NULL;
@@ -312,7 +312,7 @@ index c68339b..2ec2b9d 100644
/*
* weechat_aspell_speller_exists: return 1 if an aspell dict exists for a lang,
-@@ -41,6 +44,9 @@ struct t_aspell_speller *last_weechat_aspell_speller = NULL;
+@@ -42,6 +45,9 @@ struct t_aspell_speller *last_weechat_aspell_speller = NULL;
int
weechat_aspell_speller_exists (const char *lang)
{
@@ -322,7 +322,7 @@ index c68339b..2ec2b9d 100644
struct AspellConfig *config;
AspellDictInfoList *list;
AspellDictInfoEnumeration *el;
-@@ -66,6 +72,7 @@ weechat_aspell_speller_exists (const char *lang)
+@@ -67,6 +73,7 @@ weechat_aspell_speller_exists (const char *lang)
delete_aspell_config (config);
return rc;
@@ -330,7 +330,7 @@ index c68339b..2ec2b9d 100644
}
/*
-@@ -92,7 +99,7 @@ weechat_aspell_speller_check_dictionaries (const char *dict_list)
+@@ -93,7 +100,7 @@ weechat_aspell_speller_check_dictionaries (const char *dict_list)
weechat_printf (NULL,
_("%s: warning: dictionary \"%s\" is not "
"available on your system"),
@@ -339,7 +339,7 @@ index c68339b..2ec2b9d 100644
}
}
weechat_string_free_split (argv);
-@@ -128,8 +135,12 @@ struct t_aspell_speller *
+@@ -129,8 +136,12 @@ struct t_aspell_speller *
weechat_aspell_speller_new (const char *lang)
{
struct t_aspell_speller *new_speller;
@@ -352,7 +352,7 @@ index c68339b..2ec2b9d 100644
if (!lang)
return NULL;
-@@ -138,9 +149,20 @@ weechat_aspell_speller_new (const char *lang)
+@@ -139,9 +150,20 @@ weechat_aspell_speller_new (const char *lang)
{
weechat_printf (NULL,
"%s: creating new speller for lang \"%s\"",
@@ -374,7 +374,7 @@ index c68339b..2ec2b9d 100644
/* create a speller instance for the newly created cell */
config = new_aspell_config();
aspell_config_replace (config, "lang", lang);
-@@ -151,24 +173,29 @@ weechat_aspell_speller_new (const char *lang)
+@@ -152,24 +174,29 @@ weechat_aspell_speller_new (const char *lang)
{
weechat_printf (NULL,
"%s%s: error: %s",
@@ -407,7 +407,7 @@ index c68339b..2ec2b9d 100644
new_speller->lang = strdup (lang);
/* add speller to list */
-@@ -180,8 +207,10 @@ weechat_aspell_speller_new (const char *lang)
+@@ -181,8 +208,10 @@ weechat_aspell_speller_new (const char *lang)
weechat_aspell_spellers = new_speller;
last_weechat_aspell_speller = new_speller;
@@ -418,7 +418,7 @@ index c68339b..2ec2b9d 100644
return new_speller;
}
-@@ -200,14 +229,18 @@ weechat_aspell_speller_free (struct t_aspell_speller *speller)
+@@ -201,14 +230,18 @@ weechat_aspell_speller_free (struct t_aspell_speller *speller)
{
weechat_printf (NULL,
"%s: removing speller for lang \"%s\"",
@@ -439,10 +439,10 @@ index c68339b..2ec2b9d 100644
if (speller->lang)
free (speller->lang);
diff --git a/src/plugins/aspell/weechat-aspell-speller.h b/src/plugins/aspell/weechat-aspell-speller.h
-index fbc7dcb..7b15666 100644
+index a6042a5..44284d3 100644
--- a/src/plugins/aspell/weechat-aspell-speller.h
+++ b/src/plugins/aspell/weechat-aspell-speller.h
-@@ -22,7 +22,11 @@
+@@ -23,7 +23,11 @@
struct t_aspell_speller
{
@@ -455,19 +455,19 @@ index fbc7dcb..7b15666 100644
struct t_aspell_speller *prev_speller; /* pointer to next speller */
diff --git a/src/plugins/aspell/weechat-aspell.c b/src/plugins/aspell/weechat-aspell.c
-index e62c141..d66751c 100644
+index c99fdba..7228c61 100644
--- a/src/plugins/aspell/weechat-aspell.c
+++ b/src/plugins/aspell/weechat-aspell.c
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
#include "weechat-aspell-speller.h"
-WEECHAT_PLUGIN_NAME(ASPELL_PLUGIN_NAME);
+WEECHAT_PLUGIN_NAME(SPELL_PLUGIN_NAME);
WEECHAT_PLUGIN_DESCRIPTION("Aspell plugin for WeeChat");
- WEECHAT_PLUGIN_AUTHOR("FlashCode <flashcode at flashtux.org>");
+ WEECHAT_PLUGIN_AUTHOR("Sebastien Helleu <flashcode at flashtux.org>");
WEECHAT_PLUGIN_VERSION(WEECHAT_VERSION);
-@@ -45,6 +45,10 @@ struct t_weechat_plugin *weechat_aspell_plugin = NULL;
+@@ -46,6 +46,10 @@ struct t_weechat_plugin *weechat_aspell_plugin = NULL;
char *aspell_last_modifier_string = NULL; /* last str. received by modifier */
char *aspell_last_modifier_result = NULL; /* last str. built by modifier */
@@ -478,7 +478,7 @@ index e62c141..d66751c 100644
/* aspell supported langs (updated on of 2008-10-17) */
struct t_aspell_code langs_avail[] =
{
-@@ -254,10 +258,10 @@ weechat_aspell_set_dict (struct t_gui_buffer *buffer, const char *value)
+@@ -255,10 +259,10 @@ weechat_aspell_set_dict (struct t_gui_buffer *buffer, const char *value)
{
if (value && value[0])
weechat_printf (NULL, "%s: \"%s\" => %s",
@@ -491,7 +491,7 @@ index e62c141..d66751c 100644
}
free (name);
-@@ -396,6 +400,55 @@ weechat_aspell_iso_to_country (const char *code)
+@@ -397,6 +401,55 @@ weechat_aspell_iso_to_country (const char *code)
return strdup ("Unknown");
}
@@ -547,7 +547,7 @@ index e62c141..d66751c 100644
/*
* weechat_aspell_speller_list_dicts: list all aspell dict installed on system
* and display them
-@@ -404,6 +457,7 @@ weechat_aspell_iso_to_country (const char *code)
+@@ -405,6 +458,7 @@ weechat_aspell_iso_to_country (const char *code)
void
weechat_aspell_speller_list_dicts ()
{
@@ -555,7 +555,7 @@ index e62c141..d66751c 100644
char *country, *lang, *pos;
char buffer[192];
struct AspellConfig *config;
-@@ -414,13 +468,18 @@ weechat_aspell_speller_list_dicts ()
+@@ -415,13 +469,18 @@ weechat_aspell_speller_list_dicts ()
config = new_aspell_config();
list = get_aspell_dict_info_list (config);
el = aspell_dict_info_list_elements (list);
@@ -565,7 +565,7 @@ index e62c141..d66751c 100644
+
weechat_printf (NULL, "");
weechat_printf (NULL,
-- /* TRANSLATORS: %s is "aspell" */
+- /* TRANSLATORS: "%s" is "aspell" */
+ /* TRANSLATORS: %s is "spell" */
_( "%s dictionaries list:"),
- ASPELL_PLUGIN_NAME);
@@ -578,7 +578,7 @@ index e62c141..d66751c 100644
while ((dict = aspell_dict_info_enumeration_next (el)))
{
country = NULL;
-@@ -473,6 +532,7 @@ weechat_aspell_speller_list_dicts ()
+@@ -474,6 +533,7 @@ weechat_aspell_speller_list_dicts ()
delete_aspell_dict_info_enumeration (el);
delete_aspell_config (config);
@@ -586,7 +586,7 @@ index e62c141..d66751c 100644
}
/*
-@@ -493,7 +553,7 @@ weechat_aspell_add_word (const char *lang, const char *word)
+@@ -494,7 +554,7 @@ weechat_aspell_add_word (const char *lang, const char *word)
weechat_printf (NULL,
_("%s: error: dictionary \"%s\" is not "
"available on your system"),
@@ -595,7 +595,7 @@ index e62c141..d66751c 100644
return;
}
new_speller = weechat_aspell_speller_new (lang);
-@@ -502,21 +562,25 @@ weechat_aspell_add_word (const char *lang, const char *word)
+@@ -503,21 +563,25 @@ weechat_aspell_add_word (const char *lang, const char *word)
ptr_speller = new_speller;
}
@@ -623,7 +623,7 @@ index e62c141..d66751c 100644
if (new_speller)
weechat_aspell_speller_free (new_speller);
-@@ -647,7 +711,11 @@ weechat_aspell_check_word (struct t_gui_buffer *buffer, const char *word)
+@@ -648,7 +712,11 @@ weechat_aspell_check_word (struct t_gui_buffer *buffer, const char *word)
for (ptr_speller = weechat_aspell_spellers; ptr_speller;
ptr_speller = ptr_speller->next_speller)
{
@@ -635,7 +635,7 @@ index e62c141..d66751c 100644
{
rc = 1;
break;
-@@ -876,7 +944,7 @@ weechat_aspell_command_cb (void *data, struct t_gui_buffer *buffer,
+@@ -877,7 +945,7 @@ weechat_aspell_command_cb (void *data, struct t_gui_buffer *buffer,
_("%s%s: no dictionary on this buffer for "
"adding word"),
weechat_prefix ("error"),
@@ -644,7 +644,7 @@ index e62c141..d66751c 100644
}
else if (weechat_aspell_spellers->next_speller)
{
-@@ -884,7 +952,7 @@ weechat_aspell_command_cb (void *data, struct t_gui_buffer *buffer,
+@@ -885,7 +953,7 @@ weechat_aspell_command_cb (void *data, struct t_gui_buffer *buffer,
_("%s%s: many dictionaries are defined for "
"this buffer, please specify dictionary"),
weechat_prefix ("error"),
@@ -653,7 +653,7 @@ index e62c141..d66751c 100644
}
else
weechat_aspell_add_word (weechat_aspell_spellers->lang,
-@@ -951,6 +1019,13 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
+@@ -952,6 +1020,13 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
(void) argv;
weechat_plugin = plugin;
@@ -667,7 +667,7 @@ index e62c141..d66751c 100644
if (!weechat_aspell_config_init ())
return WEECHAT_RC_ERROR;
-@@ -958,26 +1033,26 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
+@@ -959,26 +1034,26 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
if (weechat_aspell_config_read () < 0)
return WEECHAT_RC_ERROR;
@@ -703,7 +703,7 @@ index e62c141..d66751c 100644
&weechat_aspell_completion_langs_cb, NULL);
/* callback for buffer_switch */
-@@ -987,7 +1062,8 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
+@@ -988,7 +1063,8 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
/* callback for spell checking input text */
weechat_hook_modifier ("input_text_display",
&weechat_aspell_modifier_cb, NULL);
@@ -713,7 +713,7 @@ index e62c141..d66751c 100644
weechat_aspell_create_spellers (weechat_current_buffer ());
return WEECHAT_RC_OK;
-@@ -1013,6 +1089,11 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
+@@ -1014,6 +1090,11 @@ weechat_plugin_end (struct t_weechat_plugin *plugin)
free (aspell_last_modifier_result);
weechat_aspell_config_free ();
@@ -726,10 +726,10 @@ index e62c141..d66751c 100644
return WEECHAT_RC_OK;
}
diff --git a/src/plugins/aspell/weechat-aspell.h b/src/plugins/aspell/weechat-aspell.h
-index 27018b9..b676926 100644
+index d159287..4b3a5ef 100644
--- a/src/plugins/aspell/weechat-aspell.h
+++ b/src/plugins/aspell/weechat-aspell.h
-@@ -20,10 +20,14 @@
+@@ -21,10 +21,14 @@
#ifndef __WEECHAT_ASPELL_H
#define __WEECHAT_ASPELL_H 1
diff --git a/weechat.spec b/weechat.spec
index 9d47dfd..4c0d17f 100644
--- a/weechat.spec
+++ b/weechat.spec
@@ -1,7 +1,7 @@
Name: weechat
Summary: Portable, fast, light and extensible IRC client
-Version: 0.3.2
-Release: 3%{?dist}
+Version: 0.3.3
+Release: 1%{?dist}
Source: http://weechat.org/files/src/%{name}-%{version}.tar.bz2
Patch0: weechat-cmake-paths.patch
Patch1: weechat-cmake-pie.patch
@@ -33,9 +33,9 @@ This package contains include files and pc file for weechat.
%prep
%setup -q -n %{name}-%{version}
-%patch0 -p1 -F 2
+%patch0 -p1
%patch1 -p1
-%patch2 -p1 -F 2
+%patch2 -p1
%build
%cmake .
@@ -70,12 +70,12 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/*.pc
%changelog
-<<<<<<< HEAD
+* Wed Aug 25 2010 Paul P. Komkoff Jr <i at stingr.net> - 0.3.3-1
+- new upstream version
+
* Tue Jul 27 2010 David Malcolm <dmalcolm at redhat.com> - 0.3.2-3
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-=======
->>>>>>> origin/el6/master
* Fri May 7 2010 Paul P. Komkoff Jr <i at stingr.net> - 0.3.2-2
- spec file fix
More information about the scm-commits
mailing list