Update

2 files changed, 58 insertions, 77 deletions

diff --git a/Makefile b/Makefile
index 9d30098..aed7897 100644
--- a/Makefile
+++ b/Makefile
@@ -1,83 +1,25 @@
 PACKAGE = mandrake_desk
+NAME = mandrake_desk
 VERSION:=$(shell grep 'Version:' $(PACKAGE).spec| cut -f 2)
 RELEASE:=$(shell grep 'Release:' $(PACKAGE).spec| cut -f 2)
+RPM=$(HOME)/rpm
 TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
 mandir=/usr/share/man
 
-all:
-	@echo "Run make install"
-
 clean:
 	find . -type d -name '.xvpics'|xargs rm -rf
 
-install:
-	mkdir -p $(RPM_BUILD_ROOT)/usr/{s,}bin
-	mkdir -p $(RPM_BUILD_ROOT)/$(mandir)/man8/
-	mkdir -p $(RPM_BUILD_ROOT)/usr/lib/mc/
-	mkdir -p $(RPM_BUILD_ROOT)/usr/share/{mdk/faces,icons,icons/large,icons/mini,pixmaps/backgrounds/linux-mandrake}
-	mkdir -p $(RPM_BUILD_ROOT)/etc/X11/
-	mkdir -p $(RPM_BUILD_ROOT)/usr/share/pixmaps/mdk
-	mkdir -p $(RPM_BUILD_ROOT)/etc/skel/Desktop
-	mkdir -p $(RPM_BUILD_ROOT)/usr/lib/mc/desktop-scripts
-	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/C/*8 $(RPM_BUILD_ROOT)/$(mandir)/man8/
-	for i in man/??* ; \
-	    do install -d $(RPM_BUILD_ROOT)/$(mandir)/`basename $$i`/man8 ; \
-	    install -m 644 $$i/*.8 $(RPM_BUILD_ROOT)/$(mandir)/`basename $$i`/man8 ; \
-	done	
-	install -m755 sbin/* $(RPM_BUILD_ROOT)/usr/sbin/
-	install -m755 bin/* $(RPM_BUILD_ROOT)/usr/bin/
-	install -m644 icons/*.xpm $(RPM_BUILD_ROOT)/usr/share/icons/
-	install -m644 icons/mini/*.xpm $(RPM_BUILD_ROOT)/usr/share/icons/mini
-	install -m644 icons/large/*.xpm $(RPM_BUILD_ROOT)/usr/share/icons/large
-	install -m644 backgrounds/* \
-	$(RPM_BUILD_ROOT)/usr/share/pixmaps/backgrounds/linux-mandrake/
-
-	install -m644 icons/mandrake*.png $(RPM_BUILD_ROOT)/usr/share/pixmaps/mdk/
-
-	install -m644 faces/* $(RPM_BUILD_ROOT)/usr/share/mdk/faces
-
-
-
-# rules to build a test rpm
-
-localrpm: localdist buildrpm
-
-localdist: cleandist dir localcopy tar
-
-cleandist:
-	rm -rf $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION).tar.bz2
-
-dir:
-	mkdir $(PACKAGE)-$(VERSION)
-
-localcopy:
-	find . | grep -v -- "$(PACKAGE)-$(VERSION)\|\.bz2\|CVS\|~\|.cvsignore" |cpio -pd $(PACKAGE)-$(VERSION)/
-
-tar:
-	tar cvf $(PACKAGE)-$(VERSION).tar $(PACKAGE)-$(VERSION)
-	bzip2 -9vf $(PACKAGE)-$(VERSION).tar
-	rm -rf $(PACKAGE)-$(VERSION)
-
-buildrpm:
-	rpm -ta $(PACKAGE)-$(VERSION).tar.bz2
-
-# rules to build a distributable rpm
-
-rpm: dist buildrpm
-
-dist: changelog cvstag cleandist dir export tar
-
-export:
-	cvs export -d $(PACKAGE)-$(VERSION) -r $(TAG) $(PACKAGE)
-
-cvstag:
-	cvs commit
-	cvs tag $(CVSTAGOPT) -F $(TAG)
-
-changelog: ../common/username
-	cvs2cl -U ../common/username -I ChangeLog 
-	rm -f ChangeLog.bak
-	cvs commit -m "Generated by cvs2cl the `date '+%d_%b'`" ChangeLog
+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 |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 806b9de..aca53d7 100644
--- a/mandrake_desk.spec
+++ b/mandrake_desk.spec
@@ -48,15 +48,20 @@ install -m 0644 backgrounds/xfdrake-test-card.jpg %buildroot/%_datadir/mdk/xfdra
 
 
 ## Install scripts
+# /usr/bin/
 install -d -m 0755 %buildroot/%_bindir/
-for i in bin/*.sh ; do install -m 0755 $i %buildroot/_bindir/ ; done
+for i in bin/*.sh ; do install -m 0755 $i %buildroot/%_bindir/ ; done
+
+# /usr/sbin/
+install -d -m 0755 %buildroot/%_sbindir/
+for i in sbin/* ; do install -m 0755 $i %buildroot/%_sbindir/ ; done
 
 
 
 ## Install faces
 install -d -m 0755 %buildroot/%_datadir/mdk/faces/
 install -d -m 0755 %buildroot/%_datadir/faces/
-for i in faces/*.png ; do install -m 0644 $i %buildroot/%_datadir/faces/
+for i in faces/*.png ; do install -m 0644 $i %buildroot/%_datadir/faces/ ; done
 		
 # David - 9.0-5mdk - For KDE
 install -m 0644 faces/default.png %buildroot/%_datadir/faces/default.png
@@ -66,6 +71,20 @@ install -m 0644 faces/default.png %buildroot/%_datadir/mdk/faces/user-default-md
 
 
 
+## Install icons
+# 16
+install -d -m 0755 %buildroot/%_miconsdir/
+for i in icons/mini/*.png ; do install -m 0644 $i %buildroot/%_miconsdir/ ; done
+
+# 32
+for i in icons/*.png ; do install -m 0644 $i %buildroot/%_iconsdir/ ; done
+
+# 48
+install -d -m 0755 %buildroot/%_liconsdir/
+for i in icons/large/*.png ; do install -m 0644 $i %buildroot/%_liconsdir/ ; done
+
+
+
 
 %post
 if [ -f %_sysconfdir/X11/window-managers.rpmsave ];then
@@ -85,7 +104,27 @@ rm -fr %buildroot
 
 %files
 %defattr(-,root,root,-)
-
+%_bindir/*
+#
+%_sbindir/*
+#
+%dir %_datadir/faces/
+%dir %_datadir/mdk/
+%dir %_datadir/mdk/faces/
+%_datadir/faces/*
+%_datadir/mdk/faces/*
+#
+%_iconsdir/*.*
+%_liconsdir/*
+%_miconsdir/*
+#
+%dir %_datadir/mdk/backgrounds/
+%dir %_datadir/mdk/backgrounds/root/
+%_datadir/mdk/backgrounds/*.png
+%_datadir/mdk/backgrounds/root/*.png
+#
+%dir %_datadir/mdk/xfdrake/
+%_datadir/mdk/xfdrake/*.jpg
 
 
 %changelog