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.46 by eulisse, Mon Jul 9 08:21:31 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 + Patch2: apt
10 +
11   %if "%(echo %{cmsos} | cut -d_ -f 2 | sed -e 's|.*64.*|64|')" == "64"
12   %define libdir lib64
13   %else
# Line 13 | Line 16 | Requires: libxml2 beecrypt rpm zlib bz2l
16  
17   %prep
18   %setup -n %n-%{realversion}
19 + case $RPM_VERSION in
20 +    4.4.9*)
21   %patch0 -p0
22 +        ;;
23 +    4.4.6*)
24 + %patch1 -p0
25 +        ;;
26 + esac
27 + %patch2 -p1
28 +
29   %build
30 < export CPPFLAGS="-I$BEECRYPT_ROOT/include -I$RPM_ROOT/include -I$RPM_ROOT/include/rpm"
31 < export LDFLAGS="-L$BEECRYPT_ROOT/%{libdir} -L$RPM_ROOT/%{libdir}"
30 > export CFLAGS="-O0 -g"
31 > export CXXFLAGS="-O0 -g"
32 > export CPPFLAGS="-I$BZ2LIB_ROOT/include -I$BEECRYPT_ROOT/include -I$RPM_ROOT/include -I$RPM_ROOT/include/rpm"
33 > export LDFLAGS="-L$BZ2LIB_ROOT/lib -L$BEECRYPT_ROOT/%{libdir} -L$RPM_ROOT/%{libdir}"
34   export LIBDIR="$LIBS"
35   export LIBXML2_CFLAGS="-I$LIBXML2_ROOT/include/libxml2 -I$BEECRYPT_ROOT/include -I$RPM_ROOT/include"
36   export LIBXML2_LIBS="-lxml2 -L$LIBXML2_ROOT/lib -L$BEECRYPT_ROOT/%{libdir} -L$RPM_ROOT/%{libdir}"
# Line 25 | Line 39 | export LIBXML2_LIBS="-lxml2 -L$LIBXML2_R
39                              --disable-nls \
40                              --disable-dependency-tracking \
41                              --without-libintl-prefix \
42 +                            --disable-docs \
43                              --disable-rpath
44   make %makeprocesses
45  
# Line 62 | Line 77 | Dir "%{instroot}"
77  
78    // Locations of binaries
79        Bin {
80 <             methods "%{i}/%{libdir}/apt/methods/";
80 >             methods "%{i}/lib/apt/methods/";
81               gzip "/bin/gzip";
82               dpkg "/usr/bin/dpkg";
83               dpkg-source "/usr/bin/dpkg-source";
# Line 74 | Line 89 | Dir "%{instroot}"
89                                                                                                            
90  
91    // Config files
92 <    Etc "%{cmsplatf}/external/apt/%{realversion}/etc/" {
92 >    Etc "%{cmsplatf}/external/apt/%{v}/etc/" {
93                         sourcelist "sources.list";
94                         main "apt.conf";
95                         preferences "preferences";
# Line 86 | Line 101 | Debug::pkgProblemResolver="1";
101   RPM
102   {
103      PM "external";
104 <    Options { "--define";"_rpmlock_path %{instroot}/%{cmsplatf}/var/lib/rpm/lock";"--dbpath";"%{instroot}/var/lib/rpm";"--nodeps";};
105 <    Install-Options { "--define";"_rpmlock_path %{instroot}/%{cmsplatf}/var/lib/rpm/lock";"--nodeps";"--force";"--dbpath";"%{instroot}/%{cmsplatf}/var/lib/rpm";"--prefix";"%{instroot}";};
104 >    Options { };
105 >    Install-Options { "--force";"--prefix";"%{instroot}";"--ignoreos";"--ignorearch";};
106      RootDir "%{instroot}";
107      Architecture "%{cmsplatf}";
108   };
109   EOF_APT_CONF
110  
111 +
112   cat << \EOF_SOURCES_LIST > %{i}/etc/sources.list
113 < rpm http://cmsrep.cern.ch cms/cpt/Software/download/cms.eulisse/apt/%{cmsplatf} cms lcg external
114 < rpm-src http://cmsrep.cern.ch cms/cpt/Software/download/cms.eulisse/apt/%{cmsplatf} cms lcg external
113 > rpm http://cmsrep.cern.ch cms/cpt/Software/download/cms/apt/%{cmsplatf} cms lcg external
114 > rpm-src http://cmsrep.cern.ch cms/cpt/Software/download/cms/apt/%{cmsplatf} cms lcg external
115   # This are defined to support experimental repositories. The bootstrap file rewrites and uncomments
116   # them when passed the appropriate commandline option.
117   ## rpm @SERVER@ @SERVER_PATH@/@REPOSITORY@/apt/%{cmsplatf} @GROUPS@  
# Line 175 | Line 191 | mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}
191   mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}/var/lib/dpkg/status
192   mkdir -p $RPM_INSTALL_PREFIX/bin
193   mkdir -p $RPM_INSTALL_PREFIX/%{cmsplatf}/var/lib/cache/%{cmsplatf}
178
194   %{relocateConfig}etc/profile.d/dependencies-setup.sh
195   %{relocateConfig}etc/profile.d/dependencies-setup.csh
196   %{relocateConfig}bin/apt-cache-wrapper
197   %{relocateConfig}bin/apt-get-wrapper
198   %{relocateConfig}bin/rpm-wrapper
199 < %{reloacteConfig}etc/apt.conf
185 < %files
186 < %{i}
199 > %{relocateConfig}etc/apt.conf

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines