dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xbase
-# $Id$
-NAME := xbase
-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)

xbase-2.0.0-fixconfig.patch

@@ -0,0 +1,11 @@
+--- xbase-2.0.0/xbase-config.in.BAD	2005-07-10 08:38:03.000000000 -0500
++++ xbase-2.0.0/xbase-config.in	2005-07-10 08:37:25.000000000 -0500
+@@ -5,7 +5,7 @@
+ exec_prefix_set=no
+ CC="@CC@"
+ CXX="@CXX@"
+-LD="@SHARED_LD@"
++LD="@LD@"
+ 
+ usage="\
+ Usage: xbase-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags] [--cc] [--cxx] [--ld]"

xbase.spec

@@ -1,11 +1,12 @@
 Name:		xbase
 Summary: 	XBase compatible database library and tools
 Version: 	2.0.0
-Release: 	2%{?dist}
-License: 	LGPL (binaries GPL)
+Release: 	4%{?dist}
+License: 	LGPLv2+ and GPLv2+
 Group: 		Development/Libraries
 URL:		http://linux.techass.com/projects/xdb/
 Source0:	http://dl.sourceforge.net/xdb/%{name}-%{version}.tar.gz
+Patch0:		xbase-2.0.0-fixconfig.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	doxygen
 
@@ -29,6 +30,7 @@ Headers and libraries for compiling programs that use the XBase library.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --enable-static
@@ -72,6 +74,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libxbase.so
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.0-4
+- bump for FC-5
+
+* Sun Jul 10 2005 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.0-3
+- fix xbase-config --ld (bugzilla 162845)
+
 * Fri Jul  1 2005 Tom "spot" Callaway <tcallawa@redhat.com> 2.0.0-2
 - add BuildRequires: doxygen
 - remove latex docs (html is fine)