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

Comparing COMP/CMSDIST/apt.spec (file contents):
Revision 1.49 by eulisse, Thu Jul 12 10:05:50 2007 UTC vs.
Revision 1.62 by eulisse, Mon Jul 23 19:52:15 2007 UTC

# Line 8 | Line 8 | Requires: libxml2 beecrypt rpm zlib bz2l
8   Patch0: apt-rpm449
9   Patch1: apt-rpm446
10   Patch2: apt
11 <
11 > Patch3: apt-multiarch
12   %if "%(echo %{cmsos} | cut -d_ -f 2 | sed -e 's|.*64.*|64|')" == "64"
13   %define libdir lib64
14   %else
# Line 32 | Line 32 | esac
32   %patch2 -p1
33   %endif
34  
35 + %patch3 -p1
36 +
37   %build
38   export CFLAGS="-O0 -g"
39   export CXXFLAGS="-O0 -g"
# Line 121 | Line 123 | rpm http://cmsrep.cern.ch cms/cpt/Softwa
123   rpm-src http://cmsrep.cern.ch cms/cpt/Software/download/cms/apt/%{cmsplatf} cms lcg external
124   # This are defined to support experimental repositories. The bootstrap file rewrites and uncomments
125   # them when passed the appropriate commandline option.
126 < ## rpm @SERVER@ @SERVER_PATH@/@REPOSITORY@/apt/%{cmsplatf} @GROUPS@  
127 < ## rpm-src @SERVER@ @SERVER_PATH@/@REPOSITORY@/apt/%{cmsplatf} @GROUPS@
126 > ##rpm http://@SERVER@ @SERVER_PATH@@REPOSITORY@/apt/%{cmsplatf} @GROUPS@  
127 > ##rpm-src http://@SERVER@ @SERVER_PATH@@REPOSITORY@/apt/%{cmsplatf} @GROUPS@
128   EOF_SOURCES_LIST
129  
130   cat << \EOF_RPMPRIORITIES > %{i}/etc/rpmpriorities
# Line 188 | Line 190 | cat %_sourcedir/bootstrap | perl -p -e "
190                                          s!\@INSTROOT\@!%{instroot}!g;
191                                          " > %{i}/bin/bootstrap-%{cmsplatf}.sh
192  
193 < cat %_sourcedir/cms-apt-migration | perl -p -i -e "s!\@CMSPLATF\@!%{cmsplatf}!g;
193 > cat %_sourcedir/cms-apt-migration | perl -p -e "s!\@CMSPLATF\@!%{cmsplatf}!g;
194                                          s!\@GCC_VERSION\@!$GCC_VERSION!g;
195                                          s!\@RPM_VERSION\@!$RPM_VERSION!g;
196                                          s!\@DB4_VERSION\@!$DB4_VERSION!g;
# Line 213 | Line 215 | cat %_sourcedir/cms-apt-migration | perl
215                                          s!\@ELFUTILS_REVISION\@!$ELFUTILS_REVISION!g;
216                                          s!\@APT_VERSION\@!%{v}!g;
217                                          s!\@APT_REVISION\@!%{pkgrevision}!g;
218 <                                        s!\@INSTROOT\@!%{instroot}!g;" %{i}/bin/cms-apt-migration-%{cmsplatf}.sh
218 >                                        s!\@INSTROOT\@!%{instroot}!g;" > %{i}/bin/cms-apt-migration-%{cmsplatf}.sh
219  
220   %post
221   mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}/var/lib/apt/lists/partial

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines