* merged 1.0.1 install

Makefile.fpc

@@ -479,7 +479,7 @@ rpmcopy: distclean
         install -d $(RPMSOURCESDIR)
 # fpc.rpm
         rm -rf $(RPMSRCDIR)
-        cp $(CVSINSTALL)/fpc-$(FPC_VERSION).spec $(RPMSPECDIR)
+        cp $(CVSINSTALL)/fpc.spec $(RPMSPECDIR)/fpc-$(FPC_VERSION).spec
         install -d $(RPMSRCDIR)
         $(COPYTREE) compiler $(RPMSRCDIR)
         $(COPYTREE) rtl $(RPMSRCDIR)
@@ -496,7 +496,7 @@ rpmcopy: distclean
         cd $(RPMSRCDIR) ; tar cvz * > $(RPMSOURCESDIR)/fpc-$(FPC_VERSION)-src.tar.gz
 # fpc-docs.rpm
         rm -rf $(DOCSRCDIR)
-        cp $(CVSINSTALL)/fpc-docs-$(FPC_VERSION).spec $(RPMSPECDIR)
+        cp $(CVSINSTALL)/fpc-docs.spec $(RPMSPECDIR)/fpc-docs-$(FPC_VERSION).spec
         install -d $(DOCSRCDIR)
         $(COPYTREE) docs $(DOCSRCDIR)
         find $(DOCSRCDIR) -name 'CVS*' | xargs -n1 rm -rf

install/debian/fp-units-misc.files.in

@@ -24,8 +24,8 @@
 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crc.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crcasm.ppu 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrc.ppu 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrcasm.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.ppu 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infcodes.ppu 
@@ -69,10 +69,10 @@
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzio.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libcrcasm.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crcasm.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libcrc.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/crc.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzcrcasm.a 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrcasm.o 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzcrc.a 
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrc.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libadler.a 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.o 
 /usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libpaszlib.a 

install/debian/rules

@@ -198,7 +198,7 @@ binary-arch: build-arch arrange-arch debian-files
 	dh_installchangelogs -a
 
 	dh_installchangelogs -pfp-compiler logs/Changes.compiler
-	dh_installchangelogs -pfp-rtl logs/Changes.rtl
+	dh_installchangelogs -pfp-units-rtl logs/Changes.rtl
 	dh_installchangelogs -pfp-utils logs/Changes.utils
 	dh_installchangelogs -pfp-units-fcl logs/Changes.fcl
 	dh_installchangelogs -pfp-units-api logs/Changes.api

install/fpc-docs-1.0.1.spec → install/fpc-docs.spec

@@ -1,18 +1,20 @@
 Name: fpc-docs
 Version: 1.0.1
 Release: 1
-ExclusiveArch: i386
 Copyright: GPL
 Group: Development/Languages
 Source: fpc-docs-1.0.1-src.tar.gz
 Summary: Free Pascal Compiler Documentation
 Packager: Peter Vreman ([email protected])
 URL: http://www.freepascal.org/
+BuildRoot: /tmp/fpc-docs-build
 
 %define fpcversion 1.0.1
 %define fpcdir /usr/lib/fpc/%{fpcversion}
 %define docdir /usr/doc/fpc-%{fpcversion}
 
+%define builddocdir %{buildroot}%{docdir}
+
 %description	
 The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
 Pascal Compiler. It comes with fully TP 7.0 compatible run-time library.
@@ -28,7 +30,7 @@ This package contains the documentation in PDF format
 	make -C docs pdf
 
 %install
-	make -C docs pdfinstall DOCINSTALLDIR=%{docdir}
+	make -C docs pdfinstall DOCINSTALLDIR=%{builddocdir}
 
 %clean
 	make -C docs clean

install/fpc-1.0.1.spec → install/fpc.spec

@@ -1,18 +1,22 @@
 Name: fpc
 Version: 1.0.1
 Release: 1
-ExclusiveArch: i386
+ExclusiveArch: i386 i586 i686
 Copyright: GPL
 Group: Development/Languages
 Source: fpc-1.0.1-src.tar.gz
 Summary: Free Pascal Compiler
 Packager: Peter Vreman ([email protected])
 URL: http://www.freepascal.org/
+BuildRoot: /tmp/fpc-build
+BuildRequires: fpc
 
 %define fpcversion 1.0.1
 %define fpcdir /usr/lib/fpc/%{fpcversion}
 %define docdir /usr/doc/fpc-%{fpcversion}
 
+%define builddocdir %{buildroot}%{docdir}
+
 %description	
 The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
 Pascal Compiler. It comes with fully TP 7.0 compatible run-time library.
@@ -37,7 +41,7 @@ NEWPP=`pwd`/compiler/ppc386
 %install
 NEWPP=`pwd`/compiler/ppc386
 NEWPPUFILES=`pwd`/utils/ppufiles
-INSTALLOPTS="PP=${NEWPP} PPUFILES=${NEWPPUFILES} PREFIXINSTALLDIR=/usr"
+INSTALLOPTS="PP=${NEWPP} PPUFILES=${NEWPPUFILES} PREFIXINSTALLDIR=%{buildroot}/usr"
 	make compiler_install ${INSTALLOPTS}
 	make rtl_install ${INSTALLOPTS}
 	make fcl_install ${INSTALLOPTS}
@@ -45,12 +49,12 @@ INSTALLOPTS="PP=${NEWPP} PPUFILES=${NEWPPUFILES} PREFIXINSTALLDIR=/usr"
 	make packages_install ${INSTALLOPTS}
 	make utils_install ${INSTALLOPTS}
 
-	make fcl_exampleinstall ${INSTALLOPTS} DOCINSTALLDIR=%{docdir}
-	make api_exampleinstall ${INSTALLOPTS} DOCINSTALLDIR=%{docdir}
-	make packages_exampleinstall ${INSTALLOPTS} DOCINSTALLDIR=%{docdir}
+	make fcl_exampleinstall ${INSTALLOPTS} DOCINSTALLDIR=%{builddocdir}
+	make api_exampleinstall ${INSTALLOPTS} DOCINSTALLDIR=%{builddocdir}
+	make packages_exampleinstall ${INSTALLOPTS} DOCINSTALLDIR=%{builddocdir}
 
-	make demo_install ${INSTALLOPTS} DOCINSTALLDIR=%{docdir}
-	make doc_install ${INSTALLOPTS} DOCINSTALLDIR=%{docdir}
+	make demo_install ${INSTALLOPTS} SOURCEINSTALLDIR=%{builddocdir}
+	make doc_install ${INSTALLOPTS} DOCINSTALLDIR=%{builddocdir}
 	make man_install ${INSTALLOPTS}
 	
 %clean
@@ -61,6 +65,8 @@ INSTALLOPTS="PP=${NEWPP} PPUFILES=${NEWPPUFILES} PREFIXINSTALLDIR=/usr"
 	make packages_clean
 	make utils_clean
 
+	rm -rf %{buildroot}
+	
 %post
 FPCDIR=%{fpcdir}