summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-07-18 12:03:09 +0000
committerOlivier Blin <oblin@mandriva.org>2005-07-18 12:03:09 +0000
commite0e05d3c0d641f2cfaffa50926df54a86d3d4b49 (patch)
tree5c67bd547b9ccd8449b95adf3c7498cc26f79467
parent2acc08f2ecc0dfdc88ccd25e804d44299e378b2d (diff)
downloaddrakx-e0e05d3c0d641f2cfaffa50926df54a86d3d4b49.tar
drakx-e0e05d3c0d641f2cfaffa50926df54a86d3d4b49.tar.gz
drakx-e0e05d3c0d641f2cfaffa50926df54a86d3d4b49.tar.bz2
drakx-e0e05d3c0d641f2cfaffa50926df54a86d3d4b49.tar.xz
drakx-e0e05d3c0d641f2cfaffa50926df54a86d3d4b49.zip
add drakids
-rw-r--r--perl-install/Makefile.config2
-rw-r--r--perl-install/drakxtools.spec2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 5aada357b..c252de04a 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -5,7 +5,7 @@ TMPDIR = /tmp
SO_FILES = c/blib/arch/auto/c/c.so
PMS_DIRS = Newt Xconfig c xf86misc diskdrake harddrake interactive modules network partition_table printer resize_fat sbus_probing security fs
PMS = *.pm $(PMS_DIRS:%=%/*.pm) commands install2
-STANDALONEPMS_ = XFdrake adduserdrake autosetupprintqueues bootloader-config diskdrake drakTermServ drakauth drakautoinst drakbackup drakboot drakbug drakbug_report drakclock drakconnect drakedm drakfirewall drakfont drakgw drakhelp drakhosts draknfs drakperm drakproxy drakroam draksec draksound draksplash drakupdate_fstab drakups drakvpn drakxservices drakxtv fileshareset finish-install harddrake2 keyboarddrake listsupportedprinters localedrake logdrake lsnetdrake mousedrake net_applet net_monitor printerdrake scannerdrake service_harddrake service_harddrake_confirm
+STANDALONEPMS_ = XFdrake adduserdrake autosetupprintqueues bootloader-config diskdrake drakTermServ drakauth drakautoinst drakbackup drakboot drakbug drakbug_report drakclock drakconnect drakedm drakfirewall drakfont drakgw drakhelp drakhosts drakids draknfs drakperm drakproxy drakroam draksec draksound draksplash drakupdate_fstab drakups drakvpn drakxservices drakxtv fileshareset finish-install harddrake2 keyboarddrake listsupportedprinters localedrake logdrake lsnetdrake mousedrake net_applet net_monitor printerdrake scannerdrake service_harddrake service_harddrake_confirm
STANDALONEPMS = $(STANDALONEPMS_:%=standalone/%)
ALLPMS = $(PMS) $(STANDALONEPMS) share/advertising/*.pl share/compssUsers.pl*
diff --git a/perl-install/drakxtools.spec b/perl-install/drakxtools.spec
index a960eeb28..3a4065fb7 100644
--- a/perl-install/drakxtools.spec
+++ b/perl-install/drakxtools.spec
@@ -204,7 +204,7 @@ dirs1="usr/lib/libDrakX usr/share/libDrakX"
(cd $RPM_BUILD_ROOT ; find $dirs1 usr/bin usr/sbin ! -type d -printf "/%%p\n")|egrep -v 'bin/.*harddrake' > %{name}.list
(cd $RPM_BUILD_ROOT ; find $dirs1 -type d -printf "%%%%dir /%%p\n") >> %{name}.list
-perl -ni -e '/activefw\.pm|clock|drak(backup|bug|clock|floppy|font|hosts|log|net_monitor|nfs|perm|printer|sec|splash|TermServ)|gtk|icons|logdrake|net_applet|net_monitor|pixmaps|printer|roam|xf86misc|\.png$/ ? print STDERR $_ : print' %{name}.list 2> %{name}-gtk.list
+perl -ni -e '/activefw\.pm|clock|drak(backup|bug|clock|floppy|font|hosts|ids|log|net_monitor|nfs|perm|printer|sec|splash|TermServ)|gtk|icons|logdrake|net_applet|net_monitor|pixmaps|printer|roam|xf86misc|\.png$/ ? print STDERR $_ : print' %{name}.list 2> %{name}-gtk.list
perl -ni -e '/http/ ? print STDERR $_ : print' %{name}.list 2> %{name}-http.list
perl -ni -e 'm!lib/libDrakX|bootloader-config|fileshare|lsnetdrake|drakupdate_fstab|rpcinfo|serial_probe! && !/newt/i ? print STDERR $_ : print' %{name}.list 2> %{name}-backend.list