From 2f21461cd151c4213c497248f0b67a85b1aad7f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 13 Oct 2014 17:06:06 +0200 Subject: [PATCH] New version Resolves: rhbz#1152060 - Dropped no-static-unload and man-fix patches (both upstreamed) --- .gitignore | 1 + irssi-0.8.15-man-fix.patch | 13 ----------- irssi-0.8.15-no-static-unload.patch | 35 ----------------------------- irssi.spec | 13 ++++++----- sources | 2 +- 5 files changed, 9 insertions(+), 55 deletions(-) delete mode 100644 irssi-0.8.15-man-fix.patch delete mode 100644 irssi-0.8.15-no-static-unload.patch diff --git a/.gitignore b/.gitignore index 09e5262..6a5456b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ irssi-0.8.15.tar.bz2 /irssi-0.8.16-rc1.tar.bz2 /irssi-0.8.16.tar.bz2 +/irssi-0.8.17.tar.bz2 diff --git a/irssi-0.8.15-man-fix.patch b/irssi-0.8.15-man-fix.patch deleted file mode 100644 index 30bb28e..0000000 --- a/irssi-0.8.15-man-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up irssi-0.8.15/docs/irssi.1.orig irssi-0.8.15/docs/irssi.1 ---- irssi-0.8.15/docs/irssi.1.orig 2010-04-03 18:19:55.000000000 +0200 -+++ irssi-0.8.15/docs/irssi.1 2012-08-03 16:34:19.684160994 +0200 -@@ -59,9 +59,6 @@ display the version of Irssi. - .TP - .BI "\-?, \-\-help" - show a help message. --.TP --.BI "\-\-usage" --display brief usage message. - .SH SEE ALSO - .B Irssi - has been supplied with a huge amount of documentation. Check /help or look diff --git a/irssi-0.8.15-no-static-unload.patch b/irssi-0.8.15-no-static-unload.patch deleted file mode 100644 index c583f1c..0000000 --- a/irssi-0.8.15-no-static-unload.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- irssi-0.8.15/src/fe-common/core/fe-modules.c.old 2010-04-03 18:19:24.000000000 +0200 -+++ irssi-0.8.15/src/fe-common/core/fe-modules.c 2010-10-12 14:43:52.586315553 +0200 -@@ -195,6 +195,8 @@ - MODULE_FILE_REC *file; - char *rootmodule, *submodule; - void *free_arg; -+ GSList *tmp; -+ int all_dynamic; - - g_return_if_fail(data != NULL); - -@@ -204,12 +206,19 @@ - - module = module_find(rootmodule); - if (module != NULL) { -- if (*submodule == '\0') -- module_unload(module); -+ if (*submodule == '\0') { -+ all_dynamic = 1; -+ for (tmp = module->files; tmp != NULL; tmp = tmp->next) -+ all_dynamic &= !MODULE_IS_STATIC((MODULE_FILE_REC*) tmp->data); -+ if (all_dynamic) -+ module_unload(module); -+ } - else { - file = module_file_find(module, submodule); -- if (file != NULL) -- module_file_unload(file); -+ if (file != NULL) { -+ if (!MODULE_IS_STATIC(file)) -+ module_file_unload(file); -+ } - else - module = NULL; - } diff --git a/irssi.spec b/irssi.spec index f9de54d..251535d 100644 --- a/irssi.spec +++ b/irssi.spec @@ -2,16 +2,14 @@ Summary: Modular text mode IRC client with Perl scripting Name: irssi -Version: 0.8.16 -Release: 3%{?dist} +Version: 0.8.17 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Communications URL: http://irssi.org/ Source0: http://irssi.org/files/irssi-%{version}.tar.bz2 Source1: irssi-config.h -Patch0: irssi-0.8.15-no-static-unload.patch -Patch1: irssi-0.8.15-man-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ncurses-devel openssl-devel zlib-devel BuildRequires: pkgconfig glib2-devel perl-devel perl(ExtUtils::Embed) @@ -38,8 +36,6 @@ being maintained. %prep %setup -q -%patch0 -p1 -b .no-static-unload -%patch1 -p1 -b .man-fix %build autoreconf -i @@ -90,6 +86,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 13 2014 Jaroslav Škarvada - 0.8.17-1 +- New version + Resolves: rhbz#1152060 +- Dropped no-static-unload and man-fix patches (both upstreamed) + * Wed Aug 27 2014 Jitka Plesnikova - 0.8.16-3 - Perl 5.20 rebuild diff --git a/sources b/sources index fe90931..840010f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4346119c4c000d0198cda17666ff1f06 irssi-0.8.16.tar.bz2 +ecf64be47978d89a742b435a81cb47db irssi-0.8.17.tar.bz2