From 5602d3f102b3bd5aea10db08f339eee47a415de2 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Fri, 8 Sep 2006 17:11:37 +0000 Subject: - Update profile scripts to remove invalid dependencies - move defaults bookmarks from kde and firefox to this package --- bookmarks/mozilla/mozilla-discovery-download.html | 17 ++++++ bookmarks/mozilla/mozilla-powerpack.html | 58 +++++++++++++++++++ bookmarks/mozilla/mozilla-powerpackplus.html | 70 +++++++++++++++++++++++ desktop-common-data.spec | 24 +++++++- menu/menustyle.csh | 1 - menu/menustyle.sh | 2 - 6 files changed, 168 insertions(+), 4 deletions(-) create mode 100644 bookmarks/mozilla/mozilla-discovery-download.html create mode 100644 bookmarks/mozilla/mozilla-powerpack.html create mode 100644 bookmarks/mozilla/mozilla-powerpackplus.html diff --git a/bookmarks/mozilla/mozilla-discovery-download.html b/bookmarks/mozilla/mozilla-discovery-download.html new file mode 100644 index 0000000..d753d7f --- /dev/null +++ b/bookmarks/mozilla/mozilla-discovery-download.html @@ -0,0 +1,17 @@ + + +Bookmarks +

Bookmarks

+

+

Mandriva

+

+

Mandriva +
Mandriva Store +
Mandriva Club +
Mandriva Expert +
Mandriva Online +
LPI +
Free calls online +
Intel® Compilers +

+

diff --git a/bookmarks/mozilla/mozilla-powerpack.html b/bookmarks/mozilla/mozilla-powerpack.html new file mode 100644 index 0000000..720cc5c --- /dev/null +++ b/bookmarks/mozilla/mozilla-powerpack.html @@ -0,0 +1,58 @@ + + +Bookmarks +

Bookmarks

+

+

Mandriva

+

+

Mandriva +
Mandriva Store +
Mandriva Club +
Mandriva Expert +
Mandriva Online +
LPI +
Free calls online +
Intel® Compilers +

+

Community

+

+

Free Software Foundation +
The GNU Project +
+
Freshmeat +
GNOME +
KDE +
Linux.org +
Linux Games +
Linux HeadQuarters +
Linux Kernel Archives +
RpmFind.net +
X.org +

+

News

+

+

All Linux Devices +
Linux.com +
Linux Planet +
Linux Today +
Linux Weekly News +
OfB.biz +
OSNews.com +
Slashdot +

+

Programming

+

+

Mandriva Linux Cooker +
Mandriva Linux Development Community +
+
GCC +
GTK+ +
KDE - Developer's Corner +
OpenSource.org +
Perl.org +
Python.org +
Qt Overview +
RPM.org +
SourceForge +

+

diff --git a/bookmarks/mozilla/mozilla-powerpackplus.html b/bookmarks/mozilla/mozilla-powerpackplus.html new file mode 100644 index 0000000..d400876 --- /dev/null +++ b/bookmarks/mozilla/mozilla-powerpackplus.html @@ -0,0 +1,70 @@ + + +Bookmarks +

Bookmarks

+

+

Mandriva

+

+

Mandriva +
Mandriva Store +
Mandriva Club +
Mandriva Expert +
Mandriva Online +
LPI +
Free calls online +
Intel® Compilers +

+

Community

+

+

Free Software Foundation +
The GNU Project +
+
Freshmeat +
GNOME +
KDE +
Linux.org +
Linux Games +
Linux HeadQuarters +
Linux Kernel Archives +
RpmFind.net +
X.org +

+

News

+

+

All Linux Devices +
Linux.com +
Linux Planet +
Linux Today +
Linux Weekly News +
OfB.biz +
OSNews.com +
Slashdot +

+

Programming

+

+

Mandriva Linux Cooker +
Mandriva Linux Development Community +
+
GCC +
GTK+ +
KDE - Developer's Corner +
OpenSource.org +
Perl.org +
Python.org +
Qt Overview +
RPM.org +
SourceForge +

+

Server

+

+

Apache +
Kolab +
MySQL +
PHP +
Postfix +
PostgreSQL +
ProFTPD +
OpenLDAP +
Samba +

+

diff --git a/desktop-common-data.spec b/desktop-common-data.spec index b92a79b..6a2e558 100644 --- a/desktop-common-data.spec +++ b/desktop-common-data.spec @@ -3,7 +3,7 @@ Summary: Desktop common files Name: desktop-common-data Version: 2007 -Release: %mkrel 11 +Release: %mkrel 12 License: GPL URL: http://www.mandrivalinux.com/ Group: System/Configuration/Other @@ -126,6 +126,17 @@ for i in dm/*.png dm/*.desktop dm/*.xml ; do install -m 0644 $i %buildroot/%_datadir/mdk/dm/ done +# install bookmarks +install -d -m 0755 %buildroot%_datadir/mdk/bookmarks/konqueror +for i in bookmarks/konqueror/*.xml ; do + install -m 0644 $i %buildroot%_datadir/mdk/bookmarks/konqueror +done + +install -d -m 0755 %buildroot%_datadir/mdk/bookmarks/mozilla +for i in bookmarks/mozilla/*.html ; do + install -m 0644 $i %buildroot%_datadir/mdk/bookmarks/mozilla +done + %post if [ -f %_sysconfdir/X11/window-managers.rpmsave ];then @@ -175,6 +186,13 @@ rm -fr %buildroot # %dir %_datadir/mdk/backgrounds/ %_datadir/mdk/backgrounds/*.jpg + +%dir %_datadir/mdk/bookmarks +%dir %_datadir/mdk/bookmarks/konqueror +%_datadir/mdk/bookmarks/konqueror/*.xml +%dir %_datadir/mdk/bookmarks/mozilla +%_datadir/mdk/bookmarks/mozilla/*.html +%_datadir/mdk/backgrounds/*.jpg # %dir %_datadir/apps/kdm/pics/ %_datadir/apps/kdm/pics/* @@ -193,6 +211,10 @@ rm -fr %buildroot %changelog +* Fri Sep 08 2006 Frederic Crozat 2007-12mdv2007.0 +- Update profile scripts to remove invalid dependencies +- move defaults bookmarks from kde and firefox to this package + * Mon Sep 04 2006 Frederic Crozat 2007-11mdv2007.0 - Improve gdm/kdm theme with new backgrounds - Don't create default desktop directories for root (Mdv bug #19711) diff --git a/menu/menustyle.csh b/menu/menustyle.csh index da29e20..74776db 100755 --- a/menu/menustyle.csh +++ b/menu/menustyle.csh @@ -1,4 +1,3 @@ -#!/bin/csh if ($META_CLASS == desktop ) then set MDV_MENU_STYLE=discovery else diff --git a/menu/menustyle.sh b/menu/menustyle.sh index ba46289..e1b5051 100755 --- a/menu/menustyle.sh +++ b/menu/menustyle.sh @@ -1,5 +1,3 @@ -#!/bin/sh - if [ "$META_CLASS" = "desktop" ]; then MDV_MENU_STYLE=discovery else -- cgit v1.2.1