awjb pushed to centerim (el5). "1:4.22.10-3 (..more)"

[notifications at fedoraproject.org]

>From d0149d5c4c558ea7e77932f5702d76bc8adb77c1 Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date: Sun, 26 Apr 2015 18:28:57 +0200
Subject: 1:4.22.10-3

- add patches from master

diff --git a/centerim-double-slash.patch b/centerim-double-slash.patch
new file mode 100644
index 0000000..f32302b
--- /dev/null
+++ b/centerim-double-slash.patch
@@ -0,0 +1,21 @@
+Index: centerim-4.22.10/libmsn/msn/Makefile.am
+===================================================================
+--- centerim-4.22.10.orig/libmsn/msn/Makefile.am
++++ centerim-4.22.10/libmsn/msn/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -I$(top_srcdir)//connwrap -I$(top_srcdir)/libmsn
++AM_CPPFLAGS = -I$(top_srcdir)/connwrap -I$(top_srcdir)/libmsn
+ noinst_LIBRARIES = libmsn.a
+ 
+ if BUILD_MSN
+Index: centerim-4.22.10/kksystr/src/Makefile.am
+===================================================================
+--- centerim-4.22.10.orig/kksystr/src/Makefile.am
++++ centerim-4.22.10/kksystr/src/Makefile.am
+@@ -1,5 +1,5 @@
+ AM_CXXFLAGS = -Wno-write-strings
+ 
+-AM_CPPFLAGS = -I$(top_srcdir)/kksystr/include -I$(top_srcdir)//kkstrtext
++AM_CPPFLAGS = -I$(top_srcdir)/kksystr/include -I$(top_srcdir)/kkstrtext
+ noinst_LIBRARIES = libsrc.a
+ libsrc_a_SOURCES =  kkfsys.cc kkiproc.cc
diff --git a/centerim-gcc46.patch b/centerim-gcc46.patch
new file mode 100644
index 0000000..7f52ab2
--- /dev/null
+++ b/centerim-gcc46.patch
@@ -0,0 +1,11 @@
+diff -up centerim-4.22.10/libicq2000/libicq2000/sigslot.h.orig centerim-4.22.10/libicq2000/libicq2000/sigslot.h
+--- centerim-4.22.10/libicq2000/libicq2000/sigslot.h.orig	2011-07-01 18:30:14.000000000 +0200
++++ centerim-4.22.10/libicq2000/libicq2000/sigslot.h	2011-07-01 18:33:37.000000000 +0200
+@@ -82,6 +82,7 @@
+ #ifndef SIGSLOT_H__
+ #define SIGSLOT_H__
+ 
++#include <cstddef>
+ #include <set>
+ #include <list>
+ 
diff --git a/centerim.spec b/centerim.spec
index df0769d..b1ed58b 100644
--- a/centerim.spec
+++ b/centerim.spec
@@ -1,6 +1,6 @@
 Name:           centerim
 Version:        4.22.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 
 Summary:        Text mode menu- and window-driven IM
@@ -13,6 +13,13 @@ Source1:        http://www.centerim.org/images/b/b5/Centerim_b.svg
 Source2:        centerim.desktop
 
 Patch0:         centerim-4.22.6-url-escape-fedora.patch
+Patch1:         centerim-gcc46.patch
+# doubled slashes in paths cause debugedit to error with:
+# canonicalization unexpectedly shrank by one character
+# https://bugzilla.redhat.com/show_bug.cgi?id=304121
+Patch2:         centerim-double-slash.patch
+
+
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -24,7 +31,7 @@ BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  lzo-devel >= 2
 BuildRequires:  nspr-devel
-BuildRequires:  autoconf
+BuildRequires:  autoconf automake
 BuildRequires:  openssl-devel
 
 Requires:       xdg-utils
@@ -42,15 +49,18 @@ Internal RSS reader and a client for LiveJournal are provided.
 %prep
 %setup -q
 %patch0 -p1 -b .url-escape-fedora
+%patch1 -p1 -b .gcc46
+%patch2 -p1 -b .dblslash
 
 iconv -f iso8859-1 -t utf8 ChangeLog >ChangeLog.utf8
 touch -r ChangeLog ChangeLog.utf8
 mv ChangeLog.utf8 ChangeLog
 
+# The doubleslash path touches Makefile.am
+autoreconf
 
 %build
 %configure \
-        --with-ssl --with-nss_compat \
         --disable-rpath \
         --enable-locales-fix
 make %{?_smp_flags}
@@ -88,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/cimconv
 %{_bindir}/cimformathistory
 %{_bindir}/cimextracthistory.pl
-%{_bindir}/CenterIMLog2HTML.py
+%{_bindir}/CenterIMLog2HTML.py*
 %{_datadir}/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/*.svg
@@ -96,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 20 2015 Andreas Bierfert <andreas.bierfert at lowlatency.de>
+- 1:4.22.10-3
+- add patches from master
+
 * Mon Nov 07 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 1:4.22.10-2
 - change to openssl
@@ -123,7 +137,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:4.22.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.6-1
+* Fri Jan 09 2009 Lubomir Rintel <lkundrak at v3.sk> - 1:4.22.6-1
 - New upstream release
 - Disable openssl due to licensing trouble
 - Fix dependencies
@@ -270,7 +284,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 4.20.0-3
 - rebuild on all arches
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr 07 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Tue Feb 08 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/centerim.git/commit/?h=el5&id=d0149d5c4c558ea7e77932f5702d76bc8adb77c1