[fpc] Upgrade to upstream release 2.6.2rc1.

Joost van der Sluis-Jansen joost at fedoraproject.org
Sat Nov 3 22:21:45 UTC 2012


commit 53ed249cfe6f6b3feb94cb9cd1faaae6a3e00831
Author: Joost van der Sluis <joost at cnoc.nl>
Date:   Sat Nov 3 23:18:46 2012 +0100

    Upgrade to upstream release 2.6.2rc1.

 .gitignore                  |    1 +
 fpc-2.6.2rc1-r22920.patch   |   11 +++++++++++
 fpc.spec                    |    9 ++++++++-
 fpcdocs-2.6.2rc1-r954.patch |   33 +++++++++++++++++++++++++++++++++
 sources                     |    2 +-
 5 files changed, 54 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5fc4902..345fa6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ fpcbuild-2.4.0.tar.gz
 /fpcbuild-2.4.2rc1.tar.gz
 /fpcbuild-2.4.2.tar.gz
 /fpcbuild-2.6.0.tar.gz
+/fpcbuild-2.6.2rc1.tar.gz
diff --git a/fpc-2.6.2rc1-r22920.patch b/fpc-2.6.2rc1-r22920.patch
new file mode 100644
index 0000000..33aab9d
--- /dev/null
+++ b/fpc-2.6.2rc1-r22920.patch
@@ -0,0 +1,11 @@
+--- fpcsrc/compiler/msg/errore.msg_	2012-11-03 18:11:32.766841639 +0100
++++ fpcsrc/compiler/msg/errore.msg	2012-11-03 18:12:02.071528768 +0100
+@@ -2939,7 +2939,7 @@
+ % Mac OS X only DWARF debug information can be stored externally.
+ option_invalid_macosx_deployment_target=11049_E_Invalid value for MACOSX_DEPLOYMENT_TARGET environment variable: $1
+ option_invalid_iphoneos_deployment_target=11050_E_Invalid value for IPHONEOS_DEPLOYMENT_TARGET environment variable: $1
+-% On Mac OS X, the MACOSX_DEPLOYMENT_TARGET/IPHONEOS_DEPLOYMENT_TARGET environment variable can be
++% On Mac OS X, the MACOSX\_DEPLOYMENT\_TARGET/IPHONEOS\_DEPLOYMENT\_TARGET environment variable can be
+ % used to set the default target OS version. In case of Mac OS X, it has to be of the format
+ % XY.Z or XY.Z.AB with X, Y,Z , A and B all digits from 0-9.
+ % In case of iOS, it has to be X.Z.A, where X, Z and A can all be either 1 or 2
diff --git a/fpc.spec b/fpc.spec
index afd2980..be260e0 100644
--- a/fpc.spec
+++ b/fpc.spec
@@ -1,5 +1,5 @@
 Name:           fpc
-Version:        2.6.0
+Version:        2.6.2rc1
 Release:        3%{?dist}
 Summary:        Free Pascal Compiler
 
@@ -15,6 +15,8 @@ Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/${version}/source/fpcbuild
 Source2:        fpc.cft
 Source3:        fppkg.cfg
 Source4:        default.cft
+Patch0:         fpc-2.6.2rc1-r22920.patch
+Patch1:         fpcdocs-2.6.2rc1-r954.patch
 
 Requires:       gpm, ncurses, binutils
 %if ! %{defined useprebuiltcompiler}
@@ -74,6 +76,8 @@ automatical-code generation purposes.
 %else
 %setup -n fpcbuild-%{version} -q
 %endif
+%patch0
+%patch1
 
 %build
 # The source-files:
@@ -185,6 +189,9 @@ rm -rf %{buildroot}
 %{_datadir}/fpcsrc
 
 %changelog
+* Sat Nov 3 2012 Joost van der Sluis <joost at cnoc.nl> - 2.6.2rc1-1
+- Upgrade to upstream release 2.6.2rc1.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/fpcdocs-2.6.2rc1-r954.patch b/fpcdocs-2.6.2rc1-r954.patch
new file mode 100644
index 0000000..1af84cc
--- /dev/null
+++ b/fpcdocs-2.6.2rc1-r954.patch
@@ -0,0 +1,33 @@
+Index: fpcdocs/db.xml
+===================================================================
+--- fpcdocs/db.xml	(revision 953)
++++ fpcdocs/db.xml	(revision 954)
+@@ -8537,14 +8537,14 @@
+ </p>
+ <ol>
+ <li>The cursor is on the last record, and the <link id="TDataset.Next"/> method is called.</li>
+-<li>The <link id="TDataset.Last"/> method is called (which is equivalent to moving to the last record and calling <link id="TDataset.Next">).</li>
++<li>The <link id="TDataset.Last"/> method is called (which is equivalent to moving to the last record and calling <link id="TDataset.Next"/>).</li>
+ <li>The dataset is empty when opened.</li>
+ </ol>
+ <p>
+ In all other cases, <var>EOF</var> is <var>False</var>. Note: when the cursor is on the last-but-one record, and <var>Next</var> is called (moving the cursor to the last record), <var>EOF</var> will not yet 
+ be <var>True</var>. Only if both the cursor is on the last record <b>and</b> <var>Next</var> is called, will <var>EOF</var> become <var>True</var>.
+ </p>
+-</> 
++<p> 
+ This means that the following loop will stop after the last record was visited:
+ </p>
+ <code>
+Index: fpcdocs/sysutils.xml
+===================================================================
+--- fpcdocs/sysutils.xml	(revision 953)
++++ fpcdocs/sysutils.xml	(revision 954)
+@@ -3685,6 +3685,7 @@
+ <var>GetAppConfigFile</var> returns the name of a file in which the
+ application can store its configuration parameters. The exact name and
+ location of the file depends on the customs of the operating system.
++</p>
+ <p>
+ The <var>Global</var> parameter determines whether it is a global 
+ configuration file (value <var>True</var>) or a personal configuration
diff --git a/sources b/sources
index 933400a..fa32746 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-17375e665a4e1311f85812fe2754f609  fpcbuild-2.6.0.tar.gz
+6ccdbb12f69e3beb714bc56f9af0eb77  fpcbuild-2.6.2rc1.tar.gz


More information about the scm-commits mailing list