update pkgrepls

810f9473 · Vitaly Lipatov · Etersoft builder · 054e504c · 810f9473 · 054e504c
Commit 810f9473 authored Jun 27, 2019 by Vitaly Lipatov Committed by Etersoft builder Jun 27, 2019
30 changed files
--- a/share/eterbuild/pkgrepl/pkgrepl.alt
+++ b/share/eterbuild/pkgrepl/pkgrepl.alt
-#libstdc++3.4-devel-precompiled|
 pkg-config|pkgconfig
 postgresql8.0|postgresql
 postgresql8.1|postgresql
-libpq4|libpq3
-#libSDL_sound-devel|libSDL-devel
-%python-dev|
-%python-base|
 linux-libc-headers|glibc-kernheaders
 #apt-repo-tools|apt-utils
 kernel-build-tools|kernel-build-tools kernel-headers-modules-ovz-smp kernel-headers-modules-std-def
-libpng15|libpng12
-libpng16|libpng12
 cifs-utils|samba-client
 apt-repo|

--- a/share/eterbuild/pkgrepl/pkgrepl.alt.c7
+++ b/share/eterbuild/pkgrepl/pkgrepl.alt.c7
-pkgrepl.alt.p7
\ No newline at end of file
--- a/share/eterbuild/pkgrepl/pkgrepl.alt.c7
+++ b/share/eterbuild/pkgrepl/pkgrepl.alt.c7
+#rpm-build-intro|rpm-build-altlinux-compat
+libudev1|libudev1
+libpng15|libpng15
+libpng16|libpng15
+libsrtp-devel|libsrtp
+libsrtp1|libsrtp
+libspeexdsp-devel|libspeex-devel
+qt5-base-devel|qt5-base-devel libEGL-devel
+# ignore the fact we have libgnutls28-devel on this branch
+# restore after p6
+libmozjs17-devel|libmozjs17-devel
+libsystemd-devel|libsystemd-devel
+libgnutls30|libgnutls26
--- a/share/eterbuild/pkgrepl/pkgrepl.alt.p7
+++ b/share/eterbuild/pkgrepl/pkgrepl.alt.p7
+#rpm-build-intro|rpm-build-altlinux-compat
 libudev1|libudev1
 libpng15|libpng15
 libpng16|libpng15
@@ -12,3 +13,4 @@ qt5-base-devel|qt5-base-devel libEGL-devel
 # restore after p6
 libmozjs17-devel|libmozjs17-devel
 libsystemd-devel|libsystemd-devel
--- a/share/eterbuild/pkgrepl/pkgrepl.alt.p8
+++ b/share/eterbuild/pkgrepl/pkgrepl.alt.p8
@@ -19,3 +19,4 @@ libgomp6-devel|libgomp5-devel
 libicu60|libicu56
 libtiff5|libtiff5
+libpng16|libpng15
--- a/share/eterbuild/pkgrepl/pkgrepl.alt.sisyphus
+++ b/share/eterbuild/pkgrepl/pkgrepl.alt.sisyphus
--- a/share/eterbuild/pkgrepl/pkgrepl.archlinux
+++ b/share/eterbuild/pkgrepl/pkgrepl.archlinux
 libncurses|ncurses
 libncurses-devel|ncurses
+libncursesw-devel|ncurses
 terminfo|ncurses
 termutils|ncurses
 rpm-build-fonts|rpm-build-altlinux-compat

--- a/share/eterbuild/pkgrepl/pkgrepl.astra
+++ b/share/eterbuild/pkgrepl/pkgrepl.astra
 # is missed?
-#docbook-utils|
-glibc-utils|libc6
-diffutils|diffutils
-xz|xz-utils
-libusb-devel|libusb-1.0-0-dev
-libusb|libusb-1.0-0
-libudev-devel|libudev-dev
-liblzma|liblzma2
-libltdl7|libltdl7
-libv4l|libv4l-0
-libunistring|libunistring0
-libmpg123-devel|
-libmpg123|
-cifs-utils|cifs-utils
-glibc-utils|libc-bin
-libreadline|libreadline6
-libreadline-devel|libreadline-gplv2-dev
-libssl10|libssl1.0.0
-libwxGTK3.0|libwxgtk3.0-0v5
-libwxGTK3.0-devel|libwxgtk3.0-dev
-libwxGTK3.1|libwxgtk3.0-0v5
-libwxGTK3.1-devel|libwxgtk3.0-dev
 libwxGTK|libwxgtk3.0
 libwxGTK-devel|libwxgtk3.0-dev
@@ -35,15 +8,18 @@ libpng16|libpng16-16
 libpng-devel|libpng-dev
 libudev-devel|libudev-dev
-libudev1|libudev0
+#libudev1|libudev0
 #libjpeg|libjpeg62-turbo
 #libjpeg8|libjpeg8
 #libjpeg-devel|libjpeg8-dev
+diff|diffutils
+diffutils|
 libjpeg-devel|libjpeg62-turbo-dev
 liblcms-devel|liblcms2-dev
-liblcms|liblcms1
+liblcms|liblcms2-2
+liblcms1|liblcms2-2
 liblcms2|liblcms2-2
 liblcms2-devel|liblcms2-dev
@@ -81,9 +57,21 @@ gcc5-c++|g++-6.3 gcc-multilib
 #pkg-config|pkg-config
 #rpm-build|rpm
-ia32-libs|ia32-libs ia32-libs-dev lib32gcc1 lib32xgcc1 lib32gcc-6-dev libx32gcc-6-dev lib32readline-dev lib32readline7
+libmpg123-devel|libmpg123-dev
 #NX
 xkbcomp|x11-xkb-utils
 xorg-font-utils|xfonts-utils
 sessreg|x11-xserver-utils
+numlockx|
+python-module-Cython|cython
+libwxGTK3.0|libwxgtk3.0-0v5
+libwxGTK3.0-devel|libwxgtk3.0-dev
+libwxGTK3.1|libwxgtk3.0-0v5
+libwxGTK3.1-devel|libwxgtk3.0-dev
+libwxGTK|libwxgtk3.0-0v5
+libwxGTK-devel|libwxgtk3.0-dev
+cifs-utils|cifs-utils
+bashrc|
+python-module-psutil|python-psutil
+libcrypto1.1|libssl1.1
--- a/share/eterbuild/pkgrepl/pkgrepl.astra.x86_64-i586
+++ b/share/eterbuild/pkgrepl/pkgrepl.astra.x86_64-i586
+zlib-devel|lib32z1-dev
+ia32-libs|ia32-libs ia32-libs-dev lib32gcc1 lib32xgcc1 lib32gcc-6-dev libx32gcc-6-dev lib32readline-dev lib32readline7
+libcrypto1.1|ia32-libs
+diff|diffutils
+diffutils|
--- a/share/eterbuild/pkgrepl/pkgrepl.centos.7
+++ b/share/eterbuild/pkgrepl/pkgrepl.centos.7
@@ -27,8 +27,16 @@ libhal-devel|
 i586-libhal-devel|
 libusb|libusbx
 libusb-devel|libusbx-devel
+libcrypto1.1|openssl-libs
 perl-XML-LibXML|
 libwxGTK-devel|wxGTK-devel
 libwxGTK|wxGTK
+python-module-Cython|Cython
+python3-dev|python36-devel
+python3-module-setuptools|python36-setuptools
+python3-module-pykwalify|python36-pykwalify
+python3-module-ruamel-yaml|python36-ruamel-yaml
--- a/share/eterbuild/pkgrepl/pkgrepl.deb
+++ b/share/eterbuild/pkgrepl/pkgrepl.deb
@@ -94,7 +94,7 @@ rpm-macros-webserver-common|rpm-build-altlinux-compat
 rpm-build-compat|rpm-build-altlinux-compat
 rpm-build-intro|rpm-build-altlinux-compat
+rpm-macros-intro-conflicts|rpm-build-altlinux-compat
 menu-devel|
 libexpat|libexpat1
@@ -178,6 +178,8 @@ xinitrc|
 setup|
 service|
 glibc-utils|libc-bin
+ld-linux.so.2|libc6.i386
+libpthread.so.0|libc6.i386
 glibc-nss|libc6
 glibc-pthread|libc6
 dbus-tools-gui|dbus-x11

--- a/share/eterbuild/pkgrepl/pkgrepl.debian.7
+++ b/share/eterbuild/pkgrepl/pkgrepl.debian.7
@@ -21,4 +21,6 @@ libudev1|libudev0
 liblcms2|liblcms2-2
 liblcms2-devel|liblcms2-dev
+libcrypto10|
+libcrypto1.1|
--- a/share/eterbuild/pkgrepl/pkgrepl.debian.9
+++ b/share/eterbuild/pkgrepl/pkgrepl.debian.9
@@ -5,8 +5,10 @@ libgnutls30|libgnutls30
 libpng15|libpng16-16
 libpng16|libpng16-16
 libpng-devel|libpng-dev
-libssl10|libssl1.1.0
+#libssl10|libssl1.1.0
+libcrypto1.1|libssl1.1
+#NX
 libwxGTK3.0|libwxgtk3.0-0v5
 libwxGTK3.0-devel|libwxgtk3.0-dev
 libwxGTK3.1|libwxgtk3.0-0v5
@@ -14,3 +16,4 @@ libwxGTK3.1-devel|libwxgtk3.0-dev
 libwxGTK|libwxgtk3.0-0v5
 libwxGTK-devel|libwxgtk3.0-dev
 libsigc++2|libsigc++-2.0-0v5
+python-module-psutil|python-psutil
--- a/share/eterbuild/pkgrepl/pkgrepl.fedora
+++ b/share/eterbuild/pkgrepl/pkgrepl.fedora
@@ -45,3 +45,5 @@ fonts-ttf-core|liberation-mono-fonts liberation-sans-fonts liberation-serif-font
 fonts-ttf-liberation|liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts liberation-narrow-fonts
 libudev1|libudev
+xorg-proto-devel|xorg-x11-proto-devel
+libpixman-devel|pixman-devel
--- a/share/eterbuild/pkgrepl/pkgrepl.fedora.26
+++ b/share/eterbuild/pkgrepl/pkgrepl.fedora.26
 #libX11-devel|libX11-devel libXau-devel libNX_Xext-devel libXdamage-devel libNX_Xrender-devel libXxf86vm-devel
 libX11-devel|libX11-devel libXau-devel libXdamage-devel libXxf86vm-devel
+pkg-config|pkgconf-pkg-config
+libcrypto1.1|
--- a/share/eterbuild/pkgrepl/pkgrepl.fedora.27
+++ b/share/eterbuild/pkgrepl/pkgrepl.fedora.27
+# RX
+libX11-locales|libX11-common
+fonts-bitmap-misc|
+xorg-font-utils|xorg-x11-fonts-misc
+libkrb5|krb5-libs
+libcrypto1.1|openssl-libs
+python-dev|python2-devel
--- a/share/eterbuild/pkgrepl/pkgrepl.fedora.28
+++ b/share/eterbuild/pkgrepl/pkgrepl.fedora.28
+glibc-devel-static|glibc-devel glibc-headers
+glibc-devel|glibc-devel glibc-headers
--- a/share/eterbuild/pkgrepl/pkgrepl.rosa.2014
+++ b/share/eterbuild/pkgrepl/pkgrepl.rosa.2014
@@ -13,6 +13,8 @@ libfreetype|libfreetype6 libpango-modules1.0
 #No more libopenssl
 libcrypto10|libcrypto1.0.0
+# How did this happen?
+libcrypto1.1|libcrypto1.0.0
 libssl10|libssl1.0.0
 libssl-devel|libdssl-devel

--- a/share/eterbuild/pkgrepl/pkgrepl.rosa.2014.x86_64
+++ b/share/eterbuild/pkgrepl/pkgrepl.rosa.2014.x86_64
+libldap-devel|lib64ldap2.4_2-devel
+libsmbclient-devel|lib64smbclient-devel
 libssl-devel|lib64dssl-devel
 libssl10|libssl1.0.0 #lib64ssl1.0.0
+libcups-devel|lib64cups-devel
 #postgres92
 python-devel|lib64python-devel

--- a/share/eterbuild/pkgrepl/pkgrepl.rpm
+++ b/share/eterbuild/pkgrepl/pkgrepl.rpm
@@ -24,6 +24,7 @@ libarts-devel|arts-devel
 pkg-config|pkgconfig
 rpm-build-compat|rpm-build-altlinux-compat
 rpm-build-intro|rpm-build-altlinux-compat
+rpm-macros-intro-conflicts|rpm-build-altlinux-compat
 libntfs-devel|ntfsprogs-devel
 libntfs|ntfsprogs
 libe2fs-devel|e2fsprogs-devel
@@ -145,6 +146,7 @@ libgnutls30|gnutls
 rpm-build-licenses|rpm-build-altlinux-compat
 rpm-macros-tts|rpm-build-altlinux-compat
 rpm-macros-webserver-common|rpm-build-altlinux-compat
+rpm-build-python3|rpm-build-altlinux-compat
 libnatspec-devel|
 libnatspec|

--- a/share/eterbuild/pkgrepl/pkgrepl.scientific.6
+++ b/share/eterbuild/pkgrepl/pkgrepl.scientific.6
@@ -27,7 +27,11 @@ libglibmm|glibmm24
 libgtkmm2|gtkmm24
 libsigc++2|libsigc++20
-libwxGTK-devel|wxGTK-devel
+libwxGTK3.1-devel|wxGTK3-devel
-libwxGTK|wxGTK
+libwxGTK|wxGTK3
 xorg-proto-devel|xorg-x11-proto-devel
+xorg-font-utils|xorg-x11-font-utils bdftruncate
+libX11-locales|libX11-common
+python-dev|python-devel
--- a/share/eterbuild/pkgrepl/pkgrepl.sled.11
+++ b/share/eterbuild/pkgrepl/pkgrepl.sled.11
 jackit|libjack
 # XOrg
+xorg-proto-devel|xorg-x11-proto-devel
 xorg-x11-proto-devel|xorg-x11-proto-devel
 libICE-devel|xorg-x11-libICE-devel
 libICE|xorg-x11-libICE
@@ -96,3 +97,10 @@ libv4l|
 libopenal1|
 libopenal-devel|
 liblcms2-devel|liblcms-devel
+# postgres
+libcrypt|
+libperl-5.22.so|libperl.so
+# nx
+libexpat-devel|libexpat-devel
--- a/share/eterbuild/pkgrepl/pkgrepl.suse.12.3
+++ b/share/eterbuild/pkgrepl/pkgrepl.suse.12.3
@@ -12,3 +12,6 @@ libopenal1|openal-soft
 libopenal-devel|openal-soft-devel
 liblcms2|liblcms2-2
 libgnutls30|libgnutls28
+xorg-proto-devel|xorg-x11-proto-devel
+libpixman-devel|pixman-devel
--- a/share/eterbuild/pkgrepl/pkgrepl.suse.13.2
+++ b/share/eterbuild/pkgrepl/pkgrepl.suse.13.2
@@ -2,3 +2,6 @@ libicu56|libicu53_1
 libicu60|libicu53_1
 libpng-devel|libpng16-devel
 libgnutls30|libgnutls28
+xorg-proto-devel|xorg-x11-proto-devel
+libpixman-devel|pixman-devel
--- a/share/eterbuild/pkgrepl/pkgrepl.suse.15
+++ b/share/eterbuild/pkgrepl/pkgrepl.suse.15
+#libGLU-devel|Mesa-libGL-devel-32bit
+libGLU-devel|
+#To pass install questions
+libsmbclient|libsmbclient0
+libieee1284-devel|
+xorg-proto-devel|xorg-x11-proto-devel
+libpixman-devel|libpixman-1-0-devel
+libexpat-devel|libexpat-devel
+#libexpat|libexpat1
+xorg-font-utils|font-util
+libX11-locales|libX11-data
+python-dev|python-devel
+python-module-Cython|python-Cython
+#libXScrnSaver-devel-32bit|xorg-x11-devel
+libicu53_1|libicu60_2
+libcrypto10|libopenssl1_0_0
+libssl10|libopenssl1_0_0
+libunixODBC-devel|unixODBC-devel
+#unixODBC-devel|
+libwxGTK3.1-devel|wxWidgets-3_0-devel
--- a/share/eterbuild/pkgrepl/pkgrepl.suse.15.x86_64-i586
+++ b/share/eterbuild/pkgrepl/pkgrepl.suse.15.x86_64-i586
+#libXScrnSaver-devel|xorg-x11-devel
+libXScrnSaver-devel|
+libunixODBC-devel|unixODBC-devel
+#libunixODBC-devel|
+libssl-devel|libopenssl-1_1-devel
--- a/share/eterbuild/pkgrepl/pkgrepl.suse.42
+++ b/share/eterbuild/pkgrepl/pkgrepl.suse.42
@@ -3,3 +3,17 @@ libGLU-devel|
 #To pass install questions
 libsmbclient|libsmbclient0
+libcrypto10|libopenssl1_0_0
+libssl10|libopenssl1_0_0
+xorg-proto-devel|xorg-x11-proto-devel
+libpixman-devel|libpixman-1-0-devel
+libexpat-devel|libexpat-devel
+#libexpat|libexpat1
+xorg-font-utils|font-util
+libX11-locales|libX11-data
+python-dev|python-devel
+python-module-Cython|python-Cython
+libkrb5|krb5
+libwxGTK3.0-devel|wxWidgets-3_0-devel
--- a/share/eterbuild/pkgrepl/pkgrepl.ubuntu.14.04
+++ b/share/eterbuild/pkgrepl/pkgrepl.ubuntu.14.04
+libcrypto1.1|libssl1.0.0
 libjpeg-devel|libjpeg8-dev
 libjpeg|libjpeg8
 libicu56|libicu52

--- a/share/eterbuild/pkgrepl/pkgrepl.ubuntu.18.04
+++ b/share/eterbuild/pkgrepl/pkgrepl.ubuntu.18.04
 libicu56|libicu60
 #libicu56|libicu55
 fonts-ttf-core|fonts-liberation
+libcrypt|
--- a/share/eterbuild/pkgrepl/pkgrepl.ubuntu.19.04
+++ b/share/eterbuild/pkgrepl/pkgrepl.ubuntu.19.04
+bashrc|
+python-module-psutil|python-psutil
+libreadline|libreadline8
+libreadline7|libreadline8
+libreadline-devel|libreadline-dev