rpms/fpc/devel .cvsignore, 1.12, 1.13 fpc.spec, 1.36, 1.37 sources, 1.13, 1.14 fpc-2.2.4-r12475.patch, 1.1, NONE fpc-2.2.4-stackexecute.patch, 1.2, NONE
Joost van der Sluis
joost at fedoraproject.org
Wed May 5 18:51:21 UTC 2010
- Previous message: rpms/kdegraphics/F-11 kdegraphics.spec,1.215,1.216
- Next message: rpms/kaya/F-13 kaya-0.5.2-dyn.patch, NONE, 1.1 kaya-0.5.2-gc.patch, NONE, 1.1 kaya.spec, 1.11, 1.12 kaya-0.5.2-gc_api.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: joost
Update of /cvs/pkgs/rpms/fpc/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20943
Modified Files:
.cvsignore fpc.spec sources
Removed Files:
fpc-2.2.4-r12475.patch fpc-2.2.4-stackexecute.patch
Log Message:
* Wed May 5 2010 Joost van der Sluis <joost at cnoc.nl> - 2.4.0-1.fc14
- Drop fpc-2.2.4-stackexecute.patch since bug was fixed in 2.4.0
* Tue May 4 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 2.4.0-0.fc14
- Upgrade to upstream release 2.4.0.
- Drop fpc-2.2.4-r12475.patch as present in 2.4.0.
- Base the .spec build on upstream released archive (fpcbuild-2.4.0.tar.gz).
- Remove the obsolete .spec BuildRoot tag.
- Remove BuildRequires for binutils and glibc-devel as guaranteed as always
provided in Fedora Packaging Guidlines.
- Remove Requires glibc as guaranteed on a Fedora system.
- Add %%{?_smp_mflags} and -j1 appropriately, applied one -j1 workaround.
- Change {compiler,rtl}/COPYING to COPYING.txt.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/.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 5 May 2010 18:51:21 -0000 1.13
@@ -1 +1 @@
-fpcbuild-2.2.4.tar.gz
+fpcbuild-2.4.0.tar.gz
Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- fpc.spec 8 Oct 2009 10:21:08 -0000 1.36
+++ fpc.spec 5 May 2010 18:51:21 -0000 1.37
@@ -1,27 +1,24 @@
Name: fpc
-Version: 2.2.4
-Release: 4%{?dist}
+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)
+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
@@ -76,8 +73,6 @@ automatical-code generation purposes.
%endif
%patch0
%patch1
-%patch2
-%patch3
%build
# The source-files:
@@ -92,26 +87,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} \
@@ -137,8 +133,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:
@@ -177,6 +173,20 @@ rm -rf %{buildroot}
%{_datadir}/fpcsrc
%changelog
+* Wed May 5 2010 Joost van der Sluis <joost at cnoc.nl> - 2.4.0-1.fc14
+- Drop fpc-2.2.4-stackexecute.patch since bug was fixed in 2.4.0
+
+* Tue May 4 2010 Jan Kratochvil <jan.kratochvil at redhat.com> - 2.4.0-0.fc14
+- Upgrade to upstream release 2.4.0.
+ - Drop fpc-2.2.4-r12475.patch as present in 2.4.0.
+- Base the .spec build on upstream released archive (fpcbuild-2.4.0.tar.gz).
+- Remove the obsolete .spec BuildRoot tag.
+- Remove BuildRequires for binutils and glibc-devel as guaranteed as always
+ provided in Fedora Packaging Guidlines.
+- Remove Requires glibc as guaranteed on a Fedora system.
+- Add %%{?_smp_mflags} and -j1 appropriately, applied one -j1 workaround.
+- Change {compiler,rtl}/COPYING to COPYING.txt.
+
* Tue Oct 6 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-4
- fixed procvar parameter passing on ppc/sysv (by value instead of by
reference -- except for method procvars, for tmethod record compatibility)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/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 5 May 2010 18:51:21 -0000 1.14
@@ -1 +1 @@
-20bb9a4a9f1449e2249c80d7aba7c245 fpcbuild-2.2.4.tar.gz
+af49e9a8bb632f361395add30ece8934 fpcbuild-2.4.0.tar.gz
--- fpc-2.2.4-r12475.patch DELETED ---
--- fpc-2.2.4-stackexecute.patch DELETED ---
- Previous message: rpms/kdegraphics/F-11 kdegraphics.spec,1.215,1.216
- Next message: rpms/kaya/F-13 kaya-0.5.2-dyn.patch, NONE, 1.1 kaya-0.5.2-gc.patch, NONE, 1.1 kaya.spec, 1.11, 1.12 kaya-0.5.2-gc_api.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list