diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | mandrake_desk.spec | 6 | ||||
| -rw-r--r-- | sbin/chksession | 12 |
4 files changed, 22 insertions, 3 deletions
@@ -1,3 +1,7 @@ +1999-12-28 Chmouel Boudjnah <chmouel@mandrakesoft.com> + + * mandrake_desk.spec (BuildRequires): Add a manpages for chksession from camille. + 1999-12-27 Chmouel Boudjnah <chmouel@mandrakesoft.com> * icons/kdelnk: lot of changes (fix pablo sucks). @@ -28,6 +28,7 @@ rpm: dis ../mandrake_desk-$(VERSION).tar.bz2 $(RPM) install: mkdir -p $(RPM_BUILD_ROOT)/usr/sbin + mkdir -p $(RPM_BUILD_ROOT)/usr/man/man8/ mkdir -p $(RPM_BUILD_ROOT)/usr/lib/mc/ mkdir -p $(RPM_BUILD_ROOT)/usr/share/{icons,icons/large,icons/mini,pixmaps/backgrounds/mandrake} mkdir -p $(RPM_BUILD_ROOT)/etc/X11/ @@ -37,6 +38,7 @@ install: mkdir -p $(RPM_BUILD_ROOT)/usr/lib/desktop-links mkdir -p $(RPM_BUILD_ROOT)/usr/share/gnome/apps/Internet mkdir -p $(RPM_BUILD_ROOT)/usr/share/gnome/apps/System + install -m644 man/*8 $(RPM_BUILD_ROOT)/usr/man/man8/ install -m755 sbin/* $(RPM_BUILD_ROOT)/usr/sbin install -m644 window-managers $(RPM_BUILD_ROOT)/etc/X11/ install -m644 icons/*.xpm $(RPM_BUILD_ROOT)/usr/share/icons/ @@ -55,4 +57,5 @@ install: $(RPM_BUILD_ROOT)/usr/lib/mc/desktop-scripts install -m644 gnome/mandrake.links \ $(RPM_BUILD_ROOT)/usr/lib/desktop-links + bzip2 -9f $(RPM_BUILD_ROOT)/usr/man/*/* diff --git a/mandrake_desk.spec b/mandrake_desk.spec index 19f3057..d110c63 100644 --- a/mandrake_desk.spec +++ b/mandrake_desk.spec @@ -1,7 +1,7 @@ # DO NOT MODIFY THE VERSION HERE, modify in the CVS %define version 1.0.1 # -%define release 6mdk +%define release 8mdk %define name mandrake_desk Summary: The Desktop configuration files for Linux Mandrake. @@ -54,8 +54,12 @@ rm -rf $RPM_BUILD_ROOT /usr/share/gnome/apps/Internet/*.desktop /usr/lib/mc/desktop-scripts/mandrake.links.sh /usr/lib/desktop-links/mandrake.links +/usr/man/*/* %changelog +* Tue Dec 28 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com> +- Add a manpages for chksession from camille. + * Mon Dec 27 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com> - Various fix and changes (icons & links). - bin/chkSession check if we are root. diff --git a/sbin/chksession b/sbin/chksession index 7226a84..a735c0c 100644 --- a/sbin/chksession +++ b/sbin/chksession @@ -124,5 +124,13 @@ if ($xsession) { exit (0); } -print shift @lf, "\n" if $first; -if ($list) { my $p; for(@lf) { $p .= /$lf[-1]/ ? "$_ default failsafe" : "$_ " } print "$p\n"; } +@lf ? print shift @lf, "\n" : print "Default\n" + if $first; + +if ($list) { + if (@lf) { + my $p; for(@lf) { $p .= /$lf[-1]/ ? "$_ default failsafe" : "$_ " } print "$p\n"; + } else { + print "Default\n"; + } +} |