scm-commits November 2012

scm-commits@lists.fedoraproject.org

455 participants
15356 discussions

[monit/f17] Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
by Maxim Burgerhout 30 Nov '12

30 Nov '12

Summary of changes: 6ebee89... Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_R (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[weechat] weechat-0.3.9.2-1
by Paul Komkoff 30 Nov '12

30 Nov '12

commit 6ff05c4348870a46418cd0852df088888eabb6f6 Author: Paul P. Komkoff <i(a)stingr.net> Date: Sat Dec 1 01:03:47 2012 +0400 weechat-0.3.9.2-1 .gitignore | 1 + sources | 2 +- weechat-combined.patch | 260 ++++++++++++++++++++++++++++------------------- weechat-fix-0.patch | 142 -------------------------- weechat-fix-1.patch | 264 ------------------------------------------------ weechat.spec | 11 +- 6 files changed, 163 insertions(+), 517 deletions(-) --- diff --git a/.gitignore b/.gitignore index 88b011a..d7ae403 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /weechat-0.3.6.tar.bz2 /weechat-0.3.7.tar.bz2 /weechat-0.3.8.tar.bz2 +/weechat-0.3.9.2.tar.bz2 diff --git a/sources b/sources index bc4cca9..f424912 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c07047eca33c176df25e94964bdec7bf weechat-0.3.8.tar.bz2 +636e96a62e60155f3b9769905d9912b9 weechat-0.3.9.2.tar.bz2 diff --git a/weechat-combined.patch b/weechat-combined.patch index 1ff3bcb..73714dd 100644 --- a/weechat-combined.patch +++ b/weechat-combined.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 168659a..a1b3d66 100644 +index de9d8e5..d7830ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -37,27 +37,13 @@ SET(VERSION_PATCH "7") +@@ -37,31 +37,17 @@ SET(VERSION_PATCH "9.2") SET(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) SET(LICENSE "GPL3") SET(PKG_STRING "${PROJECT_NAME} ${VERSION}") @@ -15,10 +15,17 @@ index 168659a..a1b3d66 100644 -ENDIF(DEFINED LIBDIR) -IF(NOT DEFINED SHAREDIR) -+SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${PROJECT_NAME}) - SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share) +- SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share) -ENDIF(NOT DEFINED SHAREDIR) -- ++SET(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${PROJECT_NAME}) ++SET(SHAREDIR ${CMAKE_INSTALL_PREFIX}/share) ++SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) ++SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}) + + IF(NOT DEFINED MANDIR) + SET(MANDIR ${SHAREDIR}/man) + ENDIF(NOT DEFINED MANDIR) + -IF(NOT DEFINED LOCALEDIR) - SET(LOCALEDIR ${SHAREDIR}/locale) -ENDIF(NOT DEFINED LOCALEDIR) @@ -26,15 +33,13 @@ index 168659a..a1b3d66 100644 -IF(DEFINED INCLUDEDIR) - SET(INCLUDEDIR ${INCLUDEDIR}/${PROJECT_NAME}) -ELSE(DEFINED INCLUDEDIR) -+SET(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale) - SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}) +- SET(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}) -ENDIF(DEFINED INCLUDEDIR) -+ +STRING(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING}) - OPTION(ENABLE_NCURSES "Enable Ncurses interface" ON) - OPTION(ENABLE_GTK "Enable GTK interface" OFF) -@@ -125,10 +111,10 @@ ADD_CUSTOM_TARGET(dist + OPTION(ENABLE_NCURSES "Enable Ncurses interface" ON) + OPTION(ENABLE_GTK "Enable GTK interface" OFF) +@@ -128,10 +114,10 @@ ADD_CUSTOM_TARGET(dist SET(PACKAGE "${PROJECT_NAME}") SET(prefix "${CMAKE_INSTALL_PREFIX}") SET(exec_prefix "\${prefix}") @@ -110,33 +115,59 @@ index 0000000..9c13c48 + +endif (ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) diff --git a/configure.in b/configure.in -index b5deac6..50e4b0d 100644 +index 7edeb6a..541230d 100644 --- a/configure.in +++ b/configure.in -@@ -295,6 +295,10 @@ fi +@@ -293,24 +293,29 @@ fi # ---------------------------------- aspell ------------------------------------ if test "x$enable_aspell" = "xyes" ; then +- 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_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="" - -@@ -314,6 +318,7 @@ if test "x$enable_aspell" = "xyes" ; then - AC_MSG_RESULT(yes) - ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell" ++ 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_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([ + *** Aspell headers and/or libraries couldn't be found on your system. + *** Try to install them with your software package manager. + *** WeeChat will be built without Aspell support.]) +- enable_aspell="no" +- not_found="$not_found aspell" +- else +- AC_MSG_RESULT(yes) +- ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell" ++ enable_aspell="no" ++ not_found="$not_found aspell" ++ else ++ AC_MSG_RESULT(yes) ++ ASPELL_LFLAGS="$ASPELL_LFLAGS -laspell" ++ fi fi -+ fi else not_asked="$not_asked aspell" - fi diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index e6cc903..cd89010 100644 +index 8c4f316..d8beb76 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -29,6 +29,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H) +@@ -32,6 +32,7 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H) INCLUDE(CheckIncludeFiles) INCLUDE(CheckFunctionExists) @@ -144,7 +175,7 @@ index e6cc903..cd89010 100644 INCLUDE(CheckSymbolExists) CHECK_INCLUDE_FILES("arpa/inet.h" HAVE_ARPA_INET_H) -@@ -70,6 +71,14 @@ CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO) +@@ -74,6 +75,14 @@ CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO) CHECK_INCLUDE_FILES("regex.h" HAVE_REGEX_H) CHECK_FUNCTION_EXISTS(regexec HAVE_REGEXEC) @@ -189,38 +220,41 @@ index e0d7ba6..7da79d2 100644 ADD_LIBRARY(weechat_gui_common STATIC ${LIB_GUI_COMMON_SRC}) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt -index b7377f5..15bd98d 100644 +index cb5d705..23b974c 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt -@@ -27,6 +27,11 @@ plugin-config.h plugin-config.c) - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) - ADD_LIBRARY(weechat_plugins STATIC ${LIB_PLUGINS_SRC}) +@@ -34,6 +34,10 @@ ADD_LIBRARY(weechat_plugins STATIC ${LIB_PLUGINS_SRC}) + ADD_DEFINITIONS(${CMAKE_SHARED_LIBRARY_C_FLAGS}) + ADD_LIBRARY(weechat_plugins_scripts STATIC ${LIB_PLUGINS_SCRIPTS_SRC}) +SET_TARGET_PROPERTIES(weechat_plugins + PROPERTIES COMPILE_FLAGS "${WEECHAT_PIE_CFLAGS}") + +SET(PLUGIN_INSTALL_DIR lib${LIB_SUFFIX}/${PROJECT_NAME}/plugins) -+ + INCLUDE(CheckIncludeFiles) INCLUDE(CheckFunctionExists) - INCLUDE(CheckLibraryExists) -@@ -35,13 +40,19 @@ IF(ENABLE_ALIAS) +@@ -43,13 +47,19 @@ IF(ENABLE_ALIAS) ADD_SUBDIRECTORY( alias ) ENDIF(ENABLE_ALIAS) -IF(ENABLE_ASPELL) +- # Check for aspell libraries +- FIND_PACKAGE(Aspell) +- IF(ASPELL_FOUND) +IF(NOT DISABLE_ASPELL) + # Check for enchant libraries + FIND_PACKAGE(ENCHANT) + IF(ENCHANT_FOUND) -+ ADD_SUBDIRECTORY( aspell ) -+ ELSE(ENCHANT_FOUND) - # Check for aspell libraries - FIND_PACKAGE(Aspell) - IF(ASPELL_FOUND) ADD_SUBDIRECTORY( aspell ) - ENDIF(ASPELL_FOUND) +- ENDIF(ASPELL_FOUND) -ENDIF(ENABLE_ASPELL) ++ ELSE(ENCHANT_FOUND) ++ # Check for aspell libraries ++ FIND_PACKAGE(Aspell) ++ IF(ASPELL_FOUND) ++ ADD_SUBDIRECTORY( aspell ) ++ ENDIF(ASPELL_FOUND) + ENDIF(ENCHANT_FOUND) +ENDIF(NOT DISABLE_ASPELL) @@ -244,15 +278,19 @@ index 787194d..8676c70 100644 weechat-aspell-speller.c weechat-aspell-speller.h) SET_TARGET_PROPERTIES(aspell PROPERTIES PREFIX "") +-IF(ASPELL_FOUND) +- INCLUDE_DIRECTORIES(${ASPELL_INCLUDE_PATH}) +- TARGET_LINK_LIBRARIES(aspell ${ASPELL_LIBRARY}) +-ENDIF(ASPELL_FOUND) +IF(ENCHANT_FOUND) + INCLUDE_DIRECTORIES(${ENCHANT_INCLUDE_DIR}) + TARGET_LINK_LIBRARIES(aspell ${ENCHANT_LIBRARIES}) + ADD_DEFINITIONS(-DUSE_ENCHANT) +ELSE(ENCHANT_FOUND) - IF(ASPELL_FOUND) - INCLUDE_DIRECTORIES(${ASPELL_INCLUDE_PATH}) - TARGET_LINK_LIBRARIES(aspell ${ASPELL_LIBRARY}) - ENDIF(ASPELL_FOUND) ++ IF(ASPELL_FOUND) ++ INCLUDE_DIRECTORIES(${ASPELL_INCLUDE_PATH}) ++ TARGET_LINK_LIBRARIES(aspell ${ASPELL_LIBRARY}) ++ ENDIF(ASPELL_FOUND) +ENDIF(ENCHANT_FOUND) -INSTALL(TARGETS aspell LIBRARY DESTINATION ${LIBDIR}/plugins) @@ -310,7 +348,7 @@ index b5cbbd4..47ab2c1 100644 } /* -@@ -129,9 +136,13 @@ struct t_aspell_speller * +@@ -129,10 +136,14 @@ struct t_aspell_speller * weechat_aspell_speller_new (const char *lang) { struct t_aspell_speller *new_speller; @@ -320,14 +358,18 @@ index b5cbbd4..47ab2c1 100644 AspellConfig *config; AspellCanHaveError *ret; struct t_infolist *infolist; +- +#endif - ++ if (!lang) return NULL; -@@ -143,6 +154,17 @@ weechat_aspell_speller_new (const char *lang) + +@@ -142,7 +153,18 @@ weechat_aspell_speller_new (const char *lang) + "%s: creating new speller for lang \"%s\"", ASPELL_PLUGIN_NAME, lang); } - +- ++ +#ifdef USE_ENCHANT + ret = enchant_broker_request_dict (broker, lang); + if (!ret) @@ -350,10 +392,12 @@ index b5cbbd4..47ab2c1 100644 /* create and add a new speller cell */ new_speller = malloc (sizeof (*new_speller)); -@@ -183,7 +206,11 @@ weechat_aspell_speller_new (const char *lang) +@@ -182,8 +205,12 @@ weechat_aspell_speller_new (const char *lang) + weechat_prefix ("error"), ASPELL_PLUGIN_NAME); return NULL; } - +- ++ +#ifdef USE_ENCHANT + new_speller->speller = ret; +#else @@ -362,17 +406,21 @@ index b5cbbd4..47ab2c1 100644 new_speller->lang = strdup (lang); /* add speller to list */ -@@ -195,8 +222,10 @@ weechat_aspell_speller_new (const char *lang) +@@ -194,10 +221,12 @@ weechat_aspell_speller_new (const char *lang) + else weechat_aspell_spellers = new_speller; last_weechat_aspell_speller = new_speller; - +- ++ +#ifndef USE_ENCHANT /* free config */ delete_aspell_config (config); +- +#endif - ++ return new_speller; } + @@ -221,8 +250,12 @@ weechat_aspell_speller_free (struct t_aspell_speller *speller) /* free data */ if (speller->speller) @@ -403,10 +451,10 @@ index 5be2f7d..da36e52 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 c4817a2..0ff516a 100644 +index d0e08f8..df2e97c 100644 --- a/src/plugins/aspell/weechat-aspell.c +++ b/src/plugins/aspell/weechat-aspell.c -@@ -48,6 +48,10 @@ struct t_gui_buffer *aspell_buffer_spellers = NULL; +@@ -49,6 +49,10 @@ struct t_gui_buffer *aspell_buffer_spellers = NULL; char *aspell_last_modifier_string = NULL; /* last str. received by modifier */ char *aspell_last_modifier_result = NULL; /* last str. built by modifier */ @@ -414,10 +462,10 @@ index c4817a2..0ff516a 100644 +EnchantBroker *broker; +#endif + - /* aspell supported langs (updated on of 2008-10-17) */ - struct t_aspell_code aspell_langs_avail[] = - { -@@ -386,6 +390,55 @@ weechat_aspell_iso_to_country (const char *code) + /* + * aspell supported langs, updated on 2012-07-05 + * URL: ftp://ftp.gnu.org/gnu/aspell/dict/0index.html +@@ -396,6 +400,55 @@ weechat_aspell_iso_to_country (const char *code) return strdup ("Unknown"); } @@ -473,7 +521,7 @@ index c4817a2..0ff516a 100644 /* * weechat_aspell_speller_list_dicts: list all aspell dict installed on system * and display them -@@ -394,6 +447,7 @@ weechat_aspell_iso_to_country (const char *code) +@@ -404,6 +457,7 @@ weechat_aspell_iso_to_country (const char *code) void weechat_aspell_speller_list_dicts () { @@ -481,15 +529,16 @@ index c4817a2..0ff516a 100644 char *country, *lang, *pos; char buffer[192]; struct AspellConfig *config; -@@ -404,6 +458,7 @@ weechat_aspell_speller_list_dicts () +@@ -414,13 +468,17 @@ weechat_aspell_speller_list_dicts () config = new_aspell_config(); list = get_aspell_dict_info_list (config); el = aspell_dict_info_list_elements (list); +- +#endif - ++ weechat_printf (NULL, ""); weechat_printf (NULL, -@@ -411,6 +466,9 @@ weechat_aspell_speller_list_dicts () + /* TRANSLATORS: "%s" is "aspell" */ _( "%s dictionaries list:"), ASPELL_PLUGIN_NAME); @@ -499,7 +548,7 @@ index c4817a2..0ff516a 100644 while ((dict = aspell_dict_info_enumeration_next (el))) { country = NULL; -@@ -463,6 +521,7 @@ weechat_aspell_speller_list_dicts () +@@ -473,6 +531,7 @@ weechat_aspell_speller_list_dicts () delete_aspell_dict_info_enumeration (el); delete_aspell_config (config); @@ -507,7 +556,7 @@ index c4817a2..0ff516a 100644 } /* -@@ -492,6 +551,9 @@ weechat_aspell_add_word (const char *lang, const char *word) +@@ -502,6 +561,9 @@ weechat_aspell_add_word (const char *lang, const char *word) ptr_speller = new_speller; } @@ -517,15 +566,17 @@ index c4817a2..0ff516a 100644 if (aspell_speller_add_to_personal (ptr_speller->speller, word, strlen (word)) == 1) -@@ -507,6 +569,7 @@ weechat_aspell_add_word (const char *lang, const char *word) +@@ -517,7 +579,8 @@ weechat_aspell_add_word (const char *lang, const char *word) "dictionary"), weechat_prefix ("error"), ASPELL_PLUGIN_NAME); } +- +#endif - ++ if (new_speller) weechat_aspell_speller_free (new_speller); -@@ -620,7 +683,11 @@ weechat_aspell_check_word (struct t_gui_buffer *buffer, const char *word) + } +@@ -630,7 +693,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) { @@ -537,7 +588,7 @@ index c4817a2..0ff516a 100644 { rc = 1; break; -@@ -960,6 +1027,13 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) +@@ -1042,6 +1109,13 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[]) weechat_plugin = plugin; @@ -551,7 +602,7 @@ index c4817a2..0ff516a 100644 if (!weechat_aspell_config_init ()) return WEECHAT_RC_ERROR; -@@ -1026,5 +1100,10 @@ weechat_plugin_end (struct t_weechat_plugin *plugin) +@@ -1119,5 +1193,10 @@ weechat_plugin_end (struct t_weechat_plugin *plugin) weechat_aspell_config_free (); @@ -563,17 +614,18 @@ index c4817a2..0ff516a 100644 return WEECHAT_RC_OK; } diff --git a/src/plugins/aspell/weechat-aspell.h b/src/plugins/aspell/weechat-aspell.h -index 4af0fcd..92e29ca 100644 +index 3c95074..5a4f174 100644 --- a/src/plugins/aspell/weechat-aspell.h +++ b/src/plugins/aspell/weechat-aspell.h @@ -21,7 +21,11 @@ #ifndef __WEECHAT_ASPELL_H #define __WEECHAT_ASPELL_H 1 +-#include <aspell.h> +#ifdef USE_ENCHANT +# include <enchant.h> +#else - #include <aspell.h> ++# include <aspell.h> +#endif #define weechat_plugin weechat_aspell_plugin @@ -609,10 +661,10 @@ index 55fc505..8f204f3 100644 -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 0601cae..0a51020 100644 +index 978e2b0..bd30635 100644 --- a/src/plugins/irc/CMakeLists.txt +++ b/src/plugins/irc/CMakeLists.txt -@@ -58,4 +58,4 @@ ENDIF(GCRYPT_FOUND) +@@ -56,4 +56,4 @@ LIST(APPEND LINK_LIBS ${GCRYPT_LDFLAGS}) TARGET_LINK_LIBRARIES(irc ${LINK_LIBS}) @@ -628,60 +680,60 @@ index 3650b70..29f96f2 100644 -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 19ac753..4011fe1 100644 ---- a/src/plugins/relay/CMakeLists.txt -+++ b/src/plugins/relay/CMakeLists.txt -@@ -42,4 +42,4 @@ ENDIF(ZLIB_FOUND) - - TARGET_LINK_LIBRARIES(relay ${LINK_LIBS}) - --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 7981a8b..95ed1a9 100644 ---- a/src/plugins/scripts/lua/CMakeLists.txt -+++ b/src/plugins/scripts/lua/CMakeLists.txt +diff --git a/src/plugins/lua/CMakeLists.txt b/src/plugins/lua/CMakeLists.txt +index 1955b58..54dd91b 100644 +--- a/src/plugins/lua/CMakeLists.txt ++++ b/src/plugins/lua/CMakeLists.txt @@ -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 df598b9..ce9e165 100644 ---- a/src/plugins/scripts/perl/CMakeLists.txt -+++ b/src/plugins/scripts/perl/CMakeLists.txt -@@ -38,4 +38,4 @@ IF(PERL_FOUND) +diff --git a/src/plugins/perl/CMakeLists.txt b/src/plugins/perl/CMakeLists.txt +index 6bb7c2f..abc51ac 100644 +--- a/src/plugins/perl/CMakeLists.txt ++++ b/src/plugins/perl/CMakeLists.txt +@@ -43,4 +43,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 b39a5f3..99cba10 100644 ---- a/src/plugins/scripts/python/CMakeLists.txt -+++ b/src/plugins/scripts/python/CMakeLists.txt +diff --git a/src/plugins/python/CMakeLists.txt b/src/plugins/python/CMakeLists.txt +index 669bb34..4c7f5a7 100644 +--- a/src/plugins/python/CMakeLists.txt ++++ b/src/plugins/python/CMakeLists.txt @@ -28,4 +28,4 @@ IF(PYTHON_FOUND) - TARGET_LINK_LIBRARIES(python ${PYTHON_LIBRARY} weechat_scripts) + TARGET_LINK_LIBRARIES(python ${PYTHON_LIBRARY} weechat_plugins_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 ee69844..1a08b57 100644 ---- a/src/plugins/scripts/ruby/CMakeLists.txt -+++ b/src/plugins/scripts/ruby/CMakeLists.txt +diff --git a/src/plugins/relay/CMakeLists.txt b/src/plugins/relay/CMakeLists.txt +index bdd8276..cb8fcdc 100644 +--- a/src/plugins/relay/CMakeLists.txt ++++ b/src/plugins/relay/CMakeLists.txt +@@ -46,4 +46,4 @@ ENDIF(GNUTLS_FOUND) + + TARGET_LINK_LIBRARIES(relay ${LINK_LIBS}) + +-INSTALL(TARGETS relay LIBRARY DESTINATION ${LIBDIR}/plugins) ++INSTALL(TARGETS relay LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}) +diff --git a/src/plugins/ruby/CMakeLists.txt b/src/plugins/ruby/CMakeLists.txt +index 5f2aa86..48a3cd7 100644 +--- a/src/plugins/ruby/CMakeLists.txt ++++ b/src/plugins/ruby/CMakeLists.txt @@ -27,4 +27,4 @@ IF(RUBY_FOUND) - TARGET_LINK_LIBRARIES(ruby ${RUBY_LIBRARY} weechat_scripts) + TARGET_LINK_LIBRARIES(ruby ${RUBY_LIBRARY} weechat_plugins_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 9bd6d2b..7e9c6d1 100644 ---- a/src/plugins/scripts/tcl/CMakeLists.txt -+++ b/src/plugins/scripts/tcl/CMakeLists.txt +diff --git a/src/plugins/tcl/CMakeLists.txt b/src/plugins/tcl/CMakeLists.txt +index a33487c..d561b97 100644 +--- a/src/plugins/tcl/CMakeLists.txt ++++ b/src/plugins/tcl/CMakeLists.txt @@ -34,4 +34,4 @@ IF(TCL_FOUND) ENDIF(TCL_FOUND) diff --git a/weechat.spec b/weechat.spec index f946f90..000e5e1 100644 --- a/weechat.spec +++ b/weechat.spec @@ -1,11 +1,9 @@ Name: weechat Summary: Portable, fast, light and extensible IRC client -Version: 0.3.8 -Release: 4%{?dist} +Version: 0.3.9.2 +Release: 1%{?dist} Source: http://weechat.org/files/src/%{name}-%{version}.tar.bz2 Patch0: weechat-combined.patch -Patch1: weechat-fix-0.patch -Patch2: weechat-fix-1.patch URL: http://weechat.org Group: Applications/Communications License: GPLv3 @@ -35,8 +33,6 @@ This package contains include files and pc file for weechat. %prep %setup -q -n %{name}-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %cmake . @@ -71,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Sat Dec 1 2012 Paul P. Komkoff Jr <i(a)stingr.net> - 0.3.9.2-1 +- new upstream, long overdue + * Mon Nov 19 2012 Paul P. Komkoff Jr <i(a)stingr.net> - 0.3.8-4 - fix bz#878025

1 0

File weechat-0.3.9.2.tar.bz2 uploaded to lookaside cache by stingray
by Paul Komkoff 30 Nov '12

30 Nov '12

A file has been added to the lookaside cache for weechat: 636e96a62e60155f3b9769905d9912b9 weechat-0.3.9.2.tar.bz2

1 0

[gnustep-base/f18: 5/5] Merge branch 'master' into f18
by Jochen Schmitt 30 Nov '12

30 Nov '12

commit 6cc6dc5a1ce34bc8856b171f29d4409f97118da8 Merge: ff1cc27 22519f1 Author: Jochen Schmitt <Jochen(a)herr-schmitt.de> Date: Fri Nov 30 21:57:57 2012 +0100 Merge branch 'master' into f18 gnustep-base-1.24.0-xml.patch | 17 +++++++++++++++++ gnustep-base.spec | 11 +++++------ 2 files changed, 22 insertions(+), 6 deletions(-) ---

1 0

[gnustep-base/f18] (5 commits) ...Merge branch 'master' into f18
by Jochen Schmitt 30 Nov '12

30 Nov '12

Summary of changes: 415eebf... Fix odd error (*) da30e26... Synch Rawhide with F18 (*) a5335b8... Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_R (*) 22519f1... Fix incomplete changelog entry (*) 6cc6dc5... Merge branch 'master' into f18 (*) This commit already existed in another branch; no separate mail sent

1 0

[glibc] - Resync with master (#882137). - Remove local patch for strict-aliasing warnings that is no
by Jeffrey Law 30 Nov '12

30 Nov '12

commit 03545a8efdaba2329a6e64a6f79f502d2fcddda0 Author: Jeff Law <law(a)redhat.com> Date: Fri Nov 30 14:01:46 2012 -0700 - Resync with master (#882137). - Remove local patch for strict-aliasing warnings that is no longer needed. - Remove local patch for 730856 that is no longer needed. - Repack patchlist. .gitignore | 2 + glibc-fedora-strict-aliasing.patch | 39 --------------------------- glibc-rh730856.patch | 52 ------------------------------------ glibc.spec | 24 ++++++++-------- sources | 4 +- 5 files changed, 16 insertions(+), 105 deletions(-) --- diff --git a/.gitignore b/.gitignore index e447587..122c322 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,5 @@ glibc-2.14-394-g8f3b1ff /glibc-2.16.90-14bc93a9.tar.gz /glibc-2.16.90-2af1b328-fedora.tar.gz /glibc-2.16.90-2af1b328.tar.gz +/glibc-2.16.90-1a538b9f-fedora.tar.gz +/glibc-2.16.90-1a538b9f.tar.gz diff --git a/glibc.spec b/glibc.spec index d68edae..c1a4e8d 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.16.90-2af1b328 +%define glibcsrcdir glibc-2.16.90-1a538b9f %define glibcversion 2.16.90 ### glibc.spec.in follows: %define run_glibc_tests 1 @@ -27,7 +27,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 34%{?dist} +Release: 35%{?dist} # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -90,9 +90,9 @@ Patch0009: %{name}-rh657588.patch # stap, needs to be sent upstream Patch0010: %{name}-stap-libm.patch +Patch0012: %{name}-fedora-linux-tcsetattr.patch Patch0014: %{name}-fedora-nptl-linklibc.patch - -Patch0018: %{name}-fedora-strict-aliasing.patch +Patch0018: %{name}-fedora-localedata-locales-fixes.patch Patch0019: %{name}-fedora-nis-rh188246.patch Patch0020: %{name}-fedora-manual-dircategory.patch Patch0024: %{name}-fedora-locarchive.patch @@ -120,8 +120,6 @@ Patch0040: %{name}-fedora-i386-tls-direct-seg-refs.patch Patch0041: %{name}-fedora-pt_chown.patch Patch0042: %{name}-fedora-include-bits-ldbl.patch Patch0043: %{name}-fedora-ldd.patch -Patch0044: %{name}-fedora-linux-tcsetattr.patch -Patch0045: %{name}-fedora-localedata-locales-fixes.patch # # Patches from upstream @@ -136,9 +134,6 @@ Patch0045: %{name}-fedora-localedata-locales-fixes.patch Patch2011: %{name}-rh757881.patch -# Upstream BZ 13013 -Patch2012: %{name}-rh730856.patch - Patch2013: %{name}-rh741105.patch Patch2015: %{name}-rh770439.patch Patch2016: %{name}-rh789209.patch @@ -393,7 +388,7 @@ package or when debugging this package. %patch0009 -p1 %patch0010 -p1 %patch2011 -p1 -%patch2012 -p1 +%patch0012 -p1 %patch2013 -p1 %patch0014 -p1 %patch2015 -p1 @@ -425,8 +420,6 @@ package or when debugging this package. %patch0041 -p1 %patch0042 -p1 %patch0043 -p1 -%patch0044 -p1 -%patch0045 -p1 # On powerpc32, hp timing is only available in power4/power6 # libs, not in base, so pre-power4 dynamic linker is incompatible @@ -1221,6 +1214,13 @@ rm -f *.filelist* %endif %changelog +* Fri Nov 30 2012 Jeff Law <law(a)redhat.com> - 2.16.90-35 + - Resync with master (#882137). + - Remove local patch for strict-aliasing warnings that + is no longer needed. + - Remove local patch for 730856 that is no longer needed. + - Repack patchlist. + * Thu Nov 29 2012 Jeff Law <law(a)redhat.com> - 2.16.90-34 - Remove local patch which "temporarily" re-added currences obsoleted by the Euro. diff --git a/sources b/sources index ee875a9..d3d2a21 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f708bdecec850f4035d5242f80be3d02 glibc-2.16.90-2af1b328-fedora.tar.gz -35892d87ef0c9cbb694ef023b37019f2 glibc-2.16.90-2af1b328.tar.gz +f55e091ccdae9a29dd183116091ed679 glibc-2.16.90-1a538b9f-fedora.tar.gz +37289795583e3897226edf1ad24c261a glibc-2.16.90-1a538b9f.tar.gz

1 0

File glibc-2.16.90-1a538b9f.tar.gz uploaded to lookaside cache by law
by Jeffrey Law 30 Nov '12

30 Nov '12

A file has been added to the lookaside cache for glibc: 37289795583e3897226edf1ad24c261a glibc-2.16.90-1a538b9f.tar.gz

1 0

File glibc-2.16.90-1a538b9f-fedora.tar.gz uploaded to lookaside cache by law
by Jeffrey Law 30 Nov '12

30 Nov '12

A file has been added to the lookaside cache for glibc: f55e091ccdae9a29dd183116091ed679 glibc-2.16.90-1a538b9f-fedora.tar.gz

1 0

[rubygem-openshift-origin-controller] updating to 1.0.5
by tdawson 30 Nov '12

30 Nov '12

commit 1d14693c8e7f22c070ed87ea97e4d233c55b8e47 Author: Troy Dawson <tdawson(a)redhat.com> Date: Fri Nov 30 14:57:19 2012 -0600 updating to 1.0.5 .gitignore | 1 + ...ft-origin-controller_add_mongo_to_gemspec.patch | 27 ------------ openshift-origin-controller_fix_test_deps.patch | 19 -------- ...-origin-controller_stickshift-common-load.patch | 9 ---- rubygem-openshift-origin-controller.spec | 45 +++++++------------- sources | 2 +- 6 files changed, 18 insertions(+), 85 deletions(-) --- diff --git a/.gitignore b/.gitignore index f5fb8d9..fc5cc34 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /openshift-origin-controller-0.14.15.gem +/openshift-origin-controller-1.0.5.gem diff --git a/rubygem-openshift-origin-controller.spec b/rubygem-openshift-origin-controller.spec index a2f3b57..d2964e6 100644 --- a/rubygem-openshift-origin-controller.spec +++ b/rubygem-openshift-origin-controller.spec @@ -14,24 +14,14 @@ %endif -Summary: Rails engine for the OpenShift Broker API +Summary: OpenShift Development Controller Name: rubygem-%{gem_name} -Version: 0.14.15 -Release: 11%{?dist} +Version: 1.0.5 +Release: 1%{?dist} Group: Development/Tools License: ASL 2.0 URL: http://openshift.redhat.com -Source0: http://mirror.openshift.com/pub/openshift-origin/source/rubygem-%{gem_name}… -# https://github.com/openshift/crankcase/pull/390 -Patch0: openshift-origin-controller_fix_test_deps.patch -# This patch is actually not needed upstream. The OpenShift team is in the -# process of renaming the packages for Fedora. Once the packages are accepted -# the packages will be renamed on the master branch to match Fedora. -#https://github.com/openshift/crankcase/blob/master/stickshift/controller/lib/stickshift-controller.rb -# Patch1 removed. Fixing library names -#Patch1: openshift-origin-controller_stickshift-common-load.patch -# https://github.com/openshift/crankcase/pull/422 -Patch2: openshift-origin-controller_add_mongo_to_gemspec.patch +Source0: http://mirror.openshift.com/pub/origin-server/source/rubygem-%{gem_name}/%{… Requires: ruby(abi) >= 1.8 Requires: rubygems Requires: rubygem(state_machine) @@ -47,8 +37,7 @@ BuildArch: noarch Provides: rubygem(%{gem_name}) = %version %description -This packages contains a Rails engine that provides the majority of the -OpenShift Broker API. +This contains the OpenShift Development Controller packaged as a rubygem. %prep gem unpack %{SOURCE0} @@ -56,15 +45,6 @@ gem unpack %{SOURCE0} gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec -# Note: The patching of the spec file must happen after the 'gem spec' command. -%patch0 -p1 -#%patch1 -p1 -%patch2 -p1 - -# rename lib to correct name -mv lib/stickshift-controller.rb lib/openshift-origin-controller.rb -sed -i -e 's|\"lib/stickshift-controller.rb\"|\"lib/openshift-origin-controller.rb\"|' %{gem_name}.gemspec - %build mkdir -p .%{gem_dir} @@ -84,10 +64,13 @@ mkdir -p %{buildroot}%{gem_dir} cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/ rm -rf %{buildroot}%{gem_instdir}/test -# https://github.com/openshift/crankcase/pull/344 -chmod 0644 %{buildroot}%{gem_libdir}/stickshift-controller/app/models/application.rb -chmod 0644 %{buildroot}%{gem_libdir}/stickshift-controller/app/models/gear.rb -chmod 0644 %{buildroot}%{gem_libdir}/stickshift-controller/app/controllers/base_controller.rb +#cleanup +chmod 0644 %{buildroot}%{gem_libdir}/%{gem_name}/app/models/application.rb +chmod 0644 %{buildroot}%{gem_libdir}/%{gem_name}/app/models/name_server_cache.rb +chmod 0644 %{buildroot}%{gem_libdir}/%{gem_name}/app/models/cartridge_cache.rb +chmod 0644 %{buildroot}%{gem_libdir}/%{gem_name}/app/controllers/base_controller.rb +chmod 0644 %{buildroot}%{gem_libdir}/%{gem_name}/lib/openshift/dns_service.rb + %files %dir %{gem_instdir} @@ -104,6 +87,10 @@ chmod 0644 %{buildroot}%{gem_libdir}/stickshift-controller/app/controllers/base_ %exclude %{gem_instdir}/%{name}.spec %changelog +* Fri Nov 30 2012 Troy Dawson <tdawson(a)redhat.com> 1.0.5-1 +- Update to 1.0.5 +- Removed unneeded patches + * Wed Aug 22 2012 Troy Dawson <tdawson(a)redhat.com> - 0.14.15-11 - Renamed library to correct name diff --git a/sources b/sources index 80dbb0d..d91792f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -256a9e7d72de5b2c0a151698a32eddb3 openshift-origin-controller-0.14.15.gem +ecf1faee383248e86ae2ff2fb8e8eadc openshift-origin-controller-1.0.5.gem

1 0

File openshift-origin-controller-1.0.5.gem uploaded to lookaside cache by tdawson
by tdawson 30 Nov '12

30 Nov '12

A file has been added to the lookaside cache for rubygem-openshift-origin-controller: ecf1faee383248e86ae2ff2fb8e8eadc openshift-origin-controller-1.0.5.gem

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
1536
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits November 2012