aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChmouel Boudjnah <chmouel@mandriva.org>2000-01-04 23:49:07 +0000
committerChmouel Boudjnah <chmouel@mandriva.org>2000-01-04 23:49:07 +0000
commit1a6e83a185fa64bf8f023047ef078f7688931e1e (patch)
treee32653a5faf0da90d35a8c7303c1e138b47e6c2d
parent2cd115f2b5fc478614f4c6be0fb7d553e0e38052 (diff)
downloadcommon-data-1a6e83a185fa64bf8f023047ef078f7688931e1e.tar
common-data-1a6e83a185fa64bf8f023047ef078f7688931e1e.tar.gz
common-data-1a6e83a185fa64bf8f023047ef078f7688931e1e.tar.bz2
common-data-1a6e83a185fa64bf8f023047ef078f7688931e1e.tar.xz
common-data-1a6e83a185fa64bf8f023047ef078f7688931e1e.zip
"Seethechangelog"
-rw-r--r--ChangeLog5
-rw-r--r--Makefile21
-rw-r--r--kdelnk/DrakConf.kdelnk2
-rw-r--r--mandrake_desk.spec11
4 files changed, 20 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 1ef62a0..8a73bb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
-2000-01-03 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+2000-01-04 Chmouel Boudjnah <chmouel@mandrakesoft.com>
+ * kdelnk/DrakeConf: remove the call to kdesu.
+ * gnome/mandrake.links: remove the call to kdesu for DrakeConf.
+2000-01-03 Chmouel Boudjnah <chmouel@mandrakesoft.com>
* window-managers: fix wrong Enlightenment entry.
1999-12-28 Chmouel Boudjnah <chmouel@mandrakesoft.com>
diff --git a/Makefile b/Makefile
index a717878..3d2deea 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+NAME = mandrake_desk
VERSION = 1.0.1
all:
@@ -7,18 +8,14 @@ clean:
find . -type d -name '.xvpics'|xargs rm -rf
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
- egrep "^%define version $(VERSION)" mandrake_desk.spec ||
- 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)
+ 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
diff --git a/kdelnk/DrakConf.kdelnk b/kdelnk/DrakConf.kdelnk
index 7a4ed6a..ec707c8 100644
--- a/kdelnk/DrakConf.kdelnk
+++ b/kdelnk/DrakConf.kdelnk
@@ -7,7 +7,7 @@ SwallowTitle=
Icon=DrakConf.xpm
BinaryPattern=DrakConf;
MimeType=application/x-rpm;
-Exec=/usr/bin/kdesu -c "/usr/X11R6/bin/DrakConf"
+Exec=/usr/X11R6/bin/DrakConf
Path=
Type=Application
Terminal=0
diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 6d9fdca..af18603 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 11mdk
+%define version 1.0.1
+%define release 13mdk
%define name mandrake_desk
Summary: The Desktop configuration files for Linux Mandrake.
@@ -58,7 +56,10 @@ rm -rf $RPM_BUILD_ROOT
/usr/man/*/*
%changelog
-* Tue Jan 04 2000 - David BAUDENS <baudens@mandrakesoft.com>
+* Wed Jan 5 2000 Chmouel Boudjnah <chmouel@mandrakesoft.com> 1.0.1-13mdk
+- Fix gnome links.
+
+* Tue Jan 04 2000 David BAUDENS <baudens@mandrakesoft.com>
- Use BBDrake & WMDrake for BlackBox & Window Maker
* Fri Dec 31 1999 Pixel <pixel@mandrakesoft.com>