* use standard macros, patch by Soos Peter

This commit is contained in:
peter 2002-11-22 16:33:08 +00:00
parent 11d5367e01
commit c304e3ba52
2 changed files with 43 additions and 28 deletions

View File

@ -1,17 +1,16 @@
Name: fpc-docs Name: fpc-docs
Version: 1.1 Version: 1.1
Release: 1 Release: 0
Copyright: GPL Copyright: GPL
Group: Development/Languages Group: Development/Languages
Source: fpc-docs-1.1-src.tar.gz Source: %{name}-%{version}-src.tar.gz
Summary: Free Pascal Compiler Documentation Summary: Free Pascal Compiler Documentation
Packager: Peter Vreman (peter@freepascal.org) Packager: Peter Vreman (peter@freepascal.org)
URL: http://www.freepascal.org/ URL: http://www.freepascal.org/
BuildRoot: /tmp/fpc-docs-build BuildRoot: %{_tmppath}/fpc-build
%define fpcversion 1.1 %define fpcdir %{_libdir}/fpc/%{version}
%define fpcdir /usr/lib/fpc/%{fpcversion} %define docdir %{_docdir}/fpc-%{version}
%define docdir /usr/doc/fpc-%{fpcversion}
%define builddocdir %{buildroot}%{docdir} %define builddocdir %{buildroot}%{docdir}
@ -30,12 +29,18 @@ This package contains the documentation in PDF format
make -C docs pdf make -C docs pdf
%install %install
if [ %{buildroot} != "/" ]; then
rm -rf %{buildroot} rm -rf %{buildroot}
fi
make -C docs pdfinstall DOCINSTALLDIR=%{builddocdir} make -C docs pdfinstall DOCINSTALLDIR=%{builddocdir}
%clean %clean
make -C docs clean make -C docs clean
if [ %{buildroot} != "/" ]; then
rm -rf %{buildroot} rm -rf %{buildroot}
fi
%files %files
/usr %defattr(-, root, root)
%doc %{docdir}/*

View File

@ -1,21 +1,23 @@
Name: fpc Name: fpc
Version: 1.1 Version: 1.1
Release: 1 Release: 0
ExclusiveArch: i386 i586 i686 ExclusiveArch: i386 i586 i686
Copyright: GPL Copyright: GPL
Group: Development/Languages Group: Development/Languages
Source: fpc-1.1-src.tar.gz Source: %{name}-%{version}-src.tar.gz
Summary: Free Pascal Compiler Summary: Free Pascal Compiler
Packager: Peter Vreman (peter@freepascal.org) Packager: Peter Vreman (peter@freepascal.org)
URL: http://www.freepascal.org/ URL: http://www.freepascal.org/
BuildRoot: /tmp/fpc-build BuildRoot: %{_tmppath}/fpc-build
BuildRequires: fpc BuildRequires: fpc
%define fpcversion 1.1 %define fpcdir %{_libdir}/fpc/%{version}
%define fpcdir /usr/lib/fpc/%{fpcversion} %define docdir %{_docdir}/fpc-%{version}
%define docdir /usr/doc/fpc-%{fpcversion}
%define builddocdir %{buildroot}%{docdir} %define builddocdir %{buildroot}%{docdir}
%define buildmandir %{buildroot}%{_mandir}
%define buildbindir %{buildroot}%{_bindir}
%define buildlibdir %{buildroot}%{_libdir}
%description %description
The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
@ -33,15 +35,19 @@ utils. Provided units are the runtime library (RTL), free component library
NEWPP=`pwd`/compiler/ppc386 NEWPP=`pwd`/compiler/ppc386
make compiler_cycle FPC_VERSION=`ppc386 -iV` make compiler_cycle FPC_VERSION=`ppc386 -iV`
make rtl_clean rtl_smart FPC=${NEWPP} make rtl_clean rtl_smart FPC=${NEWPP}
make packages_smart FPC=${NEWPP} make packages_base_smart FPC=${NEWPP}
make fcl_smart FPC=${NEWPP} make fcl_smart FPC=${NEWPP}
make packages_extra_smart FPC=${NEWPP}
make utils_all FPC=${NEWPP} make utils_all FPC=${NEWPP}
%install %install
if [ %{buildroot} != "/" ]; then
rm -rf %{buildroot} rm -rf %{buildroot}
fi
NEWPP=`pwd`/compiler/ppc386 NEWPP=`pwd`/compiler/ppc386
INSTALLOPTS="FPC=${NEWPP} INSTALL_PREFIX=%{buildroot}/usr INSTALL_DOCDIR=%{builddocdir}" INSTALLOPTS="FPC=${NEWPP} INSTALL_PREFIX=%{buildroot}/usr INSTALL_LIBDIR=%{buildlibdir} \
INSTALL_DOCDIR=%{builddocdir} INSTALL_BINDIR=%{buildbindir}"
make compiler_distinstall ${INSTALLOPTS} make compiler_distinstall ${INSTALLOPTS}
make rtl_distinstall ${INSTALLOPTS} make rtl_distinstall ${INSTALLOPTS}
make packages_distinstall ${INSTALLOPTS} make packages_distinstall ${INSTALLOPTS}
@ -50,7 +56,11 @@ INSTALLOPTS="FPC=${NEWPP} INSTALL_PREFIX=%{buildroot}/usr INSTALL_DOCDIR=%{build
make demo_install ${INSTALLOPTS} INSTALL_SOURCEDIR=%{builddocdir} make demo_install ${INSTALLOPTS} INSTALL_SOURCEDIR=%{builddocdir}
make doc_install ${INSTALLOPTS} make doc_install ${INSTALLOPTS}
make man_install ${INSTALLOPTS} make man_install ${INSTALLOPTS} INSTALL_PREFIX=%{buildmandir}
# create link
ln -sf %{fpcdir}/ppc386 %{buildroot}%{_bindir}/ppc386
%clean %clean
make compiler_clean make compiler_clean
@ -59,20 +69,20 @@ INSTALLOPTS="FPC=${NEWPP} INSTALL_PREFIX=%{buildroot}/usr INSTALL_DOCDIR=%{build
make fcl_clean make fcl_clean
make utils_clean make utils_clean
if [ %{buildroot} != "/" ]; then
rm -rf %{buildroot} rm -rf %{buildroot}
fi
%post %post
FPCDIR=%{fpcdir}
# create link
ln -sf $FPCDIR/ppc386 /usr/bin/ppc386
# Create config # Create config
$FPCDIR/samplecfg $FPCDIR %{fpcdir}/samplecfg %{fpcdir}
# update ld.so cache # update ld.so cache
#ldconfig #ldconfig
%files %files
/usr %defattr(-, root, root)
%{_bindir}/*
%{fpcdir}
%doc %{docdir}/*
%{_mandir}/*/*