rpms/fpc/EL-6 .cvsignore, 1.12, 1.13 fpc.spec, 1.38, 1.39 sources, 1.13, 1.14

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/fpc/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27558

Modified Files:
	.cvsignore fpc.spec sources 
Log Message:
* Fri May 14 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.4.0-1
- Initial EPEL-6 build, bootstrapping



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fpc/EL-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	12 Apr 2009 19:47:03 -0000	1.12
+++ .cvsignore	14 May 2010 15:11:20 -0000	1.13
@@ -1 +1,2 @@
-fpcbuild-2.2.4.tar.gz
+fpcbuild-2.4.0.tar.gz
+fpc-2.4.0.compiler.bin.tar.gz


Index: fpc.spec
===================================================================
RCS file: /cvs/extras/rpms/fpc/EL-6/fpc.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- fpc.spec	16 Oct 2009 06:44:55 -0000	1.38
+++ fpc.spec	14 May 2010 15:11:20 -0000	1.39
@@ -1,27 +1,26 @@
+%global useprebuiltcompiler 1
+
 Name:           fpc
-Version:        2.2.4
-Release:        4%{?dist}.2
+Version:        2.4.0
+Release:        1%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
 License:        GPLv2+ and LGPLv2+ with exceptions
 URL:            http://www.freepascal.org/
-Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}build-%{version}.tar.gz
+Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/${version}/source/fpcbuild-%{version}.tar.gz
 # This is only needed when useprebuiltcompiler is defined.
 # But it's not in an 'if defined' block, since the file has to be included in the srpm
 # Thus you should enable this line when useprebuildcompiler is defined for any target
-# Source1:        http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
-Patch0:         %{name}-%{version}-samplecfg_32and64bit.patch
-Patch1:         %{name}-%{version}-build-id.patch
-Patch2:         %{name}-%{version}-stackexecute.patch
-Patch3:         %{name}-%{version}-r12475.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source1:        http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
+Patch0:         fpc-2.2.4-samplecfg_32and64bit.patch
+Patch1:         fpc-2.2.4-build-id.patch
 
-Requires:       gpm, glibc, ncurses, binutils
+Requires:       gpm, ncurses, binutils
 %if ! %{defined useprebuiltcompiler}
 BuildRequires:  fpc
 %endif
-BuildRequires:  tetex, tetex-latex, tetex-fonts, binutils, glibc-devel
+BuildRequires:  tetex, tetex-latex, tetex-fonts
 
 ExcludeArch:    s390 s390x
 
@@ -77,8 +76,6 @@ automatical-code generation purposes.
 %endif
 %patch0
 %patch1
-%patch2
-%patch3
 
 %build
 # The source-files:
@@ -93,26 +90,27 @@ STARTPP=`pwd`/startcompiler/%{ppcname}
 %else
 STARTPP=%{ppcname}
 %endif
-%define fpcopt -k"--build-id -z noexecstack"
+%define fpcopt -k"--build-id"
 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 %{?_smp_mflags} compiler_cycle FPC=${STARTPP} OPT='%{fpcopt} %{fpcdebugopt}'
+make %{?_smp_mflags} rtl_clean rtl%{smart} FPC=${NEWPP} OPT='%{fpcopt}'
+make %{?_smp_mflags} packages%{smart} FPC=${NEWPP} OPT='%{fpcopt}'
+make %{?_smp_mflags} ide_all FPC=${NEWPP} OPT='%{fpcopt} %{fpcdebugopt}'
+make %{?_smp_mflags} utils_all FPC=${NEWPP} DATA2INC=${DATA2INC} OPT='%{fpcopt} %{fpcdebugopt}'
 
 cd ..
-make -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
+# FIXME: -j1 as there is a race - seen on "missing" `rtl.xct'.
+make -j1 -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
 
 %install
 rm -rf %{buildroot}
 cd fpcsrc
 FPCMAKE=`pwd`/utils/fpcm/fpcmake
 NEWPP=`pwd`/compiler/%{ppcname}
-INSTALLOPTS="FPC=${NEWPP} FPCMAKE=${FPCMAKE} \
+INSTALLOPTS="-j1 FPC=${NEWPP} FPCMAKE=${FPCMAKE} \
                 INSTALL_PREFIX=%{buildroot}%{_prefix} \
                 INSTALL_LIBDIR=%{buildroot}%{_libdir} \
                 INSTALL_BASEDIR=%{buildroot}%{_libdir}/%{name}/%{version} \
@@ -138,8 +136,8 @@ ln -sf ../%{_lib}/%{name}/%{version}/%{p
 %{buildroot}/%{_libdir}/%{name}/%{version}/samplecfg %{_exec_prefix} %{buildroot}%{_sysconfdir} %{buildroot}%{_exec_prefix}
 
 # Include the COPYING-information for the compiler/rtl/fcl in the documentation
-cp -a fpcsrc/compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
-cp -a fpcsrc/rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
+cp -a fpcsrc/compiler/COPYING.txt %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
+cp -a fpcsrc/rtl/COPYING.txt %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
 cp -a fpcsrc/rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
 
 # The source-files:
@@ -178,6 +176,9 @@ rm -rf %{buildroot}
 %{_datadir}/fpcsrc
 
 %changelog
+* Fri May 14 2010 Tomas Bzatek <tbzatek at redhat.com> - 2.4.0-1
+- Initial EPEL-6 build, bootstrapping
+
 * Fri Oct 16 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-4.2
 - Fixed compilation on ppc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fpc/EL-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Apr 2009 19:47:04 -0000	1.13
+++ sources	14 May 2010 15:11:20 -0000	1.14
@@ -1 +1,2 @@
-20bb9a4a9f1449e2249c80d7aba7c245  fpcbuild-2.2.4.tar.gz
+af49e9a8bb632f361395add30ece8934  fpcbuild-2.4.0.tar.gz
+a44e593cfcf0b89c43c3cb548633d26b  fpc-2.4.0.compiler.bin.tar.gz