From 169622046221ba567ce4e791fd508a76645024f1 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Thu, 7 Jun 2007 09:55:27 +0000
Subject: [PATCH] 2007-06-07 11:55 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/harbour.spec     * some minor cleanups
 in Requires section and added %{epoch}   * harbour/make_rpm.sh     * build
 Harbour GD library only when GD 2.0 or newer is installed

---
 harbour/ChangeLog    |  6 ++++++
 harbour/harbour.spec | 10 ++++++----
 harbour/make_rpm.sh  |  3 ++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 800e784d79..2a71d53483 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-06-07 11:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/harbour.spec
+    * some minor cleanups in Requires section and added %{epoch}
+  * harbour/make_rpm.sh
+    * build Harbour GD library only when GD 2.0 or newer is installed
+
 2007-06-06 15:40 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbregex.h
   * harbour/source/rtl/hbregex.c
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index 9160bc5533..cf0cfb4e32 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -105,10 +105,12 @@ URL:            http://%{hb_host}/
 Source:         %{name}-%{version}.src.tar.gz
 Packager:       Przemysaw Czerpak <druzus@polbox.com> Luiz Rafael Culik Guimaraes <culikr@uol.com.br>
 BuildPrereq:    gcc binutils bash ncurses ncurses-devel %{!?_without_gpm: gpm-devel}
-Requires:       gcc binutils bash sh-utils %{name}-lib = %{version}
+Requires:       gcc binutils bash sh-utils %{name}-lib = %{epoch}:%{version}-%{release}
 Provides:       %{name} harbour
 BuildRoot:      /tmp/%{name}-%{version}-root
 
+%define		_noautoreq	'libharbour.*'
+
 %description
 %{dname} is a CA-Clipper compatible compiler for multiple platforms. This
 package includes a compiler, pre-processor, header files, virtual machine
@@ -173,7 +175,7 @@ Summary:        Static runtime libaries for %{dname} compiler
 Summary(pl):    Statyczne bilioteki dla kompilatora %{dname}
 Summary(ru):    ����������� ��������%{dname}
 Group:          Development/Languages
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description static
 %{dname} is a Clipper compatible compiler.
@@ -202,7 +204,7 @@ Summary(pl):    Bilioteki z drzewa contrib dla kompilatora %{dname}
 Summary(pt_BR): Libs contrib para %{dname}
 Summary(ru):    ����� � ��� contrib ��������%{dname}
 Group:          Development/Languages
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description contrib
 %{dname} is a Clipper compatible compiler.
@@ -232,7 +234,7 @@ Summary:        Clipper/Harbour/xBase compatible Pre-Processor, DOT prompt and i
 Summary(pl):    Kompatybilny z Clipper/Harbour/xBase Preprocesor i interpreter
 Summary(ru):    �������Clipper/Harbour/xBase ������ ��������License:        GPL
 Group:          Development/Languages
-Requires:       %{name} = %{version}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description pp
 %{dname} is a Clipper compatible compiler.
diff --git a/harbour/make_rpm.sh b/harbour/make_rpm.sh
index 5295055e43..89c4437a8e 100644
--- a/harbour/make_rpm.sh
+++ b/harbour/make_rpm.sh
@@ -98,7 +98,8 @@ then
 fi
 if test_reqrpm "gd-devel"
 then 
-    INST_PARAM="${INST_PARAM} --with gd"
+    v=`rpm -q gd|sed -e "s/[^0-9]*\([0-9]*\).*/\1/g"`
+    [ "$v" -ge 2 ] && INST_PARAM="${INST_PARAM} --with gd"
 fi
 if test_reqrpm "unixodbc-devel" || test_reqrpm "unixODBC-devel"
 then