[fpc] - Upgrade to upstream release 2.4.2.

Joost van der Sluis joost at fedoraproject.org
Wed Jan 5 11:59:17 UTC 2011


commit a07eb118b3cc261137123c09f630e4fe87fc84a6
Author: Joost van der Sluis <joost at cnoc.nl>
Date:   Wed Jan 5 13:57:18 2011 +0100

    - Upgrade to upstream release 2.4.2.

 .gitignore                     |    1 +
 fpc-2.4.2-makefilespaces.patch |   82 ----------------------------------------
 fpc-2.4.2-r16198.patch         |   22 -----------
 fpc.spec                       |   15 +++----
 sources                        |    2 +-
 5 files changed, 9 insertions(+), 113 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0bd1b36..57a296f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 fpcbuild-2.4.0.tar.gz
 /fpcbuild-2.4.2rc1.tar.gz
+/fpcbuild-2.4.2.tar.gz
diff --git a/fpc.spec b/fpc.spec
index 4da153c..2878e2b 100644
--- a/fpc.spec
+++ b/fpc.spec
@@ -1,12 +1,12 @@
 Name:           fpc
 Version:        2.4.2
-Release:        0.1.rc1%{?dist}
+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/${version}/source/fpcbuild-%{version}rc1.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
@@ -14,8 +14,6 @@ Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/${version}/source/fpcbuild
 Patch0:         fpc-2.4.2-samplecfg_32and64bit.patch
 Patch1:         fpc-2.4.2-build-id.patch
 Patch2:         fpc-2.4.2-r15671.patch
-Patch3:         fpc-2.4.2-r16198.patch
-Patch4:         fpc-2.4.2-makefilespaces.patch
 
 Requires:       gpm, ncurses, binutils
 %if ! %{defined useprebuiltcompiler}
@@ -70,15 +68,13 @@ 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
 %patch2
-%patch3
-%patch4
 
 %build
 # The source-files:
@@ -179,6 +175,9 @@ rm -rf %{buildroot}
 %{_datadir}/fpcsrc
 
 %changelog
+* Wed Jan 5 2011 Joost van der Sluis <joost at cnoc.nl> - 2.4.2-1
+- Upgrade to upstream release 2.4.2.
+
 * Sat Oct 23 2010 Joost van der Sluis <joost at cnoc.nl> - 2.4.2-0.1.rc1
 - Upgrade to upstream release 2.4.2rc1.
 
diff --git a/sources b/sources
index 6f03249..1159108 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0e8ef45bbb6b788f009e6eeed9003250  fpcbuild-2.4.2rc1.tar.gz
+35ff506cca77b999097ffed61705be95  fpcbuild-2.4.2.tar.gz


More information about the scm-commits mailing list