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.27 by eulisse, Thu Jun 21 15:09:54 2007 UTC vs.
Revision 1.63 by eulisse, Tue Jul 24 16:28:10 2007 UTC

# Line 1 | Line 1
1 < ### RPM external apt 0.5.15lorg3.2-wt1
1 > ### RPM external apt 0.5.15lorg3.2-CMS3
2   ## INITENV SET APT_CONFIG %{i}/etc/apt.conf
3  
4 +
5   Source:  http://apt-rpm.org/releases/%n-%realversion.tar.bz2
6   Source1: bootstrap
7 < Patch0: apt-rpm449
7 > Source2: cms-apt-migration
8   Requires: libxml2 beecrypt rpm zlib bz2lib openssl
9 + Patch0: apt-rpm449
10 + Patch1: apt-rpm446
11 + Patch2: apt
12 + Patch3: apt-multiarch
13   %if "%(echo %{cmsos} | cut -d_ -f 2 | sed -e 's|.*64.*|64|')" == "64"
14   %define libdir lib64
15   %else
16   %define libdir lib
17   %endif
18  
19 +
20   %prep
21   %setup -n %n-%{realversion}
22 + case $RPM_VERSION in
23 +    4.4.9*)
24   %patch0 -p0
25 +        ;;
26 +    4.4.6*)
27 + %patch1 -p0
28 +        ;;
29 + esac
30 +
31 + # scandir has a different prototype between macosx and linux.
32 + %if "%(uname)" == "Darwin"
33 + %patch2 -p1
34 + %endif
35 +
36 + %patch3 -p1
37 +
38   %build
39 < export CPPFLAGS="-I$BEECRYPT_ROOT/include -I$RPM_ROOT/include -I$RPM_ROOT/include/rpm"
40 < export LDFLAGS="-L$BEECRYPT_ROOT/%{libdir} -L$RPM_ROOT/%{libdir}"
39 > export CFLAGS="-O0 -g"
40 > export CXXFLAGS="-O0 -g"
41 > export CPPFLAGS="-I$BZ2LIB_ROOT/include -I$BEECRYPT_ROOT/include -I$RPM_ROOT/include -I$RPM_ROOT/include/rpm"
42 > export LDFLAGS="-L$BZ2LIB_ROOT/lib -L$BEECRYPT_ROOT/%{libdir} -L$RPM_ROOT/%{libdir}"
43   export LIBDIR="$LIBS"
44   export LIBXML2_CFLAGS="-I$LIBXML2_ROOT/include/libxml2 -I$BEECRYPT_ROOT/include -I$RPM_ROOT/include"
45   export LIBXML2_LIBS="-lxml2 -L$LIBXML2_ROOT/lib -L$BEECRYPT_ROOT/%{libdir} -L$RPM_ROOT/%{libdir}"
# Line 25 | Line 48 | export LIBXML2_LIBS="-lxml2 -L$LIBXML2_R
48                              --disable-nls \
49                              --disable-dependency-tracking \
50                              --without-libintl-prefix \
51 +                            --disable-docs \
52                              --disable-rpath
53   make %makeprocesses
54  
# Line 39 | Line 63 | mkdir -p %{i}/etc/profile.d
63   echo "source $RPM_ROOT/etc/profile.d/init.csh"; \
64   echo "source $LIBXML2_ROOT/etc/profile.d/init.csh" ) > %{i}/etc/profile.d/dependencies-setup.csh
65  
66 +
67   mkdir -p %{i}/etc/apt
68   cat << \EOF_APT_CONF > %{i}/etc/apt.conf
69   Dir "%{instroot}"
# Line 62 | Line 87 | Dir "%{instroot}"
87  
88    // Locations of binaries
89        Bin {
90 <             methods "%{i}/%{libdir}/apt/methods/";
90 >             methods "%{i}/lib/apt/methods/";
91               gzip "/bin/gzip";
92               dpkg "/usr/bin/dpkg";
93               dpkg-source "/usr/bin/dpkg-source";
# Line 74 | Line 99 | Dir "%{instroot}"
99                                                                                                            
100  
101    // Config files
102 <    Etc "%{cmsplatf}/external/apt/%{realversion}/etc/" {
102 >    Etc "%{cmsplatf}/external/apt/%{v}/etc/" {
103                         sourcelist "sources.list";
104                         main "apt.conf";
105                         preferences "preferences";
# Line 86 | Line 111 | Debug::pkgProblemResolver="1";
111   RPM
112   {
113      PM "external";
114 <    Options { "--define";"_rpmlock_path %{instroot}/%{cmsplatf}/var/lib/rpm/lock";"--dbpath";"%{instroot}/var/lib/rpm";"--nodeps";};
115 <    Install-Options { "--define";"_rpmlock_path %{instroot}/%{cmsplatf}/var/lib/rpm/lock";"--nodeps";"--force";"--dbpath";"%{instroot}/%{cmsplatf}/var/lib/rpm";"--prefix";"%{instroot}";};
114 >    Options { };
115 >    Install-Options { "--force";"--prefix";"%{instroot}";"--ignoreos";"--ignorearch";};
116      RootDir "%{instroot}";
117      Architecture "%{cmsplatf}";
118   };
119   EOF_APT_CONF
120  
121 +
122   cat << \EOF_SOURCES_LIST > %{i}/etc/sources.list
123 < rpm http://cmsrep.cern.ch cms/cpt/Software/download/cms.eulisse/apt/%{cmsplatf} cms lcg external
124 < rpm-src http://cmsrep.cern.ch cms/cpt/Software/download/cms.eulisse/apt/%{cmsplatf} cms lcg external
123 > rpm http://cmsrep.cern.ch cms/cpt/Software/download/cms/apt/%{cmsplatf} cms lcg external
124 > rpm-src http://cmsrep.cern.ch cms/cpt/Software/download/cms/apt/%{cmsplatf} cms lcg external
125   # This are defined to support experimental repositories. The bootstrap file rewrites and uncomments
126   # them when passed the appropriate commandline option.
127 < ## rpm @SERVER@ @SERVER_PATH@/@REPOSITORY@/apt/%{cmsplatf} @GROUPS@  
128 < ## rpm-src @SERVER@ @SERVER_PATH@/@REPOSITORY@/apt/%{cmsplatf} @GROUPS@
127 > ##rpm http://@SERVER@ @SERVER_PATH@@REPOSITORY@/apt/%{cmsplatf} @GROUPS@  
128 > ##rpm-src http://@SERVER@ @SERVER_PATH@@REPOSITORY@/apt/%{cmsplatf} @GROUPS@
129   EOF_SOURCES_LIST
130  
131   cat << \EOF_RPMPRIORITIES > %{i}/etc/rpmpriorities
# Line 165 | Line 191 | cat %_sourcedir/bootstrap | perl -p -e "
191                                          s!\@INSTROOT\@!%{instroot}!g;
192                                          " > %{i}/bin/bootstrap-%{cmsplatf}.sh
193  
194 + cat %_sourcedir/cms-apt-migration | perl -p -e "s!\@CMSPLATF\@!%{cmsplatf}!g;
195 +                                        s!\@GCC_VERSION\@!$GCC_VERSION!g;
196 +                                        s!\@RPM_VERSION\@!$RPM_VERSION!g;
197 +                                        s!\@DB4_VERSION\@!$DB4_VERSION!g;
198 +                                        s!\@LIBXML2_VERSION\@!$LIBXML2_VERSION!g;
199 +                                        s!\@OPENSSL_VERSION\@!$OPENSSL_VERSION!g;
200 +                                        s!\@BEECRYPT_VERSION\@!$BEECRYPT_VERSION!g;
201 +                                        s!\@BZ2LIB_VERSION\@!$BZ2LIB_VERSION!g;
202 +                                        s!\@ZLIB_VERSION\@!$ZLIB_VERSION!g;
203 +                                        s!\@EXPAT_VERSION\@!$EXPAT_VERSION!g;
204 +                                        s!\@ELFUTILS_VERSION\@!$ELFUTILS_VERSION!g;
205 +                                        s!\@NEON_VERSION\@!$NEON_VERSION!g;
206 +                                        s!\@GCC_REVISION\@!$GCC_REVISION!g;
207 +                                        s!\@BEECRYPT_REVISION\@!$BEECRYPT_REVISION!g;
208 +                                        s!\@RPM_REVISION\@!$RPM_REVISION!g;
209 +                                        s!\@OPENSSL_REVISION\@!$OPENSSL_REVISION!g;
210 +                                        s!\@DB4_REVISION\@!$DB4_REVISION!g;
211 +                                        s!\@LIBXML2_REVISION\@!$LIBXML2_REVISION!g;
212 +                                        s!\@BZ2LIB_REVISION\@!$BZ2LIB_REVISION!g;
213 +                                        s!\@ZLIB_REVISION\@!$ZLIB_REVISION!g;
214 +                                        s!\@EXPAT_REVISION\@!$EXPAT_REVISION!g;
215 +                                        s!\@NEON_REVISION\@!$NEON_REVISION!g;
216 +                                        s!\@ELFUTILS_REVISION\@!$ELFUTILS_REVISION!g;
217 +                                        s!\@APT_VERSION\@!%{v}!g;
218 +                                        s!\@APT_REVISION\@!%{pkgrevision}!g;
219 +                                        s!\@INSTROOT\@!%{instroot}!g;" > %{i}/bin/cms-apt-migration-%{cmsplatf}.sh
220 +
221   %post
222   mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}/var/lib/apt/lists/partial
223   mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}/var/lib/rpm
# Line 175 | Line 228 | mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}
228   mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}/var/lib/dpkg/status
229   mkdir -p $RPM_INSTALL_PREFIX/bin
230   mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}/var/lib/cache/%{cmsplatf}
178 –
231   %{relocateConfig}etc/profile.d/dependencies-setup.sh
232   %{relocateConfig}etc/profile.d/dependencies-setup.csh
233   %{relocateConfig}bin/apt-cache-wrapper
234   %{relocateConfig}bin/apt-get-wrapper
235   %{relocateConfig}bin/rpm-wrapper
236 < %{reloacteConfig}etc/apt.conf
185 < %files
186 < %{i}
236 > %{relocateConfig}etc/apt.conf

Diff Legend

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