Merge pull request #60 from jouvin/el7.x-misc

sl6.x: various package group added/adjusted
quattor · Nov 7, 2014 · c24b475 · c24b475
2 parents 9fb8c62 + 27fb326
commit c24b475
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 17 deletions.
diff --git a/rpms/development-base-tools.pan b/rpms/development-base-tools.pan
@@ -6,13 +6,6 @@ include { 'rpms/group/development' };
 
 prefix '/software/packages';
 
-# CMake 2.8
-'{cmake28-gui}' ?= nlist();
-
-# Compat gcc
-'{compat-gcc-34}' ?= nlist();
-'{compat-gcc-34-g77}' ?= nlist();
-
 # Git
 '{git}' ?= nlist();
 
@@ -32,9 +25,15 @@ prefix '/software/packages';
 '{libcanberra-gtk2}' ?= nlist();
 '{libXi-devel}' ?= nlist();
 
+# Openmpi
+'{openmpi}' ?= nlist();
+
 # Perl
 '{perl-SVN-Notify}' ?= nlist();
 
+# Python
+'{python-devel}' ?= nlist();
+
 # XML
 '{expat-devel}' ?= nlist();
 
diff --git a/rpms/document-viewers.pan b/rpms/document-viewers.pan
@@ -3,4 +3,5 @@ unique template rpms/document-viewers;
 prefix '/software/packages';
 
 '{evince}' = nlist();
-'{a2ps}' = nlist();
+'{a2ps}' = nlist();
+'{xdvik}' = nlist();
diff --git a/rpms/editors.pan b/rpms/editors.pan
@@ -16,3 +16,4 @@ prefix '/software/packages';
 '{xemacs-packages-extra}' = nlist();
 '{xemacs=packages-extra-el}' = nlist();
 '{xemacs-packages-extra-info}' = nlist();
+'{nedit}'       ?= nlist();
diff --git a/rpms/group/development.pan b/rpms/group/development.pan
@@ -17,7 +17,6 @@ prefix '/software/packages';
 '{cvs}' ?= nlist();
 '{dejagnu}' ?= nlist();
 '{diffstat}' ?= nlist();
-'{docker-io}' ?= nlist();
 '{ElectricFence}' ?= nlist();
 '{elfutils}' ?= nlist();
 '{expect}' ?= nlist();
@@ -35,7 +34,6 @@ prefix '/software/packages';
 '{indent}' ?= nlist();
 '{intltool}' ?= nlist();
 '{ksc}' ?= nlist();
-'{libcanberra-gtk2}' ?= nlist();
 '{libtool}' ?= nlist();
 '{make}' ?= nlist();
 '{mercurial}' ?= nlist();

diff --git a/rpms/interactive-server.pan b/rpms/interactive-server.pan
@@ -6,13 +6,7 @@ prefix '/software/packages';
 '{xterm}'          ?= nlist();
 '{xorg-x11-xauth}' ?= nlist();
 '{dbus-x11}' ?= nlist();
-
-# Cernlib
-'{cernlib-utils}'            ?= nlist();
-'{cernlib-g77-utils}'        ?= nlist();
-'{cernlib-packlib}'          ?= nlist();
-'{cernlib-packlib-g77}'      ?= nlist();
-'{cernlib-packlib-gfortran}' ?= nlist();
+'{libXScrnSaver}' ?= nlist();
 
 # Libreoffice
 '{libreoffice}'             ?= nlist();