From: Thierry Parmentelat Date: Wed, 23 Nov 2022 14:40:24 +0000 (+0100) Subject: devel.pkgs: cleanup X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=c6e086dd2b5e32699acb2b2ca5720c5c47100445 devel.pkgs: cleanup --- diff --git a/config.lxc/devel.pkgs b/config.lxc/devel.pkgs index d0259d67..4fe9f78a 100644 --- a/config.lxc/devel.pkgs +++ b/config.lxc/devel.pkgs @@ -26,10 +26,8 @@ package: zlib package: zlib-devel package: bison flex package: libtool -package<=f21: metadata package: mysql mysql-devel mysql-server -package<=f27: python python-devel -package>=f29: python2 python-unversioned-command python2-devel +package: python2 python-unversioned-command python2-devel package: python3 python3-devel package: doxygen package: cronie @@ -38,13 +36,9 @@ package: expat-devel package: ncurses-devel package: readline-devel package: dnsmasq -package<=f31: db4-devel -# for spec2make / rpmlib -package=f8: popt-devel # kernel # see myplc/plc.d/gpg -package<=f29: gnupg -package>=f31: gnupg1 +package: gnupg1 package: diffutils package: patchutils package: vconfig @@ -54,7 +48,7 @@ package: beecrypt-devel package: tetex-latex package: gcc-c++ package: binutils-devel -package>=f27: elfutils-libelf-devel +package: elfutils-libelf-devel # required for perf package: xmlto asciidoc newt-devel package: perl-ExtUtils-Embed @@ -69,8 +63,7 @@ package: yum createrepo package: sharutils # bootcd package: nasm -package<=f25: mkisofs -package>=f27: genisoimage +package: genisoimage package: dosfstools package: mtools package: syslinux @@ -82,14 +75,7 @@ package: ed package: docbook-utils-pdf # plcapi package: postgresql postgresql-devel postgresql-server -package<=f31: postgresql-python -# if we don't specify @arch@ for php-devel, we end up with the 2 variants (i386 and x86_64) -# in an undetermined order, and php-config --extension-dir might return the wrong place -package: php php-devel.@arch@ php-gd php-pgsql -# now this seems to have been fixed in f12 -package>=f12: php-devel -package<=f18: PyXML -# used to reference SOAPpy as well +package: php-devel # for pypcilib package: pciutils-devel package: python-simplejson @@ -97,7 +83,7 @@ package: python-simplejson # for vsys - same as for php-devel above package: ocaml.@arch@ # use local inotify-tools on centos -package>=f8:inotify-tools-devel +package:inotify-tools-devel ### ########## ### ## for util-vserver-pl ### # use local libnl on centos @@ -111,8 +97,8 @@ package>=f8:inotify-tools-devel ########## # openvswitch # starting with f16 we use the stock kernel, and openvswitch needs kernel-devel -package>=f16: kernel-devel -package>=f16: kernel-modules-extra +package: kernel-devel +package: kernel-modules-extra ########## # zabbix/monitor package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@ @@ -134,7 +120,7 @@ package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@ # DistributedRateLimiting package: libxml2-devel # myplc-docs -package>=f18: texlive-ec +package: texlive-ec # libvirt package: gettext package: gettext-devel @@ -145,5 +131,5 @@ package: libtasn1-devel package: nmap-ncat package: pkgconfig # f29; and needed on f27 so the spawned container actually starts its networking -package>=f27: NetworkManager -package>=f29: hostname +package: NetworkManager +package: hostname