[weechat: 1/2] 0.3.6-1
Paul Komkoff
stingray at fedoraproject.org
Wed Jan 18 13:21:37 UTC 2012
commit a8224d53248c60f152516e499ae33f75541d5140
Author: Paul P. Komkoff <i at stingr.net>
Date: Wed Jan 18 17:20:27 2012 +0400
0.3.6-1
weechat-combined.patch | 138 +++++++++++-------------------------------------
weechat.spec | 7 ++-
2 files changed, 37 insertions(+), 108 deletions(-)
---
diff --git a/weechat-combined.patch b/weechat-combined.patch
index 0dcf136..08f1703 100644
--- a/weechat-combined.patch
+++ b/weechat-combined.patch
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0e04ebc..c60105b 100644
+index 71d66fe..27d1073 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -37,27 +37,13 @@ SET(VERSION_PATCH "5")
+@@ -37,27 +37,13 @@ SET(VERSION_PATCH "6")
SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
SET(LICENSE "GPL3")
SET(PKG_STRING "${PROJECT_NAME} ${VERSION}")
@@ -35,15 +35,6 @@ index 0e04ebc..c60105b 100644
OPTION(ENABLE_NCURSES "Enable Ncurses interface" ON)
OPTION(ENABLE_GTK "Enable GTK interface" OFF)
-@@ -66,7 +52,7 @@ OPTION(ENABLE_GCRYPT "Enable libgcrypt support" ON)
- OPTION(ENABLE_GNUTLS "Enable SSLv3/TLS support" ON)
- OPTION(ENABLE_LARGEFILE "Enable Large File Support" ON)
- OPTION(ENABLE_ALIAS "Enable Alias plugin" ON)
--OPTION(ENABLE_ASPELL "Enable Aspell plugin" ON)
-+OPTION(ENABLE_SPELL "Enable Spell plugin" ON)
- OPTION(ENABLE_CHARSET "Enable Charset plugin" ON)
- OPTION(ENABLE_DEMO "Enable Demo plugin" OFF)
- OPTION(ENABLE_FIFO "Enable FIFO plugin" ON)
@@ -114,10 +100,10 @@ ADD_CUSTOM_TARGET(dist
SET(PACKAGE "${PROJECT_NAME}")
SET(prefix "${CMAKE_INSTALL_PREFIX}")
@@ -120,54 +111,33 @@ index 0000000..9c13c48
+
+endif (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES)
diff --git a/configure.in b/configure.in
-index 2454c0f..ceb62c8 100644
+index 0a73c7c..3b605b5 100644
--- a/configure.in
+++ b/configure.in
-@@ -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])
--AH_VERBATIM([PLUGIN_ASPELL], [#undef PLUGIN_ASPELL])
-+AH_VERBATIM([PLUGIN_SPELL], [#undef PLUGIN_SPELL])
- AH_VERBATIM([PLUGIN_CHARSET], [#undef PLUGIN_CHARSET])
- AH_VERBATIM([PLUGIN_DEMO], [#undef PLUGIN_DEMO])
- AH_VERBATIM([PLUGIN_FIFO], [#undef PLUGIN_FIFO])
-@@ -133,7 +133,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)
--AC_ARG_ENABLE(aspell, [ --disable-aspell turn off Aspell plugin (default=compiled)],enable_aspell=$enableval,enable_aspell=yes)
-+AC_ARG_ENABLE(spell, [ --disable-spell turn off Spell plugin (default=compiled)],enable_spell=$enableval,enable_spell=yes)
- 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)
-@@ -310,36 +310,41 @@ else
- not_asked="$not_asked alias"
- fi
-
--# ---------------------------------- aspell ------------------------------------
-+# ---------------------------------- spelling ----------------------------------
-
--if test "x$enable_aspell" = "xyes" ; then
+@@ -314,24 +314,29 @@ fi
+ # ---------------------------------- aspell ------------------------------------
+
+ if test "x$enable_aspell" = "xyes" ; then
- ASPELL_CFLAGS=""
- ASPELL_LFLAGS=""
-+if test "x$enable_spell" = "xyes" ; then
+-
+- AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
+- AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
+-
+- AC_MSG_CHECKING(for aspell headers and librairies)
+- if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
+- AC_MSG_RESULT(no)
+- AC_MSG_WARN([
+ # Check ENCHANT is available
+ PKG_CHECK_MODULES(ENCHANT, [enchant], [CFLAGS="$CFLAGS -DUSE_ENCHANT"],
+ # otherwise Check ASPELL is available
+ [
+ ASPELL_CFLAGS=""
+ ASPELL_LFLAGS=""
-
-- AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
-- AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
++
+ AC_CHECK_HEADER(aspell.h,ac_found_aspell_header="yes",ac_found_aspell_header="no")
+ AC_CHECK_LIB(aspell,new_aspell_speller,ac_found_aspell_lib="yes",ac_found_aspell_lib="no")
-
-- AC_MSG_CHECKING(for aspell headers and librairies)
-- if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
-- AC_MSG_RESULT(no)
-- AC_MSG_WARN([
++
+ AC_MSG_CHECKING(for aspell headers and librairies)
+ if test "x$ac_found_aspell_header" = "xno" -o "x$ac_found_aspell_lib" = "xno" ; then
+ AC_MSG_RESULT(no)
@@ -180,49 +150,17 @@ index 2454c0f..ceb62c8 100644
- else
- AC_MSG_RESULT(yes)
- ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
-+ enable_spell="no"
-+ not_found="$not_found spell"
++ enable_aspell="no"
++ not_found="$not_found aspell"
+ else
+ AC_MSG_RESULT(yes)
+ ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell"
+ fi
fi
else
-- not_asked="$not_asked aspell"
-+ not_asked="$not_asked spell"
- fi
-
--if test "x$enable_aspell" = "xyes" ; then
-+if test "x$enable_spell" = "xyes" ; then
- AC_SUBST(ASPELL_CFLAGS)
- AC_SUBST(ASPELL_LFLAGS)
-- AC_DEFINE(PLUGIN_ASPELL)
-+ AC_DEFINE(PLUGIN_SPELL)
- fi
-
- # --------------------------------- charset ------------------------------------
-@@ -989,7 +994,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")
--AM_CONDITIONAL(PLUGIN_ASPELL, test "$enable_aspell" = "yes")
-+AM_CONDITIONAL(PLUGIN_SPELL, test "$enable_spell" = "yes")
- AM_CONDITIONAL(PLUGIN_CHARSET, test "$enable_charset" = "yes")
- AM_CONDITIONAL(PLUGIN_DEMO, test "$enable_demo" = "yes")
- AM_CONDITIONAL(PLUGIN_FIFO, test "$enable_fifo" = "yes")
-@@ -1069,8 +1074,8 @@ listplugins=""
- if test "x$enable_alias" = "xyes"; then
- listplugins="$listplugins alias"
- fi
--if test "x$enable_aspell" = "xyes"; then
-- listplugins="$listplugins aspell"
-+if test "x$enable_spell" = "xyes"; then
-+ listplugins="$listplugins spell"
- fi
- if test "x$enable_charset" = "xyes"; then
- listplugins="$listplugins charset"
+ not_asked="$not_asked aspell"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index db86c86..bac026d 100644
+index 7b806b4..2be152b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,6 +23,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
@@ -230,10 +168,10 @@ index db86c86..bac026d 100644
INCLUDE(CheckIncludeFiles)
INCLUDE(CheckFunctionExists)
+INCLUDE(CheckCCompilerFlag)
+ INCLUDE(CheckSymbolExists)
CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H)
- CHECK_INCLUDE_FILES("limits.h" HAVE_LIMITS_H)
-@@ -66,6 +67,13 @@ CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO)
+@@ -67,6 +68,14 @@ CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO)
CHECK_INCLUDE_FILES("regex.h" HAVE_REGEX_H)
CHECK_FUNCTION_EXISTS(regexec HAVE_REGEXEC)
@@ -244,14 +182,15 @@ index db86c86..bac026d 100644
+else(HAVE_FPIE_SUPPORT)
+ message(STATUS "Your compiler doesn't support PIE flag")
+endif(HAVE_FPIE_SUPPORT)
++
+ CHECK_SYMBOL_EXISTS("eat_newline_glitch" "term.h" HAVE_EAT_NEWLINE_GLITCH)
- #needs to be splitted in subdirectories
- # FIXME: weechat_gui_common MUST be the first lib in the list
+ # weechat_gui_common MUST be the first lib in the list
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 7b4fdfd..8ea0f29 100644
+index 5b9e3d0..03125cc 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
-@@ -41,6 +41,8 @@ wee-upgrade-file.c wee-upgrade-file.h
+@@ -42,6 +42,8 @@ wee-upgrade-file.c wee-upgrade-file.h
wee-utf8.c wee-utf8.h
wee-util.c wee-util.h)
@@ -261,10 +200,10 @@ index 7b4fdfd..8ea0f29 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 1096280..08aeb2d 100644
+index 5b04524..ca5345d 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
-@@ -36,6 +36,11 @@ gui-main.h
+@@ -39,6 +39,11 @@ gui-mouse.c gui-mouse.h
gui-nicklist.c gui-nicklist.h
gui-window.c gui-window.h)
@@ -277,7 +216,7 @@ index 1096280..08aeb2d 100644
ADD_LIBRARY(weechat_gui_common STATIC ${LIB_GUI_COMMON_SRC})
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
-index e884731..9cc1849 100644
+index e884731..f85b7a9 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -27,6 +27,11 @@ plugin-config.h plugin-config.c)
@@ -300,7 +239,7 @@ index e884731..9cc1849 100644
- # Check for aspell libraries
- FIND_PACKAGE(Aspell)
- IF(ASPELL_FOUND)
-+IF(NOT DISABLE_SPELL)
++IF(NOT DISABLE_ASPELL)
+ # Check for enchant libraries
+ FIND_PACKAGE(ENCHANT)
+ IF(ENCHANT_FOUND)
@@ -314,23 +253,10 @@ index e884731..9cc1849 100644
+ ADD_SUBDIRECTORY( aspell )
+ ENDIF(ASPELL_FOUND)
+ ENDIF(ENCHANT_FOUND)
-+ENDIF(NOT DISABLE_SPELL)
++ENDIF(NOT DISABLE_ASPELL)
IF(ENABLE_CHARSET)
# Check for iconv support.
-diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
-index 63e392d..aae2bcc 100644
---- a/src/plugins/Makefile.am
-+++ b/src/plugins/Makefile.am
-@@ -34,7 +34,7 @@ if PLUGIN_ALIAS
- alias_dir = alias
- endif
-
--if PLUGIN_ASPELL
-+if PLUGIN_SPELL
- aspell_dir = aspell
- endif
-
diff --git a/src/plugins/alias/CMakeLists.txt b/src/plugins/alias/CMakeLists.txt
index 2995719..5694627 100644
--- a/src/plugins/alias/CMakeLists.txt
diff --git a/weechat.spec b/weechat.spec
index e125456..95a14ee 100644
--- a/weechat.spec
+++ b/weechat.spec
@@ -1,7 +1,7 @@
Name: weechat
Summary: Portable, fast, light and extensible IRC client
-Version: 0.3.5
-Release: 2%{?dist}
+Version: 0.3.6
+Release: 1%{?dist}
Source: http://weechat.org/files/src/%{name}-%{version}.tar.bz2
Patch0: weechat-combined.patch
URL: http://weechat.org
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/*.pc
%changelog
+* Wed Jan 18 2012 Paul P. Komkoff Jr <i at stingr.net> - 0.3.6-1
+- new upstream version
+
* Thu Nov 10 2011 Paul P. Komkoff Jr <i at stingr.net> - 0.3.5-2
- rebuilt
More information about the scm-commits
mailing list