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

Diff Legend

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