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.30 by eulisse, Fri Jun 22 08:17:01 2007 UTC

# Line 15 | Line 15 | Requires: libxml2 beecrypt rpm zlib bz2l
15   %setup -n %n-%{realversion}
16   %patch0 -p0
17   %build
18 + export CFLAGS="-O2 -g"
19 + export CXXFLAGS="-O2 -g"
20   export CPPFLAGS="-I$BEECRYPT_ROOT/include -I$RPM_ROOT/include -I$RPM_ROOT/include/rpm"
21   export LDFLAGS="-L$BEECRYPT_ROOT/%{libdir} -L$RPM_ROOT/%{libdir}"
22   export LIBDIR="$LIBS"
# Line 62 | Line 64 | Dir "%{instroot}"
64  
65    // Locations of binaries
66        Bin {
67 <             methods "%{i}/%{libdir}/apt/methods/";
67 >             methods "%{i}/lib/apt/methods/";
68               gzip "/bin/gzip";
69               dpkg "/usr/bin/dpkg";
70               dpkg-source "/usr/bin/dpkg-source";
# Line 74 | Line 76 | Dir "%{instroot}"
76                                                                                                            
77  
78    // Config files
79 <    Etc "%{cmsplatf}/external/apt/%{realversion}/etc/" {
79 >    Etc "%{cmsplatf}/external/apt/%{v}/etc/" {
80                         sourcelist "sources.list";
81                         main "apt.conf";
82                         preferences "preferences";
# Line 175 | Line 177 | mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}
177   mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}/var/lib/dpkg/status
178   mkdir -p $RPM_INSTALL_PREFIX/bin
179   mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}/var/lib/cache/%{cmsplatf}
178
180   %{relocateConfig}etc/profile.d/dependencies-setup.sh
181   %{relocateConfig}etc/profile.d/dependencies-setup.csh
182   %{relocateConfig}bin/apt-cache-wrapper
183   %{relocateConfig}bin/apt-get-wrapper
184   %{relocateConfig}bin/rpm-wrapper
185 < %{reloacteConfig}etc/apt.conf
186 < %files
186 < %{i}
185 > %{relocateConfig}etc/apt.conf
186 >

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines