rpms/fpc/EL-5 fpc.spec,1.12,1.13

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/fpc/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8231

Modified Files:
	fpc.spec 
Log Message:
* Mon Nov 3 2008 Lubomir Rintel <lkundrak at v3.sl> 2.2.2-3.1
- Disable build ID for EL-5



Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/EL-5/fpc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- fpc.spec	3 Nov 2008 12:00:14 -0000	1.12
+++ fpc.spec	3 Nov 2008 12:06:10 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           fpc
 Version:        2.2.2
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -76,12 +76,18 @@
 %setup -n fpcbuild-%{version} -q
 %endif
 %patch0
+%if 0%{?fedora} > 7
 %patch1
+%endif
 %patch2
 %patch3
 %patch4
 
 %build
+%if 0%{?fedora} > 7
+%define fpcopt -k"--build-id"
+%endif
+
 # The source-files:
 mkdir -p fpc_src
 cp -a fpcsrc/rtl fpc_src
@@ -94,16 +100,15 @@
 %else
 STARTPP=%{ppcname}
 %endif
-%define fpcopt -k"--build-id -z noexecstack"
 cd fpcsrc
 NEWPP=`pwd`/compiler/%{ppcname}
 NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
 DATA2INC=`pwd`/utils/data2inc
-make compiler_cycle FPC=${STARTPP} OPT='%{fpcopt} %{fpcdebugopt}'
-make rtl_clean rtl%{smart} FPC=${NEWPP} OPT='%{fpcopt}'
-make packages%{smart} FPC=${NEWPP} OPT='%{fpcopt}'
-make ide_all FPC=${NEWPP} OPT='%{fpcopt} %{fpcdebugopt}'
-make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC} OPT='%{fpcopt} %{fpcdebugopt}'
+make compiler_cycle FPC=${STARTPP} OPT='%{?fpcopt} %{fpcdebugopt}'
+make rtl_clean rtl%{smart} FPC=${NEWPP} OPT='%{?fpcopt}'
+make packages%{smart} FPC=${NEWPP} OPT='%{?fpcopt}'
+make ide_all FPC=${NEWPP} OPT='%{?fpcopt} %{fpcdebugopt}'
+make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC} OPT='%{?fpcopt} %{fpcdebugopt}'
 
 cd ..
 make -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
@@ -179,6 +184,9 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Mon Nov 3 2008 Lubomir Rintel <lkundrak at v3.sl> 2.2.2-3.1
+- Disable build ID for EL-5
+
 * Sat Oct 25 2008 Joost van der Sluis <joost at cnoc.nl> 2.2.2-3
 - Do not distribute the RTL and packages with debug-info included
 - Fix the location of the fpc-binary in the samplecfg script