From 731a17b68717726643ca041a2856481dc9b8fb75 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 20 Apr 2008 11:58:06 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for aiksaurus --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 316da0da451fb6a08e6963144cd7a4f48b4b05ea Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 2 Oct 2008 02:55:46 +0000 Subject: [PATCH 2/4] backport gcc-4.3 FTBFS to F-9 --- aiksaurus-1.2.1-gcc43.patch | 33 +++++++++++++++++++++++++++++++++ aiksaurus.spec | 15 +++++++++++---- 2 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 aiksaurus-1.2.1-gcc43.patch 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 From f0f7b0381a6f6e8e25a0e58816c08638ceae38bb Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:41 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 92e1334..f963ace 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := aiksaurus SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From af2f9a2d9e92b19239e086c067e6b12d7c220b71 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:39:25 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index f963ace..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: aiksaurus -# $Id$ -NAME := aiksaurus -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9