[fpc] Upgrade to upstream release 2.6.2.
Joost van der Sluis-Jansen
joost at fedoraproject.org
Thu Apr 25 19:54:17 UTC 2013
commit 9d597760bf6728856c65bd5064af94c057563eb6
Author: Joost van der Sluis <joost at cnoc.nl>
Date: Thu Apr 25 21:51:52 2013 +0200
Upgrade to upstream release 2.6.2.
.gitignore | 1 +
...2.6.2rc1-r22920.patch => fpc-2.6.2-r22920.patch | 0
fpc.spec | 16 +++++----
fpcdocs-2.6.2rc1-r954.patch | 33 --------------------
sources | 2 +-
5 files changed, 11 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 345fa6e..00b42bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ fpcbuild-2.4.0.tar.gz
/fpcbuild-2.4.2.tar.gz
/fpcbuild-2.6.0.tar.gz
/fpcbuild-2.6.2rc1.tar.gz
+/fpcbuild-2.6.2.tar.gz
diff --git a/fpc-2.6.2rc1-r22920.patch b/fpc-2.6.2-r22920.patch
similarity index 100%
rename from fpc-2.6.2rc1-r22920.patch
rename to fpc-2.6.2-r22920.patch
diff --git a/fpc.spec b/fpc.spec
index 9582961..1416e10 100644
--- a/fpc.spec
+++ b/fpc.spec
@@ -1,6 +1,6 @@
Name: fpc
Version: 2.6.2
-Release: 0.2.rc1%{?dist}
+Release: 1%{?dist}
Summary: Free Pascal Compiler
Group: Development/Languages
@@ -8,7 +8,7 @@ License: GPLv2+ and LGPLv2+ with exceptions
URL: http://www.freepascal.org/
#Source0: ftp://ftp.freepascal.org/pub/fpc/dist/${version}/source/fpcbuild-%{version}.tar.gz
# rc1 version
-Source0: ftp://ftp.freepascal.org/pub/fpc/beta/2.6.2-rc1/source/fpcbuild-2.6.2rc1.tar.gz
+Source0: ftp://ftp.freepascal.org/pub/fpc/dist/2.6.2/source/fpcbuild-2.6.2.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
@@ -17,8 +17,7 @@ Source0: ftp://ftp.freepascal.org/pub/fpc/beta/2.6.2-rc1/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
+Patch0: fpc-2.6.2-r22920.patch
Requires: gpm, ncurses, binutils
%if ! %{defined useprebuiltcompiler}
@@ -74,12 +73,12 @@ automatical-code generation purposes.
%prep
%if %{defined useprebuiltcompiler}
-%setup -a1 -n fpcbuild-%{version}rc1 -q
+%setup -a1 -n fpcbuild-%{version} -q
%else
-%setup -n fpcbuild-%{version}rc1 -q
+%setup -n fpcbuild-%{version} -q
%endif
%patch0
-%patch1
+#%patch1
%build
# The source-files:
@@ -191,6 +190,9 @@ rm -rf %{buildroot}
%{_datadir}/fpcsrc
%changelog
+* Wed Apr 24 2013 Joost van der Sluis <joost at cnoc.nl> - 2.6.2-1
+- Upgrade to upstream release 2.6.2.
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.2-0.2.rc1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index fa32746..b9901e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6ccdbb12f69e3beb714bc56f9af0eb77 fpcbuild-2.6.2rc1.tar.gz
+89c7e60db6280f3d5cc006a4a9ff43a9 fpcbuild-2.6.2.tar.gz
More information about the scm-commits
mailing list