SPECS: fpc.spec - up to 2.2.2 - updated TODO - bconds ide and doc - gdb pat...

cactus cactus at pld-linux.org
Sun Nov 9 10:29:55 CET 2008 

Author: cactus                       Date: Sun Nov  9 09:29:55 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 2.2.2
- updated TODO
- bconds ide and doc
- gdb patch dropped
- rewrited build options flags - before we have always from *) match
- arch sparc is depracted now - if just for 2.0 -> different spec?
- with ide does not build

---- Files affected:
SPECS:
   fpc.spec (1.67 -> 1.68) 

---- Diffs:

================================================================
Index: SPECS/fpc.spec
diff -u SPECS/fpc.spec:1.67 SPECS/fpc.spec:1.68
--- SPECS/fpc.spec:1.67	Tue Feb 13 08:16:44 2007
+++ SPECS/fpc.spec	Sun Nov  9 10:29:49 2008
@@ -1,41 +1,48 @@
 # $Revision$, $Date$
 # TODO:
 # - check why it builds all static..
-# - doesn't build on ppc/sparc :/ hgw why
+# - doesn't build on ppc/sparc :/ hgw why - drop this ?
+# - repair ide build
+#
+# Conditional build:
+%bcond_with	ide			# build with ide
+%bcond_without	doc			# build without doc
+
 Summary:	32-bit compiler for the i386 and m68k processors
 Summary(pl.UTF-8):	32 bitowy kompilator dla procesorów i386 i m68k
 Summary(ru.UTF-8):	Свободный компилятор Pascal
 Summary(uk.UTF-8):	Вільний компілятор Pascal
 Name:		fpc
-Version:	2.0.4
-Release:	2
+Version:	2.2.2
+Release:	0.1
 License:	GPL
 Group:		Development/Languages
-Source0:	ftp://ftp.freepascal.org/pub/fpc/dist/source-%{version}/%{name}build-%{version}.tar.gz
-# Source0-md5:	1ff8b80d1f5f564983bb4e1550b8b53a
-Source1:	ftp://ftp.freepascal.org/pub/fpc/dist/i386-linux-%{version}/%{name}-%{version}.i386-linux.tar
-# Source1-md5:	d826aab69c98b9efe30398ff63e4c9d9
-Source2:	ftp://ftp.freepascal.org/pub/fpc/dist/x86_64-linux-%{version}/%{name}-%{version}.x86_64-linux.tar
-# Source2-md5:	3bbfe4c061ebd40502789eccef069d7c
-Source3:	ftp://ftp.freepascal.org/pub/fpc/dist/powerpc-linux-%{version}/%{name}-%{version}.powerpc-linux.tar
-# Source3-md5:	6ec5302fe446d94e5aaa1e159b0d65df
+Source0:	ftp://ftp.freepascal.org/fpc/dist/source-%{version}/%{name}build-%{version}.tar.gz
+# Source0-md5:	ec3d463ec9859da4122e9edfa2ab992d
+Source1:	ftp://ftp.freepascal.org/fpc/dist/i386-linux-%{version}/%{name}-%{version}.i386-linux.tar
+# Source1-md5:	ee7ddbf3ad50f6c6f237439e3ecd83d6
+Source2:	ftp://ftp.freepascal.org/fpc/dist/x86_64-linux-%{version}/%{name}-%{version}.x86_64-linux.tar
+# Source2-md5:	9671bb9f89fd64fd8db4de6c76393c62
+Source3:	ftp://ftp.freepascal.org/fpc/dist/powerpc-linux-%{version}/%{name}-%{version}.powerpc-linux.tar
+# Source3-md5:	e83013af5e6fd8272c6d26b41234f288
 # no 2.0.4 binary for sparc, 2.0.0 only
-Source4:	ftp://ftp.freepascal.org/pub/fpc/dist/sparc-linux-2.0.0/%{name}-2.0.0.sparc-linux.tar
+#Source4:	ftp://ftp.freepascal.org/fpc/dist/sparc-linux-2.0.0/%{name}-2.0.0.sparc-linux.tar
+#ftp://ftp.freepascal.org/fpc/dist/sparc-linux-2.2.2/deb/fpc_2.2.2-0.tar.gz
 # Source4-md5:	dd8925ce8ce93309456c3072e6e4d14d
 Patch0:		%{name}-skip-dev-dot.patch
 Patch1:		%{name}-makedocs.patch
-Patch2:		%{name}-gdb65.patch
-Patch3:		%{name}-avoid-RE.patch
+Patch2:		%{name}-avoid-RE.patch
 URL:		http://www.freepascal.org/
 BuildRequires:	binutils-static >= 3:2.17.50
 BuildRequires:	gdb-lib
 BuildRequires:	gpm-devel
 BuildRequires:	ncurses-devel
+%{?with_ide:BuildRequires:	readline-static}
 BuildRequires:	rpmbuild(macros) >= 1.213
-BuildRequires:	tetex-fonts-jknappen
-BuildRequires:	tetex-format-pdflatex
-BuildRequires:	tetex-makeindex
-BuildRequires:	tetex-metafont
+%{?with_doc:BuildRequires:	tetex-fonts-jknappen}
+%{?with_doc:BuildRequires:	tetex-format-pdflatex}
+%{?with_doc:BuildRequires:	tetex-makeindex}
+%{?with_doc:BuildRequires:	tetex-metafont}
 Requires:	binutils
 Provides:	fpc-bootstrap
 ExclusiveArch:	%{ix86} %{x8664} ppc sparc
@@ -105,11 +112,11 @@
 Dokumentacja do fpc w formacie PDF.
 
 %prep
-%setup -q -n %{name}build_%{version}_exp
+%setup -q -n %{name}build-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+
 %ifarch %{ix86}
 tar xf %{SOURCE1}
 %define _bver %{version}
@@ -151,14 +158,12 @@
 
 # DO NOT PUT $RPM_OPT_FLAGS IN OPT, IT DOES NOT WORK - baggins
 case "%{_build_cpu}" in
-	i386,i486)
-		OPTF="-OG2p1" ;;
-	i586)
-		OPTF="-OG2p2" ;;
-	i686,athlon)
-		OPTF="-Og2p3" ;;
-	*)
-		OPTF="-O2" ;;
+	i386) OPTF="-OG2p1" ;;
+	i486) OPTF="-OG2p1" ;;
+	i586) OPTF="-OG2p2" ;;
+	i686) OPTF="-Og2p3" ;;
+	athlon) OPTF="-Og2p3" ;;
+	*) OPTF="-O2" ;;
 esac
 
 %{__make} -C fpcsrc compiler_cycle \
@@ -168,7 +173,7 @@
 	BININSTALLDIR=%{_bindir} \
 	PP="$PP" \
 	FPC="$PP" \
-	SMARTLINK=YES
+	LINKSMART=YES
 
 %{__make} -C fpcsrc OPT="$OPTF -Xs -n" \
 	RELEASE="1" \
@@ -177,21 +182,44 @@
 	GDBLIBDIR=%{_libdir} \
 	PP="$NEWPP" \
 	FPC="$NEWPP" \
+	FPDOC=$NEWFPDOC \
 	DATA2INC=`pwd`/utils/data2inc \
-	SMARTLINK=YES \
-	rtl_clean rtl_smart \
-	packages_base_smart \
-	fcl_smart \
-	fv_smart \
-	packages_extra_smart \
-	ide_all \
-	utils_all
+	LINKSMART=YES \
+	NODOCS=YES \
+	rtl_clean \
+	packages_clean \
+	utils_clean \
+	%{?with_ide: ide_clean installer_clean} \
+	rtl_all \
+	packages_all \
+	utils_all %{?with_ide:installer_all}
+
+#	%{?with_ide:IDE=YES} \
+%if %{with ide}
+%{__make} -C fpcsrc/ide OPT="$OPTF -Xs -n" \
+	RELEASE="1" \
+	BASEINSTALLDIR=%{_libdir}/%{name}/%{version} \
+	BININSTALLDIR=%{_bindir} \
+	GDBLIBDIR=%{_libdir} \
+	PP="$NEWPP" \
+	FPC="$NEWPP" \
+	FPDOC=$NEWFPDOC \
+	DATA2INC=`pwd`/utils/data2inc \
+	LINKSMART=YES \
+	clean \
+	default \
+	gdb
+%endif
+#	%{?with_ide:installer_clean} \
+#	%{?with_ide:installer_all}
 
+%if %{with doc}
 export save_size=10000
 %{__make} -C fpcdocs \
 	FPDOC=$NEWFPDOC \
 	FPC="$NEWPP" \
 	pdf
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -204,10 +232,8 @@
 %{__make} -C fpcsrc \
 	compiler_distinstall \
 	rtl_distinstall \
-	fcl_distinstall \
-	fv_distinstall \
 	packages_distinstall \
-	ide_distinstall \
+	%{?with_ide:ide_distinstall} \
 	utils_distinstall \
 	PP="$NEWPP" \
 	FPCMAKE="$FPCMAKE" \
@@ -241,7 +267,9 @@
 %dir %{_libdir}/%{name}/lexyacc
 %{_libdir}/%{name}/%{version}/msg
 %{_libdir}/%{name}/%{version}/units
+%if %{with ide}
 %{_libdir}/%{name}/%{version}/ide
+%endif
 %{_libdir}/%{name}/lexyacc/*
 %attr(755,root,root) %{_libdir}/%{name}/%{version}/ppc%{_bname}
 %attr(755,root,root) %{_libdir}/%{name}/%{version}/samplecfg
@@ -255,9 +283,11 @@
 %defattr(644,root,root,755)
 %{_examplesdir}/fpc
 
+%if %{with doc}
 %files doc
 %defattr(644,root,root,755)
 %doc fpcdocs/*.pdf
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -265,7 +295,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.67  2007/02/13 07:16:44  glen
+Revision 1.68  2008/11/09 09:29:49  cactus
+- up to 2.2.2
+- updated TODO
+- bconds ide and doc
+- gdb patch dropped
+- rewrited build options flags - before we have always from *) match
+- arch sparc is depracted now - if just for 2.0 -> different spec?
+- with ide does not build
+
+Revision 1.67  2007-02-13 07:16:44  glen
 - tabs in preamble
 
 Revision 1.66  2007/02/12 00:48:49  baggins
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/fpc.spec?r1=1.67&r2=1.68&f=u

More information about the pld-cvs-commit mailing list