From 5c8969d55c4db1f84d355ba37235d2a1a10af5e1 Mon Sep 17 00:00:00 2001 From: Manuel Wolfshant Date: Feb 24 2013 22:47:47 +0000 Subject: Merge branch 'master' of https://nazar.karan.org/git/c6/c6-comps --- diff --git a/c6-i386-comps.xml b/c6-i386-comps.xml index 358033f..f87505b 100644 --- a/c6-i386-comps.xml +++ b/c6-i386-comps.xml @@ -134,8 +134,8 @@ true sq - hunspell-sq - hunspell-sq + eclipse-nls-sq + hunspell-sq @@ -737,7 +737,7 @@ traceroute audispd-plugins brltty - cpufrequtils + cpupowerutils device-mapper-persistent-data dos2unix dumpet @@ -747,6 +747,7 @@ gpm kabi-yum-plugins kernel-doc + linuxptp logwatch mkbootdisk mtools @@ -1588,8 +1589,8 @@ true ca - hunspell-ca - hunspell-ca + eclipse-nls-ca + hunspell-ca hyphen-ca kde-i18n-Catalan kde-l10n-Catalan @@ -1828,8 +1829,7 @@ false true - matahari - matahari + @@ -1965,7 +1965,21 @@ false false - + cpupowerutils + samba4 + samba4-client + samba4-common + samba4-dc + samba4-dc-libs + samba4-devel + samba4-libs + samba4-pidl + samba4-python + samba4-swat + samba4-test + samba4-winbind + samba4-winbind-clients + samba4-winbind-krb5-locator @@ -2633,7 +2647,6 @@ abrt-gui bltk oprofile-gui - systemtap-grapher xrestop @@ -2704,7 +2717,6 @@ glib2 gtk2 libICE - libjpeg libpng libSM libX11 @@ -2899,6 +2911,7 @@ krb5-pkinit-openssl krb5-workstation ldapjdk + libsss_sudo nscd nss-pam-ldapd openldap-clients @@ -4969,8 +4982,8 @@ true id - hunspell-id - hunspell-id + eclipse-nls-id + hunspell-id hyphen-id @@ -5627,6 +5640,7 @@ java-1.6.0-openjdk java-1.6.0-openjdk + java-1.7.0-openjdk icedtea-web @@ -6285,7 +6299,8 @@ true ku - hunspell-ku + eclipse-nls-ku + hunspell-ku kde-l10n-Kurdish kurdit-unikurd-web-fonts kurdit-unikurd-web-fonts @@ -8295,8 +8310,8 @@ fa autocorr-fa + eclipse-nls-fa hunspell-fa - hunspell-fa hyphen-fa @@ -9118,8 +9133,8 @@ true sr - hunspell-sr - hunspell-sr + eclipse-nls-sr + hunspell-sr kde-i18n-Serbian kde-l10n-Serbian libreoffice-langpack-sr @@ -9188,6 +9203,7 @@ glibc krb5-libs libgcc + libitm libstdc++ ncurses-libs nss @@ -9393,8 +9409,8 @@ sk autocorr-sk + eclipse-nls-sk hunspell-sk - hunspell-sk hyphen-sk kde-i18n-Slovak kde-l10n-Slovak @@ -9473,8 +9489,8 @@ sl autocorr-sl + eclipse-nls-sl hunspell-sl - hunspell-sl hyphen-sl kde-i18n-Slovenian kde-l10n-Slovenian @@ -9605,6 +9621,7 @@ false true + so hunspell-so hunspell-so @@ -11462,7 +11479,9 @@ false true - + hypervkvpd + hypervkvpd + qemu-guest-agent @@ -11597,7 +11616,6 @@ fence-virtd-serial libvirt-cim libvirt-java - libvirt-qmf libvirt-snmp perl-Sys-Virt @@ -12124,8 +12142,10 @@ foghorn libesmtp-devel openaislib-devel + pacemaker-doc pacemaker-libs-devel pacemaker + pcs python-repoze-what-quickstart @@ -12248,6 +12268,8 @@ ipvsadm piranha + haproxy + keepalived @@ -12397,6 +12419,7 @@ gvfs-devel hmaccalc java-1.6.0-openjdk-devel + java-1.7.0-openjdk-devel libacl-devel libattr-devel libcanberra-devel @@ -12418,6 +12441,7 @@ python-devel readline-devel sqlite-devel + tbb-devel PyQt4-devel SDL-devel cups-devel @@ -12666,9 +12690,25 @@ false false - ipa-server + cpupowerutils + ipa-server ipa-server-selinux + ipa-server-trust-ad libcmpiCppImpl0 + samba4 + samba4-client + samba4-common + samba4-dc + samba4-dc-libs + samba4-devel + samba4-libs + samba4-pidl + samba4-python + samba4-swat + samba4-test + samba4-winbind + samba4-winbind-clients + samba4-winbind-krb5-locator @@ -12745,7 +12785,6 @@ libXrender-devel libXt-devel libXtst-devel - libjpeg-devel libpng-devel libxml2-devel mesa-libGL-devel @@ -12862,6 +12901,7 @@ compat-gcc-34 compat-gcc-34-c++ compat-gcc-34-g77 + cvs-inetd dejagnu expect gcc-gnat @@ -12871,6 +12911,7 @@ imake jpackage-utils kdewebdev + ksc libstdc++-docs mercurial mod_dav_svn @@ -13050,6 +13091,7 @@ eclipse-mylyn eclipse-mylyn-java eclipse-oprofile + eclipse-pde eclipse-rpm-editor eclipse-subclipse eclipse-valgrind @@ -13058,7 +13100,6 @@ eclipse-mylyn-trac eclipse-mylyn-webtasks eclipse-mylyn-wikitext - eclipse-pde eclipse-subclipse-graph @@ -13400,6 +13441,7 @@ libhugetlbfs libhugetlbfs-utils libtopology + tuna @@ -14095,6 +14137,7 @@ numpy openmpi openmpi-devel + scipy @@ -14287,6 +14330,7 @@ true fcoe-utils + cgdcbxd fcoe-target-utils lldpad @@ -14674,7 +14718,7 @@ false true - matahari-broker + diff --git a/c6-x86_64-comps.xml b/c6-x86_64-comps.xml index b7d3142..3c94024 100644 --- a/c6-x86_64-comps.xml +++ b/c6-x86_64-comps.xml @@ -134,8 +134,8 @@ true sq - hunspell-sq - hunspell-sq + eclipse-nls-sq + hunspell-sq @@ -737,7 +737,7 @@ traceroute audispd-plugins brltty - cpufrequtils + cpupowerutils device-mapper-persistent-data dos2unix dumpet @@ -747,6 +747,7 @@ gpm kabi-yum-plugins kernel-doc + linuxptp logwatch mkbootdisk mtools @@ -1589,8 +1590,8 @@ true ca - hunspell-ca - hunspell-ca + eclipse-nls-ca + hunspell-ca hyphen-ca kde-i18n-Catalan kde-l10n-Catalan @@ -1829,9 +1830,7 @@ false true - matahari - matahari - mingw32-matahari + @@ -1967,7 +1966,21 @@ false false - + cpupowerutils + samba4 + samba4-client + samba4-common + samba4-dc + samba4-dc-libs + samba4-devel + samba4-libs + samba4-pidl + samba4-python + samba4-swat + samba4-test + samba4-winbind + samba4-winbind-clients + samba4-winbind-krb5-locator @@ -2635,7 +2648,6 @@ abrt-gui bltk oprofile-gui - systemtap-grapher xrestop @@ -2706,7 +2718,6 @@ glib2 gtk2 libICE - libjpeg libpng libSM libX11 @@ -2901,6 +2912,7 @@ krb5-pkinit-openssl krb5-workstation ldapjdk + libsss_sudo nscd nss-pam-ldapd openldap-clients @@ -4971,8 +4983,8 @@ true id - hunspell-id - hunspell-id + eclipse-nls-id + hunspell-id hyphen-id @@ -5629,6 +5641,7 @@ java-1.6.0-openjdk java-1.6.0-openjdk + java-1.7.0-openjdk icedtea-web @@ -6287,7 +6300,8 @@ true ku - hunspell-ku + eclipse-nls-ku + hunspell-ku kde-l10n-Kurdish kurdit-unikurd-web-fonts kurdit-unikurd-web-fonts @@ -8297,8 +8311,8 @@ fa autocorr-fa + eclipse-nls-fa hunspell-fa - hunspell-fa hyphen-fa @@ -9120,8 +9134,8 @@ true sr - hunspell-sr - hunspell-sr + eclipse-nls-sr + hunspell-sr kde-i18n-Serbian kde-l10n-Serbian libreoffice-langpack-sr @@ -9190,6 +9204,7 @@ glibc krb5-libs libgcc + libitm libstdc++ ncurses-libs nss @@ -9395,8 +9410,8 @@ sk autocorr-sk + eclipse-nls-sk hunspell-sk - hunspell-sk hyphen-sk kde-i18n-Slovak kde-l10n-Slovak @@ -9475,8 +9490,8 @@ sl autocorr-sl + eclipse-nls-sl hunspell-sl - hunspell-sl hyphen-sl kde-i18n-Slovenian kde-l10n-Slovenian @@ -9607,6 +9622,7 @@ false true + so hunspell-so hunspell-so @@ -11464,7 +11480,8 @@ false true - qemu-kvm + hypervkvpd + qemu-kvm qemu-kvm qemu-guest-agent qemu-kvm-tools @@ -11602,7 +11619,6 @@ fence-virtd-serial libvirt-cim libvirt-java - libvirt-qmf libvirt-snmp perl-Sys-Virt @@ -12133,8 +12149,10 @@ foghorn libesmtp-devel openaislib-devel + pacemaker-doc pacemaker-libs-devel pacemaker + pcs python-repoze-what-quickstart @@ -12257,6 +12275,8 @@ ipvsadm piranha + haproxy + keepalived @@ -12469,6 +12489,7 @@ gvfs-devel hmaccalc java-1.6.0-openjdk-devel + java-1.7.0-openjdk-devel libacl-devel libattr-devel libcanberra-devel @@ -12490,6 +12511,7 @@ python-devel readline-devel sqlite-devel + tbb-devel PyQt4-devel SDL-devel cups-devel @@ -12738,9 +12760,25 @@ false false - ipa-server + cpupowerutils + ipa-server ipa-server-selinux + ipa-server-trust-ad libcmpiCppImpl0 + samba4 + samba4-client + samba4-common + samba4-dc + samba4-dc-libs + samba4-devel + samba4-libs + samba4-pidl + samba4-python + samba4-swat + samba4-test + samba4-winbind + samba4-winbind-clients + samba4-winbind-krb5-locator @@ -12817,7 +12855,6 @@ libXrender-devel libXt-devel libXtst-devel - libjpeg-devel libpng-devel libxml2-devel mesa-libGL-devel @@ -12934,6 +12971,7 @@ compat-gcc-34 compat-gcc-34-c++ compat-gcc-34-g77 + cvs-inetd dejagnu expect gcc-gnat @@ -12943,6 +12981,7 @@ imake jpackage-utils kdewebdev + ksc libstdc++-docs mercurial mod_dav_svn @@ -13122,6 +13161,7 @@ eclipse-mylyn eclipse-mylyn-java eclipse-oprofile + eclipse-pde eclipse-rpm-editor eclipse-subclipse eclipse-valgrind @@ -13130,7 +13170,6 @@ eclipse-mylyn-trac eclipse-mylyn-webtasks eclipse-mylyn-wikitext - eclipse-pde eclipse-subclipse-graph @@ -13474,6 +13513,7 @@ libhugetlbfs libhugetlbfs-utils libtopology + tuna @@ -14173,6 +14213,7 @@ numpy openmpi openmpi-devel + scipy @@ -14365,6 +14406,7 @@ true fcoe-utils + cgdcbxd fcoe-target-utils lldpad @@ -14752,7 +14794,7 @@ false true - matahari-broker +