rpms/fpc/devel fpc.spec,1.12,1.13

[Joost van der Sluis (joost)]

Author: joost

Update of /cvs/pkgs/rpms/fpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30007

Modified Files:
	fpc.spec 
Log Message:
* Mon Oct 16 2007 Joost van der Sluis <joost at cnoc.nl> 2.2.0-2
- Buildrequirement fpc is not needed when using a pre-built compiler binary



Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fpc.spec	15 Oct 2007 20:08:16 -0000	1.12
+++ fpc.spec	16 Oct 2007 09:04:59 -0000	1.13
@@ -1,7 +1,5 @@
 %ifarch ppc64
 %define useprebuiltcompiler 1
-%else
-%define useprebuiltcompiler 0
 %endif
 
 Name:           fpc
@@ -13,14 +11,17 @@
 License:        GPL and modified LGPL
 URL:            http://www.freepascal.org/
 Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}build-%{version}.tar.gz
-%if %{useprebuiltcompiler}
+%if %{defined useprebuiltcompiler}
 Source1:        http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
 %endif
 Patch0:         %{name}-%{version}-samplecfg_32and64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       gpm, glibc, ncurses, binutils
-BuildRequires:  fpc, tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
+%if ! %{defined useprebuiltcompiler}
+BuildRequires:  fpc
+%endif
+BuildRequires:  tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
 
 %description
 
@@ -66,7 +67,7 @@
 %endif
 
 %prep
-%if %{useprebuiltcompiler}
+%if %{defined useprebuiltcompiler}
 %setup -a1 -n fpcbuild-%{version} -q
 %else
 %setup -n fpcbuild-%{version} -q
@@ -81,7 +82,7 @@
 rm -rf fpc_src/packages/extra/amunits
 rm -rf fpc_src/packages/extra/winunits
 
-%if %{useprebuiltcompiler}
+%if %{defined useprebuiltcompiler}
 STARTPP=`pwd`/startcompiler/%{ppcname}
 %else
 STARTPP=%{ppcname}
@@ -174,6 +175,9 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Mon Oct 16 2007 Joost van der Sluis <joost at cnoc.nl> 2.2.0-2
+- Buildrequirement fpc is not needed when using a pre-built compiler binary
+
 * Sun Oct 14 2007 Joost van der Sluis <joost at cnoc.nl> 2.2.0-1
 - Updated to version 2.2.0
 - Updated description