rpms/fpc/devel .cvsignore, 1.4, 1.5 fpc.spec, 1.4, 1.5 sources, 1.5, 1.6 fpc-2.0.0-G5.patch, 1.1, NONE

[Joost van der Sluis (joost)]

Author: joost

Update of /cvs/extras/rpms/fpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20798

Modified Files:
	.cvsignore fpc.spec sources 
Removed Files:
	fpc-2.0.0-G5.patch 
Log Message:
* Tue Dec 20 2005 Joost van der Sluis <joost at cnoc.nl> 2.0.2-1
- Updated to version 2.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fpc/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Aug 2005 15:55:24 -0000	1.4
+++ .cvsignore	21 Dec 2005 11:07:45 -0000	1.5
@@ -1,2 +1 @@
-fpc-2.0.0.compiler.bin.tar.gz
-fpc-2.0.0.source.tar.gz
+fpcbuild-2.0.2.tar.bz2


Index: fpc.spec
===================================================================
RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fpc.spec	17 Aug 2005 16:33:51 -0000	1.4
+++ fpc.spec	21 Dec 2005 11:07:45 -0000	1.5
@@ -1,18 +1,17 @@
 Name:           fpc
-Version:        2.0.0
-Release:        4%{?dist}
+Version:        2.0.2
+Release:        1%{?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}-%{version}.source.tar.gz
-Source1:        http://www.cnoc.nl/fpc/%{name}-%{version}.compiler.bin.tar.gz
+Source0:        ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}build-%{version}.tar.bz2
 Patch0:         %{name}-%{version}-G5.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	gpm, glibc, ncurses, binutils
-BuildRequires:  tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
+BuildRequires:  fpc, tetex, tetex-latex, tetex-fonts, binutils, gpm-devel, glibc-devel
 
 %description
 
@@ -54,20 +53,12 @@
 %endif
 
 %prep
-%setup -q -a1 -n %{name}
+%setup -q -n %{name}-src-%{version}
 %patch0 
 
 %build
-# The source-files:
-mkdir -p fpcsrc
-cp -a rtl fpcsrc
-cp -a fcl fpcsrc
-cp -a packages fpcsrc
-rm -rf fpcsrc/packages/extra/amunits
-rm -rf fpcsrc/packages/extra/winunits
-find fpcsrc -name .cvsignore -exec rm '{}' ';'
-
-STARTPP=`pwd`/startcompiler/%{ppcname}
+cd fpcsrc
+STARTPP=%{ppcname}
 NEWPP=`pwd`/compiler/%{ppcname}
 NEWFPDOC=`pwd`/utils/fpdoc/fpdoc
 DATA2INC=`pwd`/utils/data2inc
@@ -79,9 +70,10 @@
 make packages_extra_smart FPC=${NEWPP}
 make ide_all FPC=${NEWPP}
 make utils_all FPC=${NEWPP} DATA2INC=${DATA2INC}
+cd ..
 export save_size=40000
 export pool_size=1250000
-make -C docs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
+make -C fpcdocs pdf FPC=${NEWPP} FPDOC=${NEWFPDOC}
 
 # disable the debuginfo package
 %define debug_package %{nil}
@@ -89,6 +81,7 @@
 
 %install
 rm -rf %{buildroot}
+cd fpcsrc
 FPCMAKE=`pwd`/utils/fpcm/fpcmake
 NEWPP=`pwd`/compiler/%{ppcname}
 INSTALLOPTS="FPC=${NEWPP} FPCMAKE=${FPCMAKE} \
@@ -106,23 +99,28 @@
 make fv_distinstall ${INSTALLOPTS}
 make ide_distinstall ${INSTALLOPTS}
 make utils_distinstall ${INSTALLOPTS}
-
-make doc_install ${INSTALLOPTS}
-make -C docs pdfinstall ${INSTALLOPTS}
-make man_install ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ../install
+make -C doc ${INSTALLOPTS}
+make -C man ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir}
+cd ..
+make -C fpcdocs pdfinstall ${INSTALLOPTS}
 
 # create link
 ln -sf ../%{_lib}/%{name}/%{version}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname}
 
-# Include the COPYING-information in the documentation
-cp -a compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
-cp -a rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.rtl
-cp -a fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.fcl
-cp -a rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING.FPC
+# Include the COPYING-information for the fcl/rtl 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
-cp -a fpcsrc/* %{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
 
 # Workaround:
 # newer rpm versions do not allow garbage
@@ -158,6 +156,9 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Tue Dec 20 2005 Joost van der Sluis <joost at cnoc.nl> 2.0.2-1
+- Updated to version 2.0.2
+
 * Wed Aug 17 2005 Joost van der Sluis <joost at cnoc.nl> 2.0.0-4
 - Added %%{?dist} to release.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fpc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Aug 2005 15:55:24 -0000	1.5
+++ sources	21 Dec 2005 11:07:45 -0000	1.6
@@ -1,2 +1 @@
-fd5730c59bb5a87e5828568b7d039cb5  fpc-2.0.0.compiler.bin.tar.gz
-3f9c64d0146a3631f6963fd7477776d1  fpc-2.0.0.source.tar.gz
+b88893bc005c4404197ae55ef3c0de30  fpcbuild-2.0.2.tar.bz2


--- fpc-2.0.0-G5.patch DELETED ---