rpms/epic/devel epic4-2.10.1-sighandling.patch, NONE, 1.1 epic.spec, 1.35, 1.36 sources, 1.9, 1.10

[vcrhonek]

Author: vcrhonek

Update of /cvs/pkgs/rpms/epic/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7497

Modified Files:
	epic.spec sources 
Added Files:
	epic4-2.10.1-sighandling.patch 
Log Message:
Update to epic4-2.10.1

epic4-2.10.1-sighandling.patch:
 ircsig.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE epic4-2.10.1-sighandling.patch ---
diff -up epic4-2.10.1/source/ircsig.c.orig epic4-2.10.1/source/ircsig.c
--- epic4-2.10.1/source/ircsig.c.orig	2010-04-01 13:37:15.207346243 +0200
+++ epic4-2.10.1/source/ircsig.c	2010-04-01 13:38:00.136366086 +0200
@@ -67,7 +67,9 @@ static RETSIGTYPE signal_handler (int si
 {
 	signals_caught[0] = 1;
 	signals_caught[sig_no]++;
-	if (NULL != signal_handlers[sig_no])
+	if ((NULL != signal_handlers[sig_no])
+	 && (signal_handlers[sig_no] != SIG_IGN)
+	 && (signal_handlers[sig_no] != SIG_DFL))
 		signal_handlers[sig_no](sig_no);
 }
 


Index: epic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epic/devel/epic.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- epic.spec	21 Aug 2009 13:16:08 -0000	1.35
+++ epic.spec	1 Apr 2010 11:54:32 -0000	1.36
@@ -1,7 +1,7 @@
 Summary: An ircII chat client
 Name: epic
-Version: 2.10
-Release: 6%{?dist}
+Version: 2.10.1
+Release: 1%{?dist}
 Epoch: 4
 # The entire source code is Freely redistributable without restriction except some
 # files (notably, glob.c, and compat.c) may contain some source covered by BSD
@@ -17,6 +17,8 @@ Source6: http://splitfire.sourceforge.ne
 Source7: http://splitfire.sourceforge.net/schemes/sf-light-scheme.irc.gz
 Source8: http://splitfire.sourceforge.net/schemes/sf-perry-scheme.irc.gz
 Patch0: epic-default.patch
+#Patch1: patch by Michael Jennings, accepted by upstream
+Patch1: epic4-2.10.1-sighandling.patch
 URL: http://www.epicsol.org/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel,ncurses-devel
@@ -31,6 +33,7 @@ rm -rf $RPM_BUILD_DIR/ircii-EPIC%{prog_v
 
 %setup -q -n epic4-%{version} -a 1
 %patch0 -p0 -b .default
+%patch1 -p1 -b .sighandling
 
 %build
 %configure
@@ -43,6 +46,9 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 
+# see INSTALL, -O2 is not usable for epic
+export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed s/-O2/-O/`
+
 make install CFLAGS="$RPM_OPT_FLAGS" installhelp IP=$RPM_BUILD_ROOT prefix=%{_prefix} mandir=%{_mandir} 
 
 rm $RPM_BUILD_ROOT/usr/bin/epic
@@ -81,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/epic/help/*
 
 %changelog
+* Thu Apr  1 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 4:2.10.1-1
+- Update to epic4-2.10.1
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 4:2.10-6
 - rebuilt with new openssl
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/epic/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	10 Aug 2009 17:18:58 -0000	1.9
+++ sources	1 Apr 2010 11:54:32 -0000	1.10
@@ -3,5 +3,5 @@
 dd75ad70b46b331b008d976880899233  sf-eggsandham-scheme.irc.gz
 3a7151f0b2913964eb5e38b6c1a2697d  sf-light-scheme.irc.gz
 90c9dc5fc9f372843f8a0732fba61eb1  sf-perry-scheme.irc.gz
-92789d75f12882696817865ea072e44a  epic4-2.10.tar.bz2
 b28872ca9234650eda6842ffc3425849  epic4-help-current.tar.bz2
+f0520cdf58a0f8be1237d0db612d30fe  epic4-2.10.1.tar.bz2