From 316da0da451fb6a08e6963144cd7a4f48b4b05ea Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Oct 02 2008 02:55:46 +0000 Subject: backport gcc-4.3 FTBFS to F-9 --- diff --git a/aiksaurus-1.2.1-gcc43.patch b/aiksaurus-1.2.1-gcc43.patch new file mode 100644 index 0000000..906efc0 --- /dev/null +++ b/aiksaurus-1.2.1-gcc43.patch @@ -0,0 +1,33 @@ +diff -urNp --exclude-from=/home/mdomsch/excludes --minimal aiksaurus-1.2.1.orig/base/aiksaurus.t.cpp aiksaurus-1.2.1/base/aiksaurus.t.cpp +--- aiksaurus-1.2.1.orig/base/aiksaurus.t.cpp 2008-09-10 13:40:45.000000000 -0500 ++++ aiksaurus-1.2.1/base/aiksaurus.t.cpp 2008-09-10 13:40:54.000000000 -0500 +@@ -24,6 +24,7 @@ + #include "config.h" + #include + #include ++#include + using namespace std; + using AiksaurusImpl::AsciiCompare; + +diff -urNp --exclude-from=/home/mdomsch/excludes --minimal aiksaurus-1.2.1.orig/gtk/src/Display.cpp aiksaurus-1.2.1/gtk/src/Display.cpp +--- aiksaurus-1.2.1.orig/gtk/src/Display.cpp 2003-05-27 18:56:54.000000000 -0500 ++++ aiksaurus-1.2.1/gtk/src/Display.cpp 2008-09-10 14:01:56.000000000 -0500 +@@ -18,6 +18,7 @@ + * 02111-1307, USA. + */ + ++#include + #include "Display.h" + #include "Meaning.h" + #include "DialogMediator.h" +diff -urNp --exclude-from=/home/mdomsch/excludes --minimal aiksaurus-1.2.1.orig/gtk/src/gtkAiksaur.t.cpp aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp +--- aiksaurus-1.2.1.orig/gtk/src/gtkAiksaur.t.cpp 2002-01-11 20:02:12.000000000 -0600 ++++ aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp 2008-09-10 13:51:47.000000000 -0500 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + using namespace std; + + int main(int argc, char** argv) diff --git a/aiksaurus.spec b/aiksaurus.spec index 4536a4a..07a0d4e 100644 --- a/aiksaurus.spec +++ b/aiksaurus.spec @@ -1,16 +1,16 @@ Name: aiksaurus Version: 1.2.1 -Release: 16%{?dist} +Release: 18%{?dist} Summary: An English-language thesaurus library -Vendor: Red Hat, Inc. Epoch: 1 Group: System Environment/Libraries -License: GPL +License: GPLv2+ URL: http://aiksaurus.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.png Source2: %{name}.desktop +Patch0: %{name}-1.2.1-gcc43.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel @@ -52,6 +52,7 @@ is also provided. %package gtk-devel Requires: %{name}-gtk = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} Requires: gtk2-devel Summary: Files for developing with aiksaurus-gtk Group: Development/Libraries @@ -63,7 +64,7 @@ gtk includes and definitions for developing with aiksaurus. %prep %setup -q - +%patch0 -p1 %build %configure @@ -139,6 +140,12 @@ update-desktop-database &> /dev/null ||: %changelog +* Wed Sep 10 2008 Matt Domsch - 1:1.2.1-18 +- fix FTBFS #434484 + +* Fri Jun 13 2008 Jon Stanley - 1:1.2.1-17 +- Remove vendor tag, correct license, rebuild + * Wed Feb 20 2008 Fedora Release Engineering - 1:1.2.1-16 - Autorebuild for GCC 4.3