ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/bootstrap-driver.spec
(Generate patch)

Comparing COMP/CMSDIST/bootstrap-driver.spec (file contents):
Revision 1.3 by eulisse, Tue Nov 27 13:39:48 2007 UTC vs.
Revision 1.26 by eulisse, Thu Oct 15 13:10:49 2009 UTC

# Line 1 | Line 1
1 < ### RPM external bootstrap-driver 1.0
1 > ### RPM external bootstrap-driver 19.0c
2   Source: bootstrap
3 < Requires: apt
3 > %define closingbrace )
4 > %define online %(case %cmsplatf in *onl_*_*%closingbrace echo true;; *%closingbrace echo flase;; esac)
5 >
6 > Requires: apt
7 >
8 > #danger! cms-common version is now hardwired below (and in bootstrap.file)
9  
10   %prep
11   %build
# Line 24 | Line 29 | done
29  
30  
31   case %cmsplatf in
32 < slc*online* )
32 > slc*onl* )
33      platformSeeds="glibc coreutils bash tcsh zsh pdksh perl tcl
34            readline openssl ncurses
35            e2fsprogs krb5-libs freetype fontconfig
# Line 45 | Line 50 | slc*online* )
50      platformSeeds="$platformSeeds daq-config daq-log4cplus daq-logudpappender
51          daq-logxmlappender daq-pt daq-ptfifo daq-pthttp
52          daq-pttcp daq-toolbox daq-xcept daq-xdaq2rc daq-xdata
53 <        daq-xgi daq-xoap"
53 >        daq-xgi daq-xoap daq-sentinelutils"
54      ;;
55 < *)
56 <   platformSeeds="glibc glibc-32bit coreutils bash tcsh zsh pdksh perl
55 > slc*)
56 >  # Backward compatible seeds, so that old bootstrap does not suddenly stop working.
57 >  platformSeeds="glibc glibc-32bit coreutils bash tcsh zsh pdksh perl
58 >         tcl tk perl-Tk readline openssl ncurses XFree86-libs
59 >         e2fsprogs krb5-libs freetype fontconfig XFree86-Mesa-libGLU
60 >         XFree86-Mesa-libGL xorg-x11-deprecated-libs
61 >         xorg-x11-libs xorg-x11-Mesa-libGLU xorg-x11-Mesa-libGL
62 >         compat-libstdc++-33 fglrx_6_8_0 libidn"
63 >  # Platform specific seeds. These are mandatory and the new bootstrap.sh will refuse continuing in the case they are not found.
64 >  slc4_ia32_platformSeeds="glibc coreutils bash tcsh zsh pdksh perl
65 >         tcl tk perl-Tk readline openssl ncurses XFree86-libs
66 >         e2fsprogs krb5-libs freetype fontconfig XFree86-Mesa-libGLU
67 >         XFree86-Mesa-libGL xorg-x11-deprecated-libs
68 >         xorg-x11-libs xorg-x11-Mesa-libGLU xorg-x11-Mesa-libGL
69 >         compat-libstdc++-33 fglrx_6_8_0 libidn"
70 >  slc4_amd64_platformSeeds="glibc glibc-32bit coreutils bash tcsh zsh pdksh perl
71           tcl tk perl-Tk readline openssl ncurses XFree86-libs
72           e2fsprogs krb5-libs freetype fontconfig XFree86-Mesa-libGLU
73           XFree86-Mesa-libGL xorg-x11-deprecated-libs
74           xorg-x11-libs xorg-x11-Mesa-libGLU xorg-x11-Mesa-libGL
75           compat-libstdc++-33 fglrx_6_8_0 libidn"
76 <   ;;
76 >  slc5_ia32_platformSeeds="glibc coreutils bash tcsh zsh perl tcl tk readline openssl ncurses e2fsprogs krb5-libs freetype
77 >                 fontconfig compat-libstdc++-33 libidn libX11 libXmu libSM libICE libXcursor
78 >                 libXext libXrandr libXft mesa-libGLU mesa-libGL e2fsprogs-libs libXi libXinerama libXft
79 >                 libXrender libXpm"
80 >  slc5_amd64_platformSeeds="glibc coreutils bash tcsh zsh perl tcl tk readline openssl ncurses e2fsprogs krb5-libs freetype
81 >                 fontconfig compat-libstdc++-33 libidn libX11 libXmu libSM libICE libXcursor
82 >                 libXext libXrandr libXft mesa-libGLU mesa-libGL e2fsprogs-libs libXi libXinerama libXft
83 >                 libXrender libXpm"
84 >  ;;
85   esac
86  
87   case $cmsplatf in
88 <    ydl*_ppc64* )
88 >    ydl*_ppc64_* )
89 >        platformSeeds="$platformSeeds gcc libgcc libstdc++"
90 >    ;;
91 >    ydl*_ppc_* )
92          platformSeeds="$platformSeeds gcc libgcc libstdc++"
93      ;;
94   esac
95  
96 + slc5_compPackages="compat-readline43 libXp libXtst libXt"
97 +
98 + # Seeds for unsupported platforms. These will not make bootstrap die, if not found.
99   # OpenSuse
100   unsupportedSeeds="xorg-x11-Mesa compat-readline4 compat-curl2 freetype2
101      xorg-x11-libX11"
# Line 75 | Line 108 | unsupportedSeeds="$unsupportedSeeds libc
108   # Fedora
109   unsupportedSeeds="$unsupportedSeeds libX11 libXmu libSM libICE libXcursor
110      libXext libXrandr libXft mesa-libGLU mesa-libGL e2fsprogs-libs libXi libXinerama
111 <    libXft libXrender libXpm"
111 >    libXft libXrender libXpm ncurses-libs libc6-i686"
112  
113   # Case statement for additional provides.
114   case %cmsplatf in
# Line 91 | Line 124 | unsupportedProvides="libtcl8.3.so libtk8
124                       libkrb5.so.3 libssl.so.4 /bin/csh /bin/tcsh libreadline.so.4
125                       libtcl8.4.so libtk8.4.so"
126  
127 + defaultPkgs="cms+cms-common+1.0"
128 +
129   mkdir -p %{i}/etc/profile.d
130 < (echo "instroot=%{instroot}"; \
96 < echo "rpm_version=$RPM_VERSION"; \
130 > (echo "rpm_version=$RPM_VERSION"; \
131   echo "apt_version=$APT_VERSION"; \
132   echo "platformSeeds=\"$platformSeeds\""; \
133   echo "unsupportedSeeds=\"$unsupportedSeeds\""; \
134 < echo "packageList=\"`echo $packageList | sed -e 's|\s+|\s|g'`\""; \
134 > echo "slc4_amd64_platformSeeds=\"$slc4_amd64_platformSeeds\""; \
135 > echo "slc4_ia32_platformSeeds=\"$slc4_ia32_platformSeeds\""; \
136 > echo "slc5_ia32_platformSeeds=\"$slc5_ia32_platformSeeds\""; \
137 > echo "slc5_amd64_platformSeeds=\"$slc5_amd64_platformSeeds\""; \
138 > echo "packageList=\"`echo $packageList`\""; \
139   echo "additionalProvides=\"$additionalProvides\""; \
140   echo "unsupportedProvides=\"$unsupportedProvides\""; \
141 + echo "defaultPkgs=\"$defaultPkgs\""; \
142   ) > %{i}/%{cmsplatf}-driver.txt
143 +
144 + (echo "rpm_version=$RPM_VERSION"; \
145 + echo "apt_version=$APT_VERSION"; \
146 + echo "platformSeeds=\"$platformSeeds $compPackages\""; \
147 + echo "unsupportedSeeds=\"$unsupportedSeeds\""; \
148 + echo "slc4_amd64_platformSeeds=\"$slc4_amd64_platformSeeds \""; \
149 + echo "slc4_ia32_platformSeeds=\"$slc4_ia32_platformSeeds \""; \
150 + echo "slc5_ia32_platformSeeds=\"$slc5_ia32_platformSeeds $slc5_compPackages\""; \
151 + echo "slc5_amd64_platformSeeds=\"$slc5_amd64_platformSeeds $slc5_compPackages\""; \
152 + echo "packageList=\"`echo $packageList`\""; \
153 + echo "additionalProvides=\"$additionalProvides\""; \
154 + echo "unsupportedProvides=\"$unsupportedProvides\""; \
155 + echo "defaultPkgs=\"$defaultPkgs\""; \
156 + ) > %{i}/%{cmsplatf}-driver-comp.txt
157 +
158 + # FIXME: Hack to make sure that the cms-common package is named correctly in the driver file.
159 + # We should make sure that the $PACKAGE_CATEGORY variable is used (requires changes to cmsBuild.sh which
160 + # I don't want to do at this point.
161 + perl -p -i -e 's|external[+]cms-common|cms+cms-common|g' %{i}/%{cmsplatf}-driver.txt
162 + perl -p -i -e 's|external[+]cms-common|cms+cms-common|g' %{i}/%{cmsplatf}-driver-comp.txt

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines