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.spec b/centerim.spec index 23a6575..2aa06ba 100644 --- a/centerim.spec +++ b/centerim.spec @@ -1,6 +1,6 @@ Name: centerim Version: 4.22.10 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 Summary: Text mode menu- and window-driven IM @@ -14,6 +14,10 @@ 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 BuildRequires: curl-devel BuildRequires: ncurses-devel >= 4.2 @@ -26,6 +30,7 @@ BuildRequires: nss_compat_ossl-devel BuildRequires: nss-devel BuildRequires: nspr-devel BuildRequires: autoconf +BuildRequires: automake BuildConflicts: openssl-devel @@ -44,11 +49,15 @@ Internal RSS reader and a client for LiveJournal are provided. %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 -if + %build autoconf %configure \ @@ -86,6 +95,9 @@ desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2} %{_mandir}/man1/* %changelog +* Sun Feb 24 2013 Toshio Kuratomi - 4.22.10-11 +- Patch to fix a problem tripping up debugedit + * Thu Feb 14 2013 Rahul Sundaram - 1:4.22.10-10 - remove vendor tag from desktop file. https://fedorahosted.org/fpc/ticket/247 - clean up spec to follow current guidelines