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.14 by dlange, Fri Sep 12 16:15:08 2008 UTC vs.
Revision 1.27 by muzaffar, Fri Oct 23 14:39:32 2009 UTC

# Line 1 | Line 1
1   ### RPM external bootstrap-driver 19.0c
2   Source: bootstrap
3 < Requires: apt zlib expat openssl beecrypt bz2lib db4 elfutils neon libxml2 rpm
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
# Line 26 | Line 30 | done
30  
31   case %cmsplatf in
32   slc*onl* )
33 +    ##########################################################
34 +    # Backward compatible seeds, so that old bootstrap does not suddenly stop working.
35      platformSeeds="glibc coreutils bash tcsh zsh pdksh perl tcl
36            readline openssl ncurses
37            e2fsprogs krb5-libs freetype fontconfig
38            xorg-x11-deprecated-libs xorg-x11-libs xorg-x11-Mesa-libGLU
39            xorg-x11-Mesa-libGL compat-libstdc++-33 libidn"
40 <          
40 >
41      # ONLINE: seed system compiler (only libraries for runtime)
42      platformSeeds="$platformSeeds libgcc libstdc++"
43      
44      # ONLINE: seed other available system tools:
45      platformSeeds="$platformSeeds curl libpng libtiff libungif openssl qt zlib perl-DBI-1.40-8"
46 +    
47      # Python tools are commented out due to compatibility problems.
48 <    #platformSeeds="$platformSeeds python python-elementtree"
48 >    platformSeeds="$platformSeeds python python-elementtree"
49      
50      # ONLINE: seed daq-built tools:
51 <    platformSeeds="$platformSeeds daq-cgicc daq-mimetic daq-oracle daq-tinyproxy
52 <          daq-xerces daq-xdaq"
51 >    platformSeeds="$platformSeeds daq-cgicc daq-mimetic daq-oracle daq-tinyproxy  daq-xerces daq-xdaq"
52 >    
53      platformSeeds="$platformSeeds daq-config daq-log4cplus daq-logudpappender
54          daq-logxmlappender daq-pt daq-ptfifo daq-pthttp
55          daq-pttcp daq-toolbox daq-xcept daq-xdaq2rc daq-xdata
56 <        daq-xgi daq-xoap"
56 >        daq-xgi daq-xoap daq-sentinelutils"
57 >
58 >    ##########################################################
59 >    #slc4onl_ia32 Specific        
60 >    slc4onl_ia32_platformSeeds="glibc coreutils bash tcsh zsh pdksh perl tcl
61 >          readline openssl ncurses
62 >          e2fsprogs krb5-libs freetype fontconfig
63 >          xorg-x11-deprecated-libs xorg-x11-libs xorg-x11-Mesa-libGLU
64 >          xorg-x11-Mesa-libGL compat-libstdc++-33 libidn"
65 >          
66 >    # ONLINE: seed system compiler (only libraries for runtime)
67 >    slc4onl_ia32_platformSeeds="$slc4onl_ia32_platformSeeds libgcc libstdc++"
68 >    
69 >    # ONLINE: seed other available system tools:
70 >    slc4onl_ia32_platformSeeds="$slc4onl_ia32_platformSeeds curl libpng libtiff libungif openssl qt zlib perl-DBI-1.40-8"
71 >    
72 >    # Python tools are commented out due to compatibility problems.
73 >    slc4onl_ia32_platformSeeds="$slc4onl_ia32_platformSeeds python python-elementtree"
74 >    
75 >    # ONLINE: seed daq-built tools:
76 >    slc4onl_ia32_platformSeeds="$slc4onl_ia32_platformSeeds daq-cgicc daq-mimetic daq-oracle daq-tinyproxy  daq-xerces daq-xdaq"
77 >    
78 >    slc4onl_ia32_platformSeeds="$slc4onl_ia32_platformSeeds daq-config daq-log4cplus daq-logudpappender
79 >        daq-logxmlappender daq-pt daq-ptfifo daq-pthttp
80 >        daq-pttcp daq-toolbox daq-xcept daq-xdaq2rc daq-xdata
81 >        daq-xgi daq-xoap daq-sentinelutils"
82 >    
83 >    ##########################################################
84 >    #slc5onl_ia32 Specific
85 >    slc5onl_ia32_platformSeeds="glibc coreutils bash tcsh zsh perl tcl tk readline openssl ncurses e2fsprogs krb5-libs freetype
86 >                 fontconfig compat-libstdc++-33 libidn libX11 libXmu libSM libICE libXcursor
87 >                 libXext libXrandr libXft mesa-libGLU mesa-libGL e2fsprogs-libs libXi libXinerama libXft
88 >                 libXrender libXpm"
89 >    
90 >    # ONLINE: seed system compiler (only libraries for runtime)
91 >    slc5onl_ia32_platformSeeds="$slc5onl_ia32_platformSeeds libgcc libstdc++"
92 >    
93 >    # ONLINE: seed other available system tools:
94 >    slc5onl_ia32_platformSeeds="$slc5onl_ia32_platformSeeds curl libpng libtiff libungif openssl qt zlib perl-DBI-1.40-8"
95 >    
96 >    # Python tools are commented out due to compatibility problems.
97 >    slc5onl_ia32_platformSeeds="$slc5onl_ia32_platformSeeds python python-elementtree"
98 >    
99 >    # ONLINE: seed daq-built tools:
100 >    slc5onl_ia32_platformSeeds="$slc5onl_ia32_platformSeeds daq-cgicc daq-mimetic daq-oracle daq-tinyproxy  daq-xerces daq-xdaq"
101 >    
102 >    slc5onl_ia32_platformSeeds="$slc5onl_ia32_platformSeeds daq-config daq-log4cplus daq-logudpappender
103 >        daq-logxmlappender daq-pt daq-ptfifo daq-pthttp
104 >        daq-pttcp daq-toolbox daq-xcept daq-xdaq2rc daq-xdata
105 >        daq-xgi daq-xoap daq-sentinelutils"
106 >
107      ;;
108 < *)
109 <   platformSeeds="glibc glibc-32bit coreutils bash tcsh zsh pdksh perl
108 > slc*)
109 >  # Backward compatible seeds, so that old bootstrap does not suddenly stop working.
110 >  platformSeeds="glibc glibc-32bit coreutils bash tcsh zsh pdksh perl
111 >         tcl tk perl-Tk readline openssl ncurses XFree86-libs
112 >         e2fsprogs krb5-libs freetype fontconfig XFree86-Mesa-libGLU
113 >         XFree86-Mesa-libGL xorg-x11-deprecated-libs
114 >         xorg-x11-libs xorg-x11-Mesa-libGLU xorg-x11-Mesa-libGL
115 >         compat-libstdc++-33 fglrx_6_8_0 libidn"
116 >  # Platform specific seeds. These are mandatory and the new bootstrap.sh will refuse continuing in the case they are not found.
117 >  slc4_ia32_platformSeeds="glibc coreutils bash tcsh zsh pdksh perl
118 >         tcl tk perl-Tk readline openssl ncurses XFree86-libs
119 >         e2fsprogs krb5-libs freetype fontconfig XFree86-Mesa-libGLU
120 >         XFree86-Mesa-libGL xorg-x11-deprecated-libs
121 >         xorg-x11-libs xorg-x11-Mesa-libGLU xorg-x11-Mesa-libGL
122 >         compat-libstdc++-33 fglrx_6_8_0 libidn"
123 >  slc4_amd64_platformSeeds="glibc glibc-32bit coreutils bash tcsh zsh pdksh perl
124           tcl tk perl-Tk readline openssl ncurses XFree86-libs
125           e2fsprogs krb5-libs freetype fontconfig XFree86-Mesa-libGLU
126           XFree86-Mesa-libGL xorg-x11-deprecated-libs
127           xorg-x11-libs xorg-x11-Mesa-libGLU xorg-x11-Mesa-libGL
128           compat-libstdc++-33 fglrx_6_8_0 libidn"
129 <   ;;
129 >  slc5_ia32_platformSeeds="glibc coreutils bash tcsh zsh perl tcl tk readline openssl ncurses e2fsprogs krb5-libs freetype
130 >                 fontconfig compat-libstdc++-33 libidn libX11 libXmu libSM libICE libXcursor
131 >                 libXext libXrandr libXft mesa-libGLU mesa-libGL e2fsprogs-libs libXi libXinerama libXft
132 >                 libXrender libXpm"
133 >  slc5_amd64_platformSeeds="glibc coreutils bash tcsh zsh perl tcl tk readline openssl ncurses e2fsprogs krb5-libs freetype
134 >                 fontconfig compat-libstdc++-33 libidn libX11 libXmu libSM libICE libXcursor
135 >                 libXext libXrandr libXft mesa-libGLU mesa-libGL e2fsprogs-libs libXi libXinerama libXft
136 >                 libXrender libXpm"
137 >  ;;
138   esac
139  
140   case $cmsplatf in
# Line 67 | Line 146 | case $cmsplatf in
146      ;;
147   esac
148  
149 + slc5_compPackages="compat-readline43 libXp libXtst libXt"
150 +
151 + # Seeds for unsupported platforms. These will not make bootstrap die, if not found.
152   # OpenSuse
153   unsupportedSeeds="xorg-x11-Mesa compat-readline4 compat-curl2 freetype2
154      xorg-x11-libX11"
# Line 79 | Line 161 | unsupportedSeeds="$unsupportedSeeds libc
161   # Fedora
162   unsupportedSeeds="$unsupportedSeeds libX11 libXmu libSM libICE libXcursor
163      libXext libXrandr libXft mesa-libGLU mesa-libGL e2fsprogs-libs libXi libXinerama
164 <    libXft libXrender libXpm ncurses-libs"
164 >    libXft libXrender libXpm ncurses-libs libc6-i686"
165  
166   # Case statement for additional provides.
167   case %cmsplatf in
# Line 98 | Line 180 | unsupportedProvides="libtcl8.3.so libtk8
180   defaultPkgs="cms+cms-common+1.0"
181  
182   mkdir -p %{i}/etc/profile.d
183 < (echo "instroot=%{instroot}"; \
102 < echo "rpm_version=$RPM_VERSION"; \
183 > (echo "rpm_version=$RPM_VERSION"; \
184   echo "apt_version=$APT_VERSION"; \
185   echo "platformSeeds=\"$platformSeeds\""; \
186   echo "unsupportedSeeds=\"$unsupportedSeeds\""; \
187 + echo "slc4_amd64_platformSeeds=\"$slc4_amd64_platformSeeds\""; \
188 + echo "slc4_ia32_platformSeeds=\"$slc4_ia32_platformSeeds\""; \
189 + echo "slc5_ia32_platformSeeds=\"$slc5_ia32_platformSeeds\""; \
190 + echo "slc5_amd64_platformSeeds=\"$slc5_amd64_platformSeeds\""; \
191   echo "packageList=\"`echo $packageList`\""; \
192   echo "additionalProvides=\"$additionalProvides\""; \
193   echo "unsupportedProvides=\"$unsupportedProvides\""; \
194   echo "defaultPkgs=\"$defaultPkgs\""; \
195   ) > %{i}/%{cmsplatf}-driver.txt
196 +
197 + (echo "rpm_version=$RPM_VERSION"; \
198 + echo "apt_version=$APT_VERSION"; \
199 + echo "platformSeeds=\"$platformSeeds $compPackages\""; \
200 + echo "unsupportedSeeds=\"$unsupportedSeeds\""; \
201 + echo "slc4_amd64_platformSeeds=\"$slc4_amd64_platformSeeds \""; \
202 + echo "slc4_ia32_platformSeeds=\"$slc4_ia32_platformSeeds \""; \
203 + echo "slc5_ia32_platformSeeds=\"$slc5_ia32_platformSeeds $slc5_compPackages\""; \
204 + echo "slc5_amd64_platformSeeds=\"$slc5_amd64_platformSeeds $slc5_compPackages\""; \
205 + echo "packageList=\"`echo $packageList`\""; \
206 + echo "additionalProvides=\"$additionalProvides\""; \
207 + echo "unsupportedProvides=\"$unsupportedProvides\""; \
208 + echo "defaultPkgs=\"$defaultPkgs\""; \
209 + ) > %{i}/%{cmsplatf}-driver-comp.txt
210 +
211   # FIXME: Hack to make sure that the cms-common package is named correctly in the driver file.
212   # We should make sure that the $PACKAGE_CATEGORY variable is used (requires changes to cmsBuild.sh which
213   # I don't want to do at this point.
214   perl -p -i -e 's|external[+]cms-common|cms+cms-common|g' %{i}/%{cmsplatf}-driver.txt
215 + 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