From e164cdc81958ed295ea4dffbc320ab949b1f471e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 10 Jun 2014 11:46:14 +0200 Subject: [PATCH] New version Resolves: rhbz#1107342 - Dropped format-security patch (not needed) --- .gitignore | 1 + irssi-0.8.16-format-security.patch | 22 ---------------------- irssi.spec | 15 ++++++++------- sources | 2 +- 4 files changed, 10 insertions(+), 30 deletions(-) delete mode 100644 irssi-0.8.16-format-security.patch diff --git a/.gitignore b/.gitignore index 62f71cd..09e5262 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ irssi-0.8.15.tar.bz2 /irssi-0.8.16-rc1.tar.bz2 +/irssi-0.8.16.tar.bz2 diff --git a/irssi-0.8.16-format-security.patch b/irssi-0.8.16-format-security.patch deleted file mode 100644 index 34fca6c..0000000 --- a/irssi-0.8.16-format-security.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/core/network.c b/src/core/network.c -index d7c1017..5954d1f 100644 ---- a/src/core/network.c -+++ b/src/core/network.c -@@ -356,7 +356,7 @@ int net_receive(GIOChannel *handle, char *buf, int len) - - status = g_io_channel_read_chars(handle, buf, len, &ret, &err); - if (err != NULL) { -- g_warning(err->message); -+ g_warning("%s", err->message); - g_error_free(err); - } - if (status == G_IO_STATUS_ERROR || status == G_IO_STATUS_EOF) -@@ -377,7 +377,7 @@ int net_transmit(GIOChannel *handle, const char *data, int len) - - status = g_io_channel_write_chars(handle, (char *) data, len, &ret, &err); - if (err != NULL) { -- g_warning(err->message); -+ g_warning("%s", err->message); - g_error_free(err); - } - if (status == G_IO_STATUS_ERROR) diff --git a/irssi.spec b/irssi.spec index 98b5e96..cdcbed3 100644 --- a/irssi.spec +++ b/irssi.spec @@ -1,20 +1,17 @@ %define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch) -%global pretag rc1 - Summary: Modular text mode IRC client with Perl scripting Name: irssi Version: 0.8.16 -Release: 0.4%{?pretag:.%{pretag}}%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: Applications/Communications URL: http://irssi.org/ -Source0: http://irssi.org/files/irssi-%{version}%{?pretag:-%{pretag}}.tar.bz2 +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 -Patch2: irssi-0.8.16-format-security.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ncurses-devel openssl-devel zlib-devel BuildRequires: pkgconfig glib2-devel perl-devel perl(ExtUtils::Embed) @@ -40,10 +37,9 @@ being maintained. %prep -%setup -q -n %{name}-%{version}%{?pretag:-%{?pretag}} +%setup -q %patch0 -p1 -b .no-static-unload %patch1 -p1 -b .man-fix -%patch2 -p1 -b .format-security %build autoreconf -i @@ -94,6 +90,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 10 2014 Jaroslav Škarvada - 0.8.16-1 +- New version + Resolves: rhbz#1107342 +- Dropped format-security patch (not needed) + * Sat Jun 07 2014 Fedora Release Engineering - 0.8.16-0.4.rc1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 00667c6..fe90931 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -275c926dcbb11059f8685906df7cfe49 irssi-0.8.16-rc1.tar.bz2 +4346119c4c000d0198cda17666ff1f06 irssi-0.8.16.tar.bz2