rpms/fpc/F-7 .cvsignore,1.6,1.7 fpc.spec,1.11,1.12 sources,1.7,1.8
Joost van der Sluis (joost)
fedora-extras-commits at redhat.com
Tue Oct 16 14:43:33 UTC 2007
Author: joost
Update of /cvs/pkgs/rpms/fpc/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11730
Modified Files:
.cvsignore fpc.spec sources
Log Message:
* Mon Oct 16 2007 Joost van der Sluis <joost at cnoc.nl> 2.2.0-3
- Disabled smart-linking on ppc64
* Mon Oct 16 2007 Joost van der Sluis <joost at cnoc.nl> 2.2.0-2
- Buildrequirement fpc is not needed when using a pre-built compiler binary
* Sun Oct 14 2007 Joost van der Sluis <joost at cnoc.nl> 2.2.0-1
- Updated to version 2.2.0
- Updated description
- Enabled smart-linking for ppc
- Do not include the built binary-files in fpc-src
- Added support for ppc64
- Added support to configuration file for dual 32/64 bit installations
- Fixed and enabled debug-package
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/F-7/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 15 Sep 2006 17:24:10 -0000 1.6
+++ .cvsignore 16 Oct 2007 14:42:59 -0000 1.7
@@ -1 +1 @@
-fpcbuild-2.0.4.zip
+fpcbuild-2.2.0.tar.gz
Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/F-7/fpc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fpc.spec 16 Sep 2006 13:57:27 -0000 1.11
+++ fpc.spec 16 Oct 2007 14:42:59 -0000 1.12
@@ -1,30 +1,40 @@
+%ifarch ppc64
+%define useprebuiltcompiler 1
+%endif
+
Name: fpc
-Version: 2.0.4
-Release: 2%{?dist}
+Version: 2.2.0
+Release: 3%{?dist}
Summary: Free Pascal Compiler
Group: Development/Languages
License: GPL and modified LGPL
URL: http://www.freepascal.org/
-Source0: ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}build-%{version}.zip
+Source0: ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}build-%{version}.tar.gz
+%if %{defined useprebuiltcompiler}
+Source1: http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
+%endif
+Patch0: %{name}-%{version}-samplecfg_32and64bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gpm, glibc, ncurses, binutils
-BuildRequires: fpc, tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
+Requires: gpm, glibc, ncurses, binutils
+%if ! %{defined useprebuiltcompiler}
+BuildRequires: fpc
+%endif
+BuildRequires: tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
%description
Freepascal is a free 32/64bit Pascal Compiler. It comes with a run-time
-library fully compatible with Turbo Pascal 7.0 and nearly Delphi compatible.
-Some extensions are added to the language, like function overloading. Shared
-libraries can be linked. This package contains commandline compiler and
-utils. Provided units are the runtime library (RTL), free component library
-(FCL) and bindings for among others gtk1, gtk2, ncurses, zlib, mysql, postgres
-and ibase.
+library and is fully compatible with Turbo Pascal 7.0 and nearly Delphi
+compatible. Some extensions are added to the language, like function
+overloading and generics. Shared libraries can be linked. This package
+contains commandline compiler and utils. Provided units are the runtime
+library (RTL), free component library (FCL) and the base and extra packages.
%package doc
-Summary: Free Pascal Compiler - documentation and examples
-Group: Development/Languages
+Summary: Freepascal Compiler - documentation and examples
+Group: Documentation
%description doc
@@ -32,7 +42,7 @@
of Freepascal.
%package src
-Summary: Free Pascal Compiler - sources
+Summary: Freepascal Compiler - sources
Group: Development/Languages
%description src
@@ -40,49 +50,60 @@
The fpc-src package contains the sources of Freepascal, for documentation or
automatical-code generation purposes.
-
%ifarch ppc
%define ppcname ppcppc
-%define smart _all
+%define smart _smart
%else
%ifarch x86_64
%define ppcname ppcx64
-%define smart _smart
+%define smart _smart
+%else
+%ifarch ppc64
+%define ppcname ppcppc64
+%define smart _all
%else
%define ppcname ppc386
-%define smart _smart
+%define smart _smart
+%endif
%endif
%endif
%prep
-%setup -n fpcbuild_%{version}_exp
+%if %{defined useprebuiltcompiler}
+%setup -a1 -n fpcbuild-%{version} -q
+%else
+%setup -n fpcbuild-%{version} -q
+%endif
+%patch0
%build
-cd fpcsrc
+# The source-files:
+mkdir -p fpc_src
+cp -a fpcsrc/rtl fpc_src
+cp -a fpcsrc/packages fpc_src
+rm -rf fpc_src/packages/extra/amunits
+rm -rf fpc_src/packages/extra/winunits
+
+%if %{defined useprebuiltcompiler}
+STARTPP=`pwd`/startcompiler/%{ppcname}
+%else
STARTPP=%{ppcname}
+%endif
+cd fpcsrc
NEWPP=`pwd`/compiler/%{ppcname}
NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
DATA2INC=`pwd`/utils/data2inc
-make compiler_cycle FPC=${STARTPP}
-make rtl_clean rtl%{smart} FPC=${NEWPP}
-make packages_base%{smart} FPC=${NEWPP}
-make fcl%{smart} FPC=${NEWPP}
-make fv%{smart} FPC=${NEWPP}
-make packages_extra%{smart} FPC=${NEWPP}
-make ide_all FPC=${NEWPP}
-make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC}
+make compiler_cycle FPC=${STARTPP} OPT='-gl'
+make rtl_clean rtl%{smart} FPC=${NEWPP} OPT='-gl'
+make packages_base%{smart} FPC=${NEWPP} OPT='-gl'
+make packages_fcl%{smart} FPC=${NEWPP} OPT='-gl'
+make fv%{smart} FPC=${NEWPP} OPT='-gl'
+make packages_extra%{smart} FPC=${NEWPP} OPT='-gl'
+make ide_all FPC=${NEWPP} OPT='-gl'
+make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC} OPT='-gl'
cd ..
-# fpdoc version 2.0.4 crashes on powerpc, so use an older version
-%ifarch ppc
- make -C fpcdocs pdf FPC=${NEWPP} FPDOC=/usr/bin/fpdoc
-%else
- make -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
-%endif
-
-# disable the debuginfo package
-%define debug_package %{nil}
-%define __spec_install_post /usr/lib/rpm/brp-compress
+make -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
%install
rm -rf %{buildroot}
@@ -92,15 +113,14 @@
INSTALLOPTS="FPC=${NEWPP} FPCMAKE=${FPCMAKE} \
INSTALL_PREFIX=%{buildroot}%{_prefix} \
INSTALL_LIBDIR=%{buildroot}%{_libdir} \
- INSTALL_BASEDIR=%{buildroot}%{_libdir}/%{name}/%{version} \
- CODPATH=%{buildroot}%{_libdir}/%{name}/lexyacc \
+ INSTALL_BASEDIR=%{buildroot}%{_libdir}/%{name}/%{version} \
+ CODPATH=%{buildroot}%{_libdir}/%{name}/lexyacc \
INSTALL_DOCDIR=%{buildroot}%{_defaultdocdir}/%{name}-%{version} \
INSTALL_BINDIR=%{buildroot}%{_bindir}
- INSTALL_EXAMPLEDIR=%{buildroot}%{_defaultdocdir}/%{name}-%{version}/examples"
+ INSTALL_EXAMPLEDIR=%{buildroot}%{_defaultdocdir}/%{name}-%{version}/examples"
make compiler_distinstall ${INSTALLOPTS}
make rtl_distinstall ${INSTALLOPTS}
make packages_distinstall ${INSTALLOPTS}
-make fcl_distinstall ${INSTALLOPTS}
make fv_distinstall ${INSTALLOPTS}
make ide_distinstall ${INSTALLOPTS}
make utils_distinstall ${INSTALLOPTS}
@@ -113,19 +133,17 @@
# create link
ln -sf ../%{_lib}/%{name}/%{version}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname}
-# Include the COPYING-information for the fcl/rtl in the documentation
+# Create a version independent config
+%{buildroot}/%{_libdir}/%{name}/%{version}/samplecfg %{_exec_prefix}/. %{buildroot}%{_sysconfdir}
+
+# 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/fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
cp -a fpcsrc/rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
# The source-files:
mkdir -p %{buildroot}%{_datadir}/fpcsrc
-rm -rf fpcsrc/packages/extra/amunits
-rm -rf fpcsrc/packages/extra/winunits
-cp -a fpcsrc/rtl %{buildroot}%{_datadir}/fpcsrc
-cp -a fpcsrc/fcl %{buildroot}%{_datadir}/fpcsrc
-cp -a fpcsrc/packages %{buildroot}%{_datadir}/fpcsrc
+cp -a fpc_src/* %{buildroot}%{_datadir}/fpcsrc/
# Workaround:
# newer rpm versions do not allow garbage
@@ -135,15 +153,12 @@
%clean
rm -rf %{buildroot}
-%post
-# Create a version independent config
-%{_libdir}/%{name}/%{version}/samplecfg %{_libdir}/%{name}/%{version} > /dev/null
-
-
%files
%defattr(-,root,root,-)
%{_bindir}/*
%{_libdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}.cfg
+%dir %{_defaultdocdir}/%{name}-%{version}/
%doc %{_defaultdocdir}/%{name}-%{version}/NEWS
%doc %{_defaultdocdir}/%{name}-%{version}/README
%doc %{_defaultdocdir}/%{name}-%{version}/readme.ide
@@ -153,6 +168,7 @@
%files doc
%defattr(-,root,root,-)
+%dir %{_defaultdocdir}/%{name}-%{version}/
%doc %{_defaultdocdir}/%{name}-%{version}/*.pdf
%doc %{_defaultdocdir}/%{name}-%{version}/examples
@@ -161,6 +177,21 @@
%{_datadir}/fpcsrc
%changelog
+* Mon Oct 16 2007 Joost van der Sluis <joost at cnoc.nl> 2.2.0-3
+- Disabled smart-linking on ppc64
+
+* Mon Oct 16 2007 Joost van der Sluis <joost at cnoc.nl> 2.2.0-2
+- Buildrequirement fpc is not needed when using a pre-built compiler binary
+
+* Sun Oct 14 2007 Joost van der Sluis <joost at cnoc.nl> 2.2.0-1
+- Updated to version 2.2.0
+- Updated description
+- Enabled smart-linking for ppc
+- Do not include the built binary-files in fpc-src
+- Added support for ppc64
+- Added support to configuration file for dual 32/64 bit installations
+- Fixed and enabled debug-package
+
* Sat Sep 16 2006 Joost van der Sluis <joost at cnoc.nl> 2.0.4-2
- Fixed documentation building on powerpc
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/F-7/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 15 Sep 2006 17:24:10 -0000 1.7
+++ sources 16 Oct 2007 14:42:59 -0000 1.8
@@ -1 +1 @@
-2f7389fd46a27082f753f60c1f545830 fpcbuild-2.0.4.zip
+0869cfd07d012b702ff08c0a4196624b fpcbuild-2.2.0.tar.gz
More information about the fedora-extras-commits
mailing list