diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile | 35 | ||||
| -rw-r--r-- | mandrake_desk.spec | 9 | ||||
| -rw-r--r-- | window-managers | 3 |
4 files changed, 28 insertions, 23 deletions
@@ -1,3 +1,7 @@ +2000-04-05 Chmouel Boudjnah <chmouel@mandrakesoft.com> + + * window-managers: fix blakbox with last blackbox package. + 2000-02-02 Chmouel Boudjnah <chmouel@mandrakesoft.com> * window-managers: Add a sawmill entry (V.Danen). @@ -1,5 +1,5 @@ NAME = mandrake_desk -VERSION = 1.0.1 +VERSION = $(shell awk '/define version/ { print $$3 }' $(NAME).spec) all: @echo "Run make install" @@ -7,23 +7,6 @@ all: clean: find . -type d -name '.xvpics'|xargs rm -rf -dis: clean - rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar* - mkdir -p $(NAME)-$(VERSION) - find . -not -name "$(NAME)-$(VERSION)"|cpio -pd $(NAME)-$(VERSION)/ - find $(NAME)-$(VERSION) -type d -name CVS -o -name .cvsignore -o -name unused |xargs rm -rf - perl -p -i -e 's|^%define version.*|%define version $(VERSION)|' $(NAME).spec - tar cf ../$(NAME)-$(VERSION).tar $(NAME)-$(VERSION) - bzip2 -9f ../$(NAME)-$(VERSION).tar - rm -rf $(NAME)-$(VERSION) - -rpm: dis ../mandrake_desk-$(VERSION).tar.bz2 $(RPM) - cp -f ../mandrake_desk-$(VERSION).tar.bz2 $(RPM)/SOURCES - cp -f mandrake_desk.spec $(RPM)/SPECS/ - cp -f special/mandrake-small.xpm $(RPM)/SOURCES/ - -rpm -ba mandrake_desk.spec - rm -f ../mandrake_desk-$(VERSION).tar.bz2 - install: mkdir -p $(RPM_BUILD_ROOT)/usr/sbin mkdir -p $(RPM_BUILD_ROOT)/usr/man/man8/ @@ -57,3 +40,19 @@ install: $(RPM_BUILD_ROOT)/usr/lib/desktop-links bzip2 -9f $(RPM_BUILD_ROOT)/usr/man/*/* + +dis: + rm -rf $(NAME)-$(VERSION) ../$(NAME)-$(VERSION).tar* + cvs commit + mkdir -p $(NAME)-$(VERSION) + find . -not -name "$(NAME)-$(VERSION)"|cpio -pd $(NAME)-$(VERSION)/ + find $(NAME)-$(VERSION) -type d -name CVS -o -name .cvsignore -o -name unused |xargs rm -rf + tar cf ../$(NAME)-$(VERSION).tar $(NAME)-$(VERSION) + bzip2 -9f ../$(NAME)-$(VERSION).tar + rm -rf $(NAME)-$(VERSION) + +rpm: dis ../$(NAME)-$(VERSION).tar.bz2 $(RPM) + cp -f ../$(NAME)-$(VERSION).tar.bz2 $(RPM)/SOURCES + cp -f $(NAME).spec $(RPM)/SPECS/ + -rpm -ba --clean --rmsource $(NAME).spec + rm -f ../$(NAME)-$(VERSION).tar.bz2 diff --git a/mandrake_desk.spec b/mandrake_desk.spec index cd56c71..3585626 100644 --- a/mandrake_desk.spec +++ b/mandrake_desk.spec @@ -1,7 +1,5 @@ -# DO NOT MODIFY THE VERSION HERE, modify in the CVS -%define version 1.0.1 -# -%define release 19mdk +%define version 1.0.2 +%define release 1mdk %define name mandrake_desk Summary: The Desktop configuration files for Linux Mandrake. @@ -54,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT /usr/man/*/* %changelog +* Wed Apr 5 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 1.0.2-1mdk +- window-managers: fix blakbox with last blackbox package. + * Wed Feb 2 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 1.0.1-19mdk - window-managers: Add a sawmill entry (V.Danen). diff --git a/window-managers b/window-managers index 7ca0b6c..300174e 100644 --- a/window-managers +++ b/window-managers @@ -40,7 +40,8 @@ ICON=BlackBox.xpm EXEC=/usr/X11R6/bin/blackbox DESC=A Light but nice looking window manager SCRIPT: -exec /usr/X11R6/bin/bbdrake +/usr/X11R6/bin/bsetroot -solid Navy +exec /usr/X11R6/bin/blackbox --@@-- NAME=AfterStep ICON=AfterStep.xpm |