diff --git a/tools/install/rpm/fpc-src.spec b/tools/install/rpm/fpc-src.spec index 6c53e2d087..b65a5142c0 100644 --- a/tools/install/rpm/fpc-src.spec +++ b/tools/install/rpm/fpc-src.spec @@ -7,7 +7,7 @@ Source: %{name}-%{version}-%{release}.source.tar.gz Summary: FreePascal sources Packager: Mattias Gaertner (mattias@freepascal.org) URL: http://www.freepascal.org/ -BuildRoot: %{_tmppath}/fpc-src-build%{version} +BuildRoot: %{_tmppath}/%{name}-build%{version} %define fpcsrcdir %{_datadir}/fpcsrc %define destdir %{buildroot}%{fpcsrcdir}/%{version} diff --git a/tools/install/rpm/fpc.spec.template b/tools/install/rpm/fpc.spec.template index 3bb25b3a71..71c44b695a 100644 --- a/tools/install/rpm/fpc.spec.template +++ b/tools/install/rpm/fpc.spec.template @@ -8,9 +8,9 @@ Summary: Free Pascal Compiler AutoReqProv: no Group: Development/Languages -License: GPL and modified LGPL +License: GPL2 and modified LGPL2 URL: http://www.freepascal.org/ -Source0: ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}-%{release}.source.tar.gz +Source: ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}-%{version}-%{release}.source.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: glibc, binutils @@ -29,24 +29,6 @@ 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. -#%package doc -#Summary: Free Pascal Compiler - documentation and examples -#Group: Development/Languages -# -#%description doc -# -#The fpc-doc package contains the documentation (in pdf format) and examples -#of Freepascal. -#The fpc-doc package contains the sources of Freepascal, for documentation or -#automatical-code generation purposes. - -%package src -Summary: Free Pascal Compiler - sources -Group: Development/Languages - -%description src -The sources of FPC - the Free Pascal Compiler and its packages. - %ifarch ppc %define ppcname ppcppc %else @@ -63,14 +45,9 @@ The sources of FPC - the Free Pascal Compiler and its packages. %prep -#%setup -q -a0 -n %{name} %setup -q -n %{name} %build -# The source-files: -mkdir -p fpcsrc -cp -a rtl fpcsrc/ -cp -a packages fpcsrc/ rm -rf packages/extra/amunits rm -rf packages/extra/winunits @@ -78,7 +55,6 @@ if [ -z "$STARTPP" ]; then STARTPP=`which %{ppcname}` fi NEWPP=`pwd`/compiler/%{ppcname} -NEWFPDOC=`pwd`/utils/fpdoc/fpdoc DATA2INC=`pwd`/utils/data2inc make distclean all FPC=${STARTPP} @@ -106,43 +82,19 @@ NEWPP=`pwd`/compiler/%{ppcname} FPCVERSION=`${NEWPP} -iV` FPCFULLVERSION=`${NEWPP} -iW` INSTALLOPTS="FPC=${NEWPP} FPCMAKE=${FPCMAKE} DATA2INC=${DATA2INC} \ - INSTALL_PREFIX=%{buildroot}%{_prefix} \ - INSTALL_LIBDIR=%{buildroot}%{_libdir} \ - INSTALL_BASEDIR=%{buildroot}%{_libdir}/%{name}/${FPCVERSION} \ - CODPATH=%{buildroot}%{_libdir}/%{name}/lexyacc \ - INSTALL_DOCDIR=%{buildroot}%{_defaultdocdir}/%{name}-${FPCVERSION} \ - INSTALL_BINDIR=%{buildroot}%{_bindir} - INSTALL_EXAMPLEDIR=%{buildroot}%{_defaultdocdir}/%{name}-${FPCVERSION}/examples" -make compiler_install ${INSTALLOPTS} -make rtl_install ${INSTALLOPTS} -make packages_install ${INSTALLOPTS} -#make fv_install ${INSTALLOPTS} -#make ide_install ${INSTALLOPTS} -make utils_install ${INSTALLOPTS} - -#make doc_install ${INSTALLOPTS} -#make -C docs pdfinstall ${INSTALLOPTS} -#make man_install ${INSTALLOPTS} INSTALL_MANDIR=%{buildroot}%{_mandir} + INSTALL_PREFIX=%{buildroot}%{_prefix} \ + INSTALL_LIBDIR=%{buildroot}%{_libdir} \ + INSTALL_BASEDIR=%{buildroot}%{_libdir}/%{name}/${FPCVERSION} \ + INSTALL_BINDIR=%{buildroot}%{_bindir}" +make install ${INSTALLOPTS} # create link -ln -sf ../%{_lib}/%{name}/${FPCVERSION}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname} - -# Include the COPYING-information in the documentation -#cd fpcsrc -#cp -a compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-${FPCVERSION}/COPYING -#cp -a rtl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-${FPCVERSION}/COPYING.rtl -#cp -a fcl/COPYING %{buildroot}%{_defaultdocdir}/%{name}-${FPCVERSION}/COPYING.fcl -#cp -a rtl/COPYING.FPC %{buildroot}%{_defaultdocdir}/%{name}-${FPCVERSION}/COPYING.FPC -#cd - - -# The source-files: -mkdir -p %{buildroot}%{_datadir}/fpcsrc -cp -a fpcsrc/* %{buildroot}%{_datadir}/fpcsrc/ +ln -sf %{_libdir}/%{name}/${FPCVERSION}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname} # Workaround: # newer rpm versions do not allow garbage -# delete lexyacc rm -rf %{buildroot}%{_libdir}/%{name}/lexyacc +rm -rf %{buildroot}%{_prefix}/lib/%{name}/lexyacc rm -rf %{buildroot}%{_defaultdocdir}/fpc-libc-* rm -rf %{buildroot}%{_defaultdocdir}/fpc-symbolic-* # 2.7.1 ignores the INSTALL_DOC variable and writes some files directly to /usr/share/doc @@ -160,25 +112,12 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_bindir}/* %{_libdir}/%{name} -# Note: 2.6.1 does not create /usr/share/doc the defaultdocdir -#%dir %{_defaultdocdir} -#%doc %{_defaultdocdir}/%{name}-${FPCVERSION}/NEWS -#%doc %{_defaultdocdir}/%{name}-${FPCVERSION}/README -#%doc %{_defaultdocdir}/%{name}-${FPCVERSION}/readme.ide -#%doc %{_defaultdocdir}/%{name}-${FPCVERSION}/faq* -#%doc %{_defaultdocdir}/%{name}-${FPCVERSION}/COPYING* -#%{_mandir}/*/* - -#%files doc -#%defattr(-,root,root,-) -#%doc %{_defaultdocdir}/%{name}-${FPCVERSION}/*.pdf -#%doc %{_defaultdocdir}/%{name}-${FPCVERSION}/examples - -%files src -%defattr(-,root,root,-) -%{_datadir}/fpcsrc %changelog +* Sat Feb 25 2017 Mattias Gaertner 3.0.2 +- 64bit +- removed src and doc + * Thu Jul 28 2005 Joost van der Sluis 2.0.0-1 - Added some requirements - Added COPYING-info to %%doc