Commit 526ef3d2 authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmreqs: fix

parent 323e38fd
...@@ -121,13 +121,13 @@ passwdqc-control" ...@@ -121,13 +121,13 @@ passwdqc-control"
trans_rpmdeps_to_pkgname_lav() trans_rpmdeps_to_pkgname_lav()
{ {
# partially copied from aptU # partially copied from aptU
local ALREADYHANDLEDRPM="rpmlib.* rtld libgcc_s\..* libstdc\+\+.* libc\.so.* ld-linux\.so.* libpthread\.so.* librt\.so.*" local ALREADYHANDLEDRPM="rpmlib.* rtld libgcc_s\..* libstdc\+\+.* libc\.so.* ld-linux\.so.* libpthread\.so.* librt\.so.* libdl\.so.*"
local REQLIST="$@" local REQLIST="$@"
REQLIST=$(regexp_exclude_list "$ALREADYHANDLEDRPM" "$REQLIST") REQLIST=$(regexp_exclude_list "$ALREADYHANDLEDRPM" "$REQLIST")
# FIXME: strange regexp for drop libNAME.so.NUM and perl(Package) and /bin/sh # FIXME: strange regexp for drop libNAME.so.NUM and perl(Package) and /bin/sh
REALPKGNAMELIST=$(regexp_exclude_list ". .. /* (*" "$REQLIST") REALPKGNAMELIST=$(regexp_exclude_list "\. \.\. /* (*" "$REQLIST")
# FIXME: external list? Set priorities/ # FIXME: external list? Set priorities/
REQCONVLIST=$(do_exclude_list "$REALPKGNAMELIST" "$REQLIST" | filter_multiple_provides) REQCONVLIST=$(do_exclude_list "$REALPKGNAMELIST" "$REQLIST" | filter_multiple_provides)
...@@ -140,6 +140,7 @@ trans_rpmdeps_to_pkgname_lav() ...@@ -140,6 +140,7 @@ trans_rpmdeps_to_pkgname_lav()
if grep -q "is a virtual package provided by" $TFILE ; then if grep -q "is a virtual package provided by" $TFILE ; then
fatal "multiple provides: $(cat $TFILE)" fatal "multiple provides: $(cat $TFILE)"
fi fi
#grep -q "^E:" $TFILE && fatal "Can't get correct result from apt: $(cat $TFILE)"
rm -f $TFILE rm -f $TFILE
# remove ALT basesystem packages # remove ALT basesystem packages
......
...@@ -49,13 +49,16 @@ xlsfonts|xorg-xlsfonts ...@@ -49,13 +49,16 @@ xlsfonts|xorg-xlsfonts
libsane|sane libsane|sane
xrandr|xorg-xrandr xrandr|xorg-xrandr
libxscrnsaver| libxscrnsaver|
mount|util-linux
util-linux|util-linux
# FIXME: can't install # FIXME: can't install
#mount|util-linux-ng #libxxf86misc|
#util-linux|util-linux-ng rpm-build|rpm
mount|
util-linux|
# FIXME: can't install
libxxf86misc|
# ALT's version?
rpm-build|
rpm-build-intro|rpm-build-altlinux-compat rpm-build-intro|rpm-build-altlinux-compat
libicu|icu
libreadline|readline
gccmakedep|imake
openssh-server|openssh
openssh-clients|openssh
xauth|xorg-xauth
xorg-cf-files|
libaudiofile|audiofile libaudiofile|audiofile
libaudiofile-devel|audiofile-devel libaudiofile-devel|audiofile-devel
libhal-devel| libhal-devel|
libopenal-devel|openal-soft-devel
libopenal|openal-soft
libcapi-devel|libcapifax-devel
libcapi|libcapifax
libgstreamer|gstreamer
gstreamer-devel|gstreamer-devel
gst-plugins-devel|gstreamer-plugins-base-devel
libgst-plugins|libgstreamer-plugins-base
libmesa-devel|mesa-libGL-devel
libGLU-devel|mesa-libGLU-devel
libmesa|mesa-libGL
libGLU|mesa-libGLU
libGL|mesa-libGL
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# FIXME # FIXME
makedepend| makedepend|
foomatic-db-engine| foomatic-db-engine|
#imake| imake|imake
shadow-log| shadow-log|
w3c-markup-validator-libs| w3c-markup-validator-libs|
xorg-cf-files| xorg-cf-files|
...@@ -36,15 +36,20 @@ libpam-devel|pam-devel ...@@ -36,15 +36,20 @@ libpam-devel|pam-devel
libpam0-devel|pam-devel libpam0-devel|pam-devel
# libssl??? # libssl???
libssl|openssl libssl|openssl
libssl-devel|openssl-devel
libssl7|openssl libssl7|openssl
libssl10|openssl libssl10|openssl
libssl-devel|openssl-devel libcrypto10|openssl
# for rpmcs
openssl|openssl
libfreetype|freetype libfreetype|freetype
freetype2-devel|freetype-devel freetype2-devel|freetype-devel
freetype2|freetype freetype2|freetype
libfreetype-devel|freetype-devel libfreetype-devel|freetype-devel
libcups-devel|cups-devel libcups-devel|cups-devel
libcups|cups libcups|cups
# for rpmcs
cups|cups
libalsa-devel|alsa-lib-devel libalsa-devel|alsa-lib-devel
libalsa|alsa-lib libalsa|alsa-lib
libopenal1|openal-soft libopenal1|openal-soft
...@@ -163,10 +168,14 @@ libfontconfig|fontconfig ...@@ -163,10 +168,14 @@ libfontconfig|fontconfig
perl-base|perl perl-base|perl
libpng15|libpng libpng15|libpng
libcrypto10|openssl python-module-dbus|dbus-python
python-module-xml|libxml2-python
dbus-tools-gui|dbus-x11 dbus-tools-gui|dbus-x11
libdbus-devel|dbus-devel
libdbus|dbus-libs
python-base|python python-base|python
libpython|python-libs libpython|python-libs
xinitrc| xinitrc|
fonts-bitmap-misc|xorg-x11-fonts-misc fonts-bitmap-misc|xorg-x11-fonts-misc
# for rpmcs
xauth|xauth
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment