From 52260736c4f5035d7df81b524c3cf38869b68b66 Mon Sep 17 00:00:00 2001 From: Chmouel Boudjnah Date: Sun, 19 Dec 1999 18:51:23 +0000 Subject: "Seethechangelog" --- Makefile | 45 +++++-- README.CVS | 9 ++ mandrake_desk.spec | 90 ++++++------- special/mandrake-small.xpm | 310 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 392 insertions(+), 62 deletions(-) create mode 100644 README.CVS create mode 100644 special/mandrake-small.xpm diff --git a/Makefile b/Makefile index 575f072..024cd77 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,44 @@ -VERSION=0.9.8 +VERSION=0.9.9 all: - echo "Run make dis" + @echo "Run make install" clean: find . -type d -name '.xvpics'|xargs rm -rf -install: clean - rm -rf mandrake_desk-$(VERSION) - mkdir mandrake_desk-$(VERSION) - find . ! -name mandrake_desk-$(VERSION)|cpio -pvd mandrake_desk-$(VERSION) - find mandrake_desk-$(VERSION) -type d -name CVS|xargs rm -rf - tar cyf ../mandrake_desk-$(VERSION).tar.bz2 mandrake_desk-$(VERSION) +dis: clean + rm -rf mandrake_desk-$(VERSION) ../mandrake_desk-$(VERSION).tar* + mkdir -p mandrake_desk-$(VERSION) + find . -not -name "mandrake_desk-$(VERSION)"|\ + cpio -pd mandrake_desk-$(VERSION)/ + find mandrake_desk-$(VERSION) \ + -type d -name CVS -o -name .cvsignore -o -name unused |xargs rm -rf + perl -p -i -e 's|^%define version.*|%define version $(VERSION)|' \ + mandrake_desk.spec + tar cf ../mandrake_desk-$(VERSION).tar mandrake_desk-$(VERSION) + bzip2 -9f ../mandrake_desk-$(VERSION).tar rm -rf mandrake_desk-$(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/{bin,sbin} + mkdir -p $(RPM_BUILD_ROOT)/usr/share/{icons,pixmaps/backgrounds/mandrake} + mkdir -p $(RPM_BUILD_ROOT)/usr/share/gnome/apps/Internet + mkdir -p $(RPM_BUILD_ROOT)/usr/share/pixmaps/mdk + mkdir -p $(RPM_BUILD_ROOT)/etc/skel/Desktop + install -m755 bin/* $(RPM_BUILD_ROOT)/usr/bin + install -m755 sbin/* $(RPM_BUILD_ROOT)/usr/sbin + install -m644 icons/*.xpm $(RPM_BUILD_ROOT)/usr/share/icons/ + 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 diff --git a/README.CVS b/README.CVS new file mode 100644 index 0000000..a1e5fb5 --- /dev/null +++ b/README.CVS @@ -0,0 +1,9 @@ +Hi, + +To get the last developement version you may use CVS see the +http://www.linuxmandrake.com/en/cvs.php3 page for more information how to use +cvs. + +DrakConf is under the soft/DrakConf tree aliased to DrakConf. + +Chmouel Boudjnah . diff --git a/mandrake_desk.spec b/mandrake_desk.spec index cac6073..3fcf35a 100644 --- a/mandrake_desk.spec +++ b/mandrake_desk.spec @@ -1,5 +1,5 @@ -%define version 0.9.8 -%define release 9mdk +%define version 0.9.9 +%define release 1mdk %define name mandrake_desk Summary: The Desktop configuration files for Linux Mandrake. @@ -12,13 +12,46 @@ Icon: mandrake-small.xpm BuildRoot: /tmp/%{name}-buildroot Source: mandrake_desk-%{version}.tar.bz2 BuildArchitectures: noarch -BuildRequires: ImageMagick +BuildRequires: /usr/X11R6/bin/convert %description This package contains useful icons background and .kdelnk files for the Mandrake desktop. +%prep +rm -rf $RPM_BUILD_ROOT + +%setup + +%build + +%install +make install RPM_BUILD_ROOT=$RPM_BUILD_ROOT +pushd $RPM_BUILD_ROOT/usr/share/pixmaps/backgrounds/mandrake && { + for i in *.jpg ; do /usr/X11R6/bin/convert $i `basename $i .jpg`.xpm ; done +} && popd +rm -f special/mandrake-small.xpm + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc TRANSLATORS special/* +/usr/bin/* +/usr/sbin/* +/usr/share/icons/* +/usr/share/pixmaps/backgrounds/mandrake +/etc/skel/Desktop/ +/usr/share/pixmaps/mdk +/usr/share/gnome/apps/Internet/*.desktop + %changelog +* Sun Dec 19 1999 Chmouel Boudjnah +- Add fndSession. +- Use mktemp instead of $$ for fndSession. +- Add a real Makefile and clean-up the .spec. + * Fri Dec 17 1999 Pixel - add perl script to remove icons pointing to binaries not present @@ -126,54 +159,3 @@ the Mandrake desktop. * Sat May 01 1999 Chmouel Boudjnah - Add new icons. - -%prep -rm -rf $RPM_BUILD_ROOT - -%setup - -%build - -%install - -mkdir -p $RPM_BUILD_ROOT/usr/bin/ -cp -af bin/* $RPM_BUILD_ROOT/usr/bin - -mkdir -p $RPM_BUILD_ROOT/usr/sbin/ -cp -af sbin/* $RPM_BUILD_ROOT/usr/sbin - -mkdir -p $RPM_BUILD_ROOT/usr/share/icons/ -cp -arf icons/*.xpm $RPM_BUILD_ROOT/usr/share/icons/ - -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/backgrounds/ -cp -arf backgrounds $RPM_BUILD_ROOT/usr/share/pixmaps/backgrounds/mandrake -pushd $RPM_BUILD_ROOT/usr/share/pixmaps/backgrounds/mandrake && { - for i in *.jpg ; do convert $i `basename $i .jpg`.xpm ; done -} && popd - -mkdir -p $RPM_BUILD_ROOT/etc/skel/Desktop -cp -avrf kdelnk/* $RPM_BUILD_ROOT/etc/skel/Desktop/ -rm -f $RPM_BUILD_ROOT/etc/skel/Desktop/floppy.kdelnk -rm -f $RPM_BUILD_ROOT/etc/skel/Desktop/Cd-Rom.kdelnk - -# for Gnome -mkdir -p $RPM_BUILD_ROOT/usr/share/gnome/apps/Internet -mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/mdk - -install -m 655 icons/magic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/mdk -install -m 655 icons/mandrake* $RPM_BUILD_ROOT/usr/share/pixmaps/mdk -install -m 655 gnome/Netscape.desktop $RPM_BUILD_ROOT/usr/share/gnome/apps/Internet - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root) -%doc TRANSLATORS special/* -/usr/bin/* -/usr/sbin/* -/usr/share/icons/* -/usr/share/pixmaps/backgrounds/mandrake -/etc/skel/Desktop/ -/usr/share/pixmaps/mdk -/usr/share/gnome/apps/Internet/*.desktop diff --git a/special/mandrake-small.xpm b/special/mandrake-small.xpm new file mode 100644 index 0000000..b3126a8 --- /dev/null +++ b/special/mandrake-small.xpm @@ -0,0 +1,310 @@ +/* XPM */ +static char *magick[] = { +/* columns rows colors chars-per-pixel */ +"48 48 256 2", +" c #98a3d0", +". c #8a99cd", +"X c #7589c3", +"o c #687dc0", +"O c #5f76b8", +"+ c #5e76c0", +"@ c #959bc4", +"# c #a3a0d5", +"$ c #6a7db5", +"% c #596fb7", +"& c #4f68b8", +"* c #4c67b8", +"= c #4c5fb3", +"- c #7a89b6", +"; c #989fc0", +": c #6c7da8", +"> c #4d66b0", +", c #425aa5", +"< c #3b52a3", +"1 c #334da3", +"2 c #3751aa", +"3 c #334fab", +"4 c #3651b0", +"5 c #344c9b", +"6 c #4f60a6", +"7 c #8d93a9", +"8 c #8e9bc4", +"9 c #6d85c1", +"0 c #6a7ab2", +"q c #42599a", +"w c #324d8a", +"e c #2f4da2", +"r c #28489e", +"t c #2846a2", +"y c #334da9", +"u c #2f4ca9", +"i c #2c44a3", +"p c #5e6a98", +"a c #d8d4a9", +"s c #5c6ca5", +"d c #3b57ab", +"f c #284ca3", +"g c #2f51a3", +"h c #2f50a8", +"j c #3354ab", +"k c #3757af", +"l c #2f4fb8", +"z c #425ec0", +"x c #4d5d99", +"c c #d3c0a7", +"v c #d1c0a6", +"b c #ccbba2", +"n c #c0b5b0", +"m c #d7c983", +"M c #d5cd4f", +"N c #d1c360", +"B c #9aa3bd", +"V c #36509d", +"C c #2f50b0", +"Z c #3351b7", +"A c #3352a8", +"S c #3451a3", +"D c #2f509b", +"F c #2f4d9b", +"G c #3757a9", +"H c #3b549a", +"J c #5f75a2", +"K c #d4bf7d", +"L c #dfc45f", +"P c #d3bd52", +"I c #cfba80", +"U c #dcc044", +"Y c #d9be11", +"T c #c0b044", +"R c #8696b3", +"E c #51689f", +"W c #2f4699", +"Q c #3350a8", +"! c #344cb0", +"~ c #2f4fa5", +"^ c #cdc388", +"/ c #dbc045", +"( c #dbbf1d", +") c #ddb72f", +"_ c #e8bd0b", +"` c #d8b700", +"' c #c1ae44", +"] c #6277a2", +"[ c #26419a", +"{ c #2f4db0", +"} c #2a47b0", +"| c #325093", +" . c #3b54aa", +".. c #2f42ae", +"X. c #3b52b3", +"o. c #3457a3", +"O. c #4f679f", +"+. c #d3be59", +"@. c #e2b708", +"#. c #cfa922", +"$. c #bba860", +"%. c #c4b588", +"&. c #6f80b3", +"*. c #2f50ab", +"=. c #405db5", +"-. c #425989", +";. c #71858a", +":. c #b8b3a0", +">. c #d9c166", +",. c #e8b93b", +"<. c #d4ab19", +"1. c #ae963c", +"2. c #ad9f7a", +"3. c #9d9e8e", +"4. c #777eb3", +"5. c #385799", +"6. c #6f7a97", +"7. c #d4d090", +"8. c #e0c45f", +"9. c #d7b02f", +"0. c #d8ad2f", +"q. c #e0bb1d", +"w. c #d3b313", +"e. c #bb9e26", +"r. c #a08741", +"t. c #998a72", +"y. c #909181", +"u. c #5467a9", +"i. c #6472a3", +"p. c #d8d89f", +"a. c #c1a350", +"s. c #bf9968", +"d. c #c9b32f", +"f. c #c4b01b", +"g. c #886e62", +"h. c #989088", +"j. c #5d72c0", +"k. c #566dcc", +"l. c #4f5e99", +"z. c #8890af", +"x. c #a1839b", +"c. c #b0a72c", +"v. c #a08a61", +"b. c #8b728f", +"n. c #7e92b8", +"m. c #6d7797", +"M. c #927fbd", +"N. c #9a9668", +"B. c #a9a14e", +"V. c #a29187", +"C. c #9781a9", +"Z. c #6a83c4", +"A. c #5f6e87", +"S. c #8b81be", +"D. c #aaa882", +"F. c #7285b7", +"G. c #8b8eb0", +"H. c #888da7", +"J. c #91909f", +"K. c #a3a7b6", +"L. c #7d8bb3", +"P. c #516eba", +"I. c #334fbf", +"U. c #868bbd", +"Y. c #888e98", +"T. c #8191bf", +"R. c #6f70ad", +"E. c #8a97a7", +"W. c #767db5", +"Q. c #8a96b5", +"!. c #808898", +"~. c #8b9599", +"^. c #868eb1", +"/. c #5f74b5", +"(. c #4251a1", +"). c #727da7", +"_. c #7d88a8", +"`. c #99a3c3", +"'. c #516dc0", +"]. c #7c82b1", +"[. c #9ba0b8", +"{. c #909dc0", +"}. c #989fc3", +"|. c #8191c0", +" X c #4f61a5", +".X c #7880b2", +"XX c #6a83c3", +"oX c #425aa3", +"OX c #5169b7", +"+X c #5f6fa3", +"@X c #819bd3", +"#X c #3245a7", +"$X c #3b4fbf", +"%X c #3f579a", +"&X c #5575b6", +"*X c #3f4f98", +"=X c #475598", +"-X c #5c74cd", +";X c #686f97", +":X c #495690", +">X c #4f5e89", +",X c #6a6f8a", +" , < 1 2 2 2 4 5 6 7 wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXwXwXwX8 9 0 q w w e r t e y u u i 4 i 5 p wXwXwXwXwXwXwXwXwXwXwXwXwXa wXwXwXwXwXwX", +"wXwXwXwXwXwXwXwX$ s 6 d y t f g f g h j k j y t z 3 5 x - wXwXwXwXwXwXc v b wXn m M N wXwXwXwXwX", +"wXwXwXwXwXB $ s V e e y C l Z k k k 4 A g S D F z G e H J wXwXwXwXwXwXa K L P I U Y T wXwXwXwXwX", +"wXwXwXwXR E V W u C y 3 Q 2 4 C ! 4 3 e e ~ g F G g F 5 s wXwXwXwXwXwXwX^ / ( ) _ ` ' wXwXwXwXwX", +"wXwXwXwX] w [ { } 4 2 D | < .y ..! X.! 2 d d g o.D D S O.wXwXwXwXwXwXwXwX+.) @._ @.#.$.%.wXwXwX", +"wXwXwXwX&.W ~ 2 g e A *.u *.k =.A 2 Q Q Q Q 2 2 e 4 4 g -.;.wXwXwXwXwXwX:.>.,.@._ Y <.1.2.3.wXwX", +"wXwXwXwX4.H d =.G A k 4 u y *.~ A Q Q ~ ~ Q A A i 2 Z *.5.6.wXwXwXwXwXwX7.8.9.0.q.w.e.r.t.y.wXwX", +"wXwXwXwX8 u.& z g e G k j j j g 3 Q ~ e Q ~ Q 2 5 4 4 { S i.wXwXwXwXwXwXp.K a.s.d.f.1.g.h.wXwXwX", +"wXwXwXwXwX$ j.k.G e h k 4 j 4 h Q Q Q Q ~ Q Q Q 1 4 4 C g l.z.wXwXwXwXwXwXwXwXx.a.c.v.b.wXwXwXwX", +"wXwXwXwXwXn.o k.* S A 2 3 h Q e Q 2 Q Q Q Q A Q 1 .3 ~ | -.m.wXwXwXwXwXwXwX# M.N.B.V.C.wXwXwXwX", +"wXwXwXwXwX@ Z.+ * G ~ j Q Q 2 ~ A A Q A Q A 2 Q Q .~ g | w A.wXwXwXwXwXwXwX@ S.y.D.wXwXwXwXwXwX", +"wXwXwXwXwXB F.O * S F 2 2 2 d 2 Q Q 2 A 2 Q Q Q ~ .1 j A | O.wXwXwXwXwXwXwXG.H.J.wXwXwXwXwXwXwX", +"wXwXwXwXwXK.L.$ P.d e 2 2 2 ~ e ~ Q Q Q Q Q Q ~ V < Q Z I.y = U.wXwXwXwXwXwXH.Y.wXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXT.F.+ = .X.S D e =.e Q Q Q Q Q Q Q Q 3 3 4 A g D R.wXwXwXwXwX8 E.Y.wXwXwXwXwXwXwXwX", +"wXwXwXwXwXwX@ W.O = .2 S 1 g 3 Q Q Q Q Q Q Q ~ 2 3 3 j S g 5 s wXwXwXwXwXQ.!.wXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwX- O * X.1 e S S h Q Q Q Q Q Q Q Q Q 3 3 j j g g x H.wXwXwXwXE.~.wXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwX^./.% =.1 F g A *.Q Q Q Q Q Q Q Q 2 3 Q j j ~ ~ (.).wXwXwXwX7 Y.wXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXQ.O + & 2 W F 2 j Q Q Q Q Q Q Q Q Q 3 Q j j h h V s wXwXwXQ.^._.wXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwX`.Z.o '. .F F G 4 Q Q Q Q Q Q Q Q 2 Q Q j j C u e , ].[.{.$ s $ 4.}.wXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXwX|.Z.'.d 1 D A 4 Q Q Q Q Q Q Q Q Q Q Q A 3 C { e < X.XXX> , = oXOX+X_.wXwXwXwXwX", +"wXwXwXwXwXwXwXwX@XZ.P.d d S A 4 Q Q Q Q Q Q Q ~ 2 Q ~ j j l { 4 #X(.% + =.i $XX. .w -._.wXwXwXwX", +"wXwXwXwXwXwXwXwXwX: + '.k G 1 e ~ A j A A h Q Q Q Q Q Q ~ g V 1 %X> &XP.d ~ k { Z X.*X=X!.wXwXwX", +"wXwXwXwXwXwXwXwXwXn.o P.G G 3 u ~ Q A j A h h Q Q y 3 2 y 1 1 D =.'.-Xz g S d 1 .(.=X;X7 wXwXwX", +"wXwXwXwXwXwXwXwXwX|./.=.S G j l h A A A Q Q A A 2 4 4 4 2 2 ~ g =.-Xk. .5 H *X=X:X>X,XwXwXwXwXwX", +"wXwXwXwXwXwXwXwXXp ).;X,X9XwXwXwXwXwXwXwXwXwXwXwXwXwX", +" W.(.W y Z l f h o.G g A g h 4 4 X.! y 1 e V < w 4X>XA.A.0X0XM.0XY.wXwXwXwXwXwXwXwXwXwXwXwXwXwX", +". $ *X[ ..I.I.l G G j j *.4 Z X.$X! #X5 *X=Xx >XA.8X9X~.wXwXwXwXY.wXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXU.6 *Xi y 4 Z g g V F 5 5 < < (.*X*X=X7Xp m.0XwXwXwXwXwXwXwXwXY.wXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXn.p =X*XH H *X4X*X4X-.6X>XqXA.8X0X!.~.wXwXwXwXwXwXwXwXwXwXH.7 wXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXwX`.!.m.m.;X;Xm.m.m.9X!.~.~.wXwXwXwXwXwXwXwXwXwXwXwXwXwXwX!.wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXG.!.wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXQ.~.wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXQ.E.wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXE.E.wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXE.Q.wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX7 Y.wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX~.H.wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX", +"wXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwXwX" +}; -- cgit v1.2.1