rpms/fpc/devel fpc-2.2.4-build-id.patch, 1.1, 1.2 fpc-2.2.4-samplecfg_32and64bit.patch, 1.1, 1.2 fpc-2.2.4-stackexecute.patch, 1.1, 1.2 fpc.spec, 1.32, 1.33

[Joost van der Sluis]

Author: joost

Update of /cvs/pkgs/rpms/fpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19384

Modified Files:
	fpc-2.2.4-build-id.patch fpc-2.2.4-samplecfg_32and64bit.patch 
	fpc-2.2.4-stackexecute.patch fpc.spec 
Log Message:
 * Updates for fp.cfg configuration-file

fpc-2.2.4-build-id.patch:

Index: fpc-2.2.4-build-id.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc-2.2.4-build-id.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fpc-2.2.4-build-id.patch	12 Apr 2009 19:47:04 -0000	1.1
+++ fpc-2.2.4-build-id.patch	19 Apr 2009 14:19:38 -0000	1.2
@@ -2,7 +2,7 @@
 ===================================================================
 --- fpcsrc/compiler/utils/samplecfg	(version 2.2.4)
 +++ fpcsrc/compiler/utils/samplecfg	(working copy)
-@@ -360,6 +360,11 @@
+@@ -367,6 +367,11 @@
  # to perform
  
  # -----------------------

fpc-2.2.4-samplecfg_32and64bit.patch:

Index: fpc-2.2.4-samplecfg_32and64bit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc-2.2.4-samplecfg_32and64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fpc-2.2.4-samplecfg_32and64bit.patch	12 Apr 2009 19:47:04 -0000	1.1
+++ fpc-2.2.4-samplecfg_32and64bit.patch	19 Apr 2009 14:19:39 -0000	1.2
@@ -2,25 +2,20 @@
 ===================================================================
 --- fpcsrc/compiler/utils/samplecfg	(version 2.2.4)
 +++ fpcsrc/compiler/utils/samplecfg	(working copy)
-@@ -17,7 +17,7 @@
+@@ -34,9 +34,10 @@
  
- setgccdirarch() {
- # First argument is fpc define for CPU type; remaining args are passed to gcc to set corresponding architecture
--FPCDEFINE=$1
-+FPCDEFINE="$1"/"$libdir"/fpc
- shift
- setgccdir $@
- 
-@@ -35,7 +35,7 @@
  if [ $# = 0 ]; then
    echo 'Usage :'
-   echo 'samplecfg fpcdir confdir'
+-  echo 'samplecfg fpcdir confdir'
 -  echo 'fpcdir = Path where FPC is installed'
-+  echo 'fpcdir = Prefix where FPC is installed (/usr/., /usr/local/.)'
++  echo 'samplecfg fpcdir confdir ideconfdir'
++  echo 'fpcdir = Prefix where FPC is installed (/usr, /usr/local)'
    echo 'confdir = Path to /etc'
++  echo 'ideconfdir = Prefix where FP-config file should be placed'
    exit 1
  fi
-@@ -45,9 +45,16 @@
+ if [ "$2" ]; then
+@@ -45,9 +46,20 @@
  else
    sysdir=/etc
  fi
@@ -36,21 +31,26 @@
 +else
 +  libdir=lib
 +fi
-+sysfpdirbase="$1"/"$libdir"/fpc/`$FPCBIN -iV`
++if [ "$3" ]; then
++  sysfpdirbase="$3"/"$libdir"/fpc/`$FPCBIN -iV`
++else
++  sysfpdirbase="$1"/"$libdir"/fpc/`$FPCBIN -iV`
++fi
  sysfpdirbase2=$sysfpdirbase/ide
  sysfpdir=$sysfpdirbase2/text
  fpctargetos=`$FPCBIN -iTO`
-@@ -223,7 +230,8 @@
+@@ -223,7 +236,9 @@
  
  
  # set right path to FPC with $fpcversion
 -FPCPATH=`dirname "$1"`/\$fpcversion
 +FPCPATH32="$1"/lib/fpc/\$fpcversion
 +FPCPATH64="$1"/lib64/fpc/\$fpcversion
++FPCPATH="$1"/"$libdir"/fpc/\$fpcversion
  
  # Write (.)fpc.cfg
  echo Writing sample configuration file to $fpccfgfile
-@@ -359,26 +367,48 @@
+@@ -359,26 +374,48 @@
  
  # path to the messagefile, not necessary anymore but can be used to override
  # the default language

fpc-2.2.4-stackexecute.patch:

Index: fpc-2.2.4-stackexecute.patch
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc-2.2.4-stackexecute.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fpc-2.2.4-stackexecute.patch	12 Apr 2009 19:47:04 -0000	1.1
+++ fpc-2.2.4-stackexecute.patch	19 Apr 2009 14:19:39 -0000	1.2
@@ -2,7 +2,7 @@
 ===================================================================
 --- fpcsrc/compiler/utils/samplecfg	(version 2.2.4)
 +++ fpcsrc/compiler/utils/samplecfg	(working copy)
-@@ -365,6 +365,11 @@
+@@ -372,6 +372,11 @@
  -k--build-id
  
  # -----------------------


Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- fpc.spec	12 Apr 2009 19:47:04 -0000	1.32
+++ fpc.spec	19 Apr 2009 14:19:39 -0000	1.33
@@ -132,7 +132,7 @@
 ln -sf ../%{_lib}/%{name}/%{version}/%{ppcname} %{buildroot}%{_bindir}/%{ppcname}
 
 # Create a version independent config
-%{buildroot}/%{_libdir}/%{name}/%{version}/samplecfg %{_exec_prefix}/. %{buildroot}%{_sysconfdir}
+%{buildroot}/%{_libdir}/%{name}/%{version}/samplecfg %{_exec_prefix} %{buildroot}%{_sysconfdir} %{buildroot}%{_exec_prefix}
 
 # Include the COPYING-information for the compiler/rtl/fcl in the documentation
 cp -a fpcsrc/compiler/COPYING %{buildroot}%{_defaultdocdir}/%{name}-%{version}/COPYING
@@ -175,7 +175,7 @@
 %{_datadir}/fpcsrc
 
 %changelog
-* Sun Apr 12 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-1
+* Sun Apr 19 2009 Joost van der Sluis <joost at cnoc.nl> 2.2.4-1
 - Updated to version 2.2.4
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-4