dist-git conversion

#2781)

Makefile

@@ -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 $$/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)

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 <iostream>
+ #include <string>
++#include <cstdlib>
+ 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 <string.h>
+ #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 <gtk/gtk.h>
+ #include <iostream>
+ #include <string>
++#include <cstdlib>
+ using namespace std;
+ 
+ int main(int argc, char** argv)

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 <mdomsch@fedoraproject.org> - 1:1.2.1-18
+- fix FTBFS #434484
+
+* Fri Jun 13 2008 Jon Stanley <jonstanley@gmail.com> - 1:1.2.1-17
+- Remove vendor tag, correct license, rebuild
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1:1.2.1-16
 - Autorebuild for GCC 4.3