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.26 by eulisse, Thu Jun 21 15:06:31 2007 UTC vs.
Revision 1.42 by eulisse, Wed Jul 4 12:33:27 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   Requires: libxml2 beecrypt rpm zlib bz2lib openssl
7 + Patch0: apt-rpm449
8 + Patch1: apt-rpm446
9   %if "%(echo %{cmsos} | cut -d_ -f 2 | sed -e 's|.*64.*|64|')" == "64"
10   %define libdir lib64
11   %else
# Line 13 | Line 14 | Requires: libxml2 beecrypt rpm zlib bz2l
14  
15   %prep
16   %setup -n %n-%{realversion}
17 + case $RPM_VERSION in
18 +    4.4.9*)
19   %patch0 -p0
20 +        ;;
21 +    4.4.6*)
22 + %patch1 -p0
23 +        ;;
24 + esac
25   %build
26 < export CPPFLAGS="-I$BEECRYPT_ROOT/include -I$RPM_ROOT/include -I$RPM_ROOT/include/rpm"
27 < export LDFLAGS="-L$BEECRYPT_ROOT/%{libdir} -L$RPM_ROOT/%{libdir}"
26 > export CFLAGS="-O0 -g"
27 > export CXXFLAGS="-O0 -g"
28 > export CPPFLAGS="-I$BZ2LIB_ROOT/include -I$BEECRYPT_ROOT/include -I$RPM_ROOT/include -I$RPM_ROOT/include/rpm"
29 > export LDFLAGS="-L$BZ2LIB_ROOT/lib -L$BEECRYPT_ROOT/%{libdir} -L$RPM_ROOT/%{libdir}"
30   export LIBDIR="$LIBS"
31   export LIBXML2_CFLAGS="-I$LIBXML2_ROOT/include/libxml2 -I$BEECRYPT_ROOT/include -I$RPM_ROOT/include"
32   export LIBXML2_LIBS="-lxml2 -L$LIBXML2_ROOT/lib -L$BEECRYPT_ROOT/%{libdir} -L$RPM_ROOT/%{libdir}"
# Line 25 | Line 35 | export LIBXML2_LIBS="-lxml2 -L$LIBXML2_R
35                              --disable-nls \
36                              --disable-dependency-tracking \
37                              --without-libintl-prefix \
38 +                            --disable-docs \
39                              --disable-rpath
40   make %makeprocesses
41  
# Line 62 | Line 73 | Dir "%{instroot}"
73  
74    // Locations of binaries
75        Bin {
76 <             methods "%{i}/%{libdir}/apt/methods/";
76 >             methods "%{i}/lib/apt/methods/";
77               gzip "/bin/gzip";
78               dpkg "/usr/bin/dpkg";
79               dpkg-source "/usr/bin/dpkg-source";
# Line 74 | Line 85 | Dir "%{instroot}"
85                                                                                                            
86  
87    // Config files
88 <    Etc "%{cmsplatf}/external/apt/%{realversion}/etc/" {
88 >    Etc "%{cmsplatf}/external/apt/%{v}/etc/" {
89                         sourcelist "sources.list";
90                         main "apt.conf";
91                         preferences "preferences";
# Line 86 | Line 97 | Debug::pkgProblemResolver="1";
97   RPM
98   {
99      PM "external";
100 <    Options { "--define";"_rpmlock_path %{instroot}/%{cmsplatf}/var/lib/rpm/lock";"--dbpath";"%{instroot}/var/lib/rpm";"--nodeps";};
101 <    Install-Options { "--define";"_rpmlock_path %{instroot}/%{cmsplatf}/var/lib/rpm/lock";"--nodeps";"--force";"--dbpath";"%{instroot}/%{cmsplatf}/var/lib/rpm";"--prefix";"%{instroot}";};
100 >    Options { "--nodeps";};
101 >    Install-Options { "--nodeps";"--force";"--prefix";"%{instroot}";"--ignoreos";"--ignorearch";};
102      RootDir "%{instroot}";
103      Architecture "%{cmsplatf}";
104   };
105   EOF_APT_CONF
106  
107   cat << \EOF_SOURCES_LIST > %{i}/etc/sources.list
108 < rpm http://cmsrep.cern.ch cms/cpt/Software/download/cms.eulisse/apt/%{cmsplatf} cms lcg external
109 < rpm-src http://cmsrep.cern.ch cms/cpt/Software/download/cms.eulisse/apt/%{cmsplatf} cms lcg external
108 > rpm http://cmsrep.cern.ch cms/cpt/Software/download/cms/apt/%{cmsplatf} cms lcg external
109 > rpm-src http://cmsrep.cern.ch cms/cpt/Software/download/cms/apt/%{cmsplatf} cms lcg external
110   # This are defined to support experimental repositories. The bootstrap file rewrites and uncomments
111   # them when passed the appropriate commandline option.
112   ## rpm @SERVER@ @SERVER_PATH@/@REPOSITORY@/apt/%{cmsplatf} @GROUPS@  
# Line 175 | Line 186 | mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}
186   mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}/var/lib/dpkg/status
187   mkdir -p $RPM_INSTALL_PREFIX/bin
188   mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}/var/lib/cache/%{cmsplatf}
178 –
189   %{relocateConfig}etc/profile.d/dependencies-setup.sh
190   %{relocateConfig}etc/profile.d/dependencies-setup.csh
191   %{relocateConfig}bin/apt-cache-wrapper
192   %{relocateConfig}bin/apt-get-wrapper
193   %{relocateConfig}bin/rpm-wrapper
194 < %{reloacteConfig}etc/apt/apt.conf
195 < %files
196 < %{i}
194 > %{relocateConfig}etc/apt.conf
195 >
196 >

Diff Legend

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