Changeset 1653 in ProjectBuilder for devel

Timestamp:

Oct 7, 2012, 8:20:14 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Red Hat 6.2 doesn't really support rpm --whaprovides so removing it for this one

Location:

devel/pb-modules

Files:

• etc/pb.conf (modified) (1 diff)
• lib/ProjectBuilder/Distribution.pm (modified) (1 diff)

devel/pb-modules/etc/pb.conf

@@ -303 +303 @@
 # For Rd Hat 6.2 perl is excluded as a manual install from http://www.cpan.org/src/5.0/perl-5.6.2.tar.gz is required
 rbsmindep redhat-6.2 = MAKEDEV,SysVinit,authconfig,basesystem,bash,binutils,bzip2,chkconfig,console-tools,cracklib,cracklib-dicts,dev,dev86,diffutils,dhcpcd,e2fsprogs,file,filesystem,fileutils,findutils,gawk,gdbm,glib,glibc,gmp,grep,gzip,info,initscripts,iproute,iputils,kernel,krb5-configs,krb5-libs,ldconfig,ld.so,libc,libelf,libstdc++,libtermcap,logrotate,make,mingetty,mktemp,modutils,mount,newt,ncurses,net-tools,pam,passwd,patch,popt,procps,psmisc,pwdb,python,readline,redhat-release,rpm,rpm-build,rpm-python,sed,setup,shadow-utils,sh-utils,slang,sysklogd,tar,tcsh,termcap,textutils,util-linux,vim-common,vim-minimal,vixie-cron,which,wget,xntp3,zlib
+# To build MondoRescue, add to the list: autoconf,automake,egcs-c++,libstdc++,m4,libtool,newt-devel,slang-devel
 #
 rbsmindep fedora-4 = MAKEDEV,SysVinit,audit-libs,basesystem,bash,beecrypt,bzip2-libs,chkconfig,coreutils,cracklib,cracklib-dicts,db4,device-mapper,e2fsprogs,elfutils-libelf,ethtool,expat,filesystem,findutils,gawk,gdbm,glib2,glibc,glibc-common,grep,info,initscripts,iproute,iputils,krb5-libs,libacl,libattr,libcap,libgcc,libidn,libselinux,libsepol,libstdc++,libtermcap,libxml2,libxml2-python,mingetty,mktemp,module-init-tools,ncurses,neon,net-tools,openssl,pam,pcre,popt,procps,psmisc,python,python-elementtree,python-sqlite,python-urlgrabber,readline,rpm,rpm-libs,rpm-python,sed,setup,shadow-utils,sqlite,sysklogd,termcap,tzdata,udev,util-linux,yum,zlib

devel/pb-modules/lib/ProjectBuilder/Distribution.pm

@@ -450 +450 @@
     next if $p =~ /^\s*$/o;
     if ($pbos->{'type'} eq  "rpm") {
-        my $res = pb_system("rpm -q --whatprovides --quiet $p","Looking for $p","mayfail");
+        my $rpmcmd = "rpm -q --whatprovides --quiet";
+        # whatprovides doesn't work for RH6.2
+        $rpmcmd = "rpm -q --quiet" if (($pbos->{'name'} eq "redhat") && ($pbos->{'version'} =~ /6/));
+        my $res = pb_system("$rpmcmd $p","Looking for $p","mayfail");
         next if ($res eq 0);
         pb_log(1, "INFO: missing dependency $p\n");