rpms/irssi
5
0
Fork 0
Code Issues Pull Requests Releases Activity

New version

Browse Source 
Resolves: rhbz#1152060
- Dropped no-static-unload and man-fix patches (both upstreamed)
This commit is contained in:
Jaroslav Škarvada 2014-10-13 17:06:06 +02:00
parent de72d82539
commit 2f21461cd1
5 changed files with 9 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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

13
irssi-0.8.15-man-fix.patch
View File

@ -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

35
irssi-0.8.15-no-static-unload.patch
View File

@ -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;
}

13
irssi.spec
View File

@ -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 <jskarvad@redhat.com> - 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 <jplesnik@redhat.com> - 0.8.16-3
- Perl 5.20 rebuild

2
sources
View File

@ -1 +1 @@
4346119c4c000d0198cda17666ff1f06 irssi-0.8.16.tar.bz2
ecf64be47978d89a742b435a81cb47db irssi-0.8.17.tar.bz2