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
This commit is contained in:
Przemyslaw Czerpak
2007-06-07 09:55:27 +00:00
parent 40774efc91
commit 1696220462
3 changed files with 14 additions and 5 deletions

View File

@@ -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

View File

@@ -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): <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>%{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): <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD> contrib <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>%{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): <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Clipper/Harbour/xBase <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>License: GPL
Group: Development/Languages
Requires: %{name} = %{version}
Requires: %{name} = %{epoch}:%{version}-%{release}
%description pp
%{dname} is a Clipper compatible compiler.

View File

@@ -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