diff options
| author | Chmouel Boudjnah <chmouel@mandriva.org> | 1999-12-27 16:19:01 +0000 |
|---|---|---|
| committer | Chmouel Boudjnah <chmouel@mandriva.org> | 1999-12-27 16:19:01 +0000 |
| commit | 35746ef366509d19bc35becdfd92aedb0340f49b (patch) | |
| tree | 247123fd875a9a0bdf1abb916941f3fc268a4158 | |
| parent | ecf9464e6816b0462baaad1bb9271b6b07120e74 (diff) | |
| download | common-data-35746ef366509d19bc35becdfd92aedb0340f49b.tar common-data-35746ef366509d19bc35becdfd92aedb0340f49b.tar.gz common-data-35746ef366509d19bc35becdfd92aedb0340f49b.tar.bz2 common-data-35746ef366509d19bc35becdfd92aedb0340f49b.tar.xz common-data-35746ef366509d19bc35becdfd92aedb0340f49b.zip | |
"Seethechangelog"
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | mandrake_desk.spec | 2 | ||||
| -rw-r--r-- | sbin/chksession | 3 |
4 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,8 @@ +1999-12-27 Chmouel Boudjnah <chmouel@mandrakesoft.com> + + * icons/kdelnk: lot of changes (fix pablo sucks). + * sbin/chksession: check if root. + 1999-12-25 Pablo Saratxga <pablo@mandrakesoft.com> * Makefile,*.spec,gnome/*.desktop: put the handling of Gnome icons @@ -27,7 +27,8 @@ rpm: dis ../mandrake_desk-$(VERSION).tar.bz2 $(RPM) rm -f ../mandrake_desk-$(VERSION).tar.bz2 install: - mkdir -p $(RPM_BUILD_ROOT)/usr/{bin,sbin} + mkdir -p $(RPM_BUILD_ROOT)/usr/sbin + 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/ mkdir -p $(RPM_BUILD_ROOT)/usr/share/pixmaps/mdk @@ -36,7 +37,6 @@ 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 -m755 bin/* $(RPM_BUILD_ROOT)/usr/bin 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/ @@ -46,14 +46,13 @@ install: install -m644 backgrounds/* \ $(RPM_BUILD_ROOT)/usr/share/pixmaps/backgrounds/mandrake/ install -m644 kdelnk/* $(RPM_BUILD_ROOT)/etc/skel/Desktop/ - install -m644 icons/magic.xpm $(RPM_BUILD_ROOT)/usr/share/pixmaps/mdk/ install -m644 icons/mandrake*.xpm $(RPM_BUILD_ROOT)/usr/share/pixmaps/mdk/ install -m644 gnome/Netscape.desktop \ $(RPM_BUILD_ROOT)/usr/share/gnome/apps/Internet - install -m644 gnome/{DrakConf,RpmDrake}.desktop + install -m644 gnome/{DrakConf,RpmDrake}.desktop \ $(RPM_BUILD_ROOT)/usr/share/gnome/apps/System install -m755 gnome/mandrake.links.sh \ - $RPM_BUILD_ROOT/usr/lib/mc/desktop-scripts + $(RPM_BUILD_ROOT)/usr/lib/mc/desktop-scripts install -m644 gnome/mandrake.links \ - $RPM_BUILD_ROOT/usr/lib/desktop-links + $(RPM_BUILD_ROOT)/usr/lib/desktop-links diff --git a/mandrake_desk.spec b/mandrake_desk.spec index a8306c2..19f3057 100644 --- a/mandrake_desk.spec +++ b/mandrake_desk.spec @@ -43,7 +43,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc TRANSLATORS special/* README.CVS %config /etc/X11/window-managers -/usr/bin/* /usr/sbin/* /usr/share/icons/*.xpm /usr/share/icons/*.png @@ -59,6 +58,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Dec 27 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com> - Various fix and changes (icons & links). +- bin/chkSession check if we are root. * Fri Dec 24 1999 Chmouel Boudjnah <chmouel@mandrakesoft.com> - window-managers: various change from (jerome). diff --git a/sbin/chksession b/sbin/chksession index 4ef57e5..7226a84 100644 --- a/sbin/chksession +++ b/sbin/chksession @@ -61,6 +61,7 @@ while ($ARGV[0] =~ /^--/ || $ARGV[0] =~ /^-/) { } elsif (/^--first/ || /^-F/) { $first++; } elsif (/^--gdm/ || /^-g/) { + die "You should be root to build gdm session\n" if $< != 0; $gdm++; } elsif (/^--list/ || /^-l/) { $list++; @@ -97,7 +98,7 @@ if ($gdm) { chdir $d; #Any better way ? - opendir D, $d; + opendir D, $d or die "Can't open $d\n"; for ( readdir(D)) { next if /^\.\.?/;next if /^Failsafe/; chmod 0644, $_; } closedir D; |