Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5d0c7cf62517bbd776d2b4cb13a9aaba978620d0
commit 5d0c7cf62517bbd776d2b4cb13a9aaba978620d0
Author: Priyank <[EMAIL PROTECTED]>
Date: Sat Mar 1 20:01:51 2008 +0530
gdm-2.20.3-2-i686
* Removed gdm-gksu.patch (merged with gdm-gksu_categories.patch)
* Added a patch to fix the Categories for gdmsetup.desktop so that it's
displayed in the menu.
* Closes #2704
* Added missing _F_gnome_{iconcache,scrollkeeper,desktop}="y"
* Moved the gdmsetup.desktop to the right place
diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild
index 5c29d5f..9a77091 100644
--- a/source/gnome/gdm/FrugalBuild
+++ b/source/gnome/gdm/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=gdm
pkgver=2.20.3
-pkgrel=1
+pkgrel=2
pkgdesc="GNOME Display Manager"
url="http://www.gnome.org/";
backup=(etc/gdm/custom.conf)
@@ -13,16 +13,19 @@ rodepends=('xsm' 'sessreg' 'gksu' 'xmessage' 'gksu')
makedepends=('intltool' 'gnome-doc-utils')
groups=('gnome' 'gnome-minimal')
archs=('i686' 'x86_64')
-Finclude gnome
+_F_gnome_desktop="y"
+_F_gnome_iconcache="y"
+_F_gnome_scrollkeeper="y"
+Finclude gnome gnome-scriptlet
options=([EMAIL PROTECTED] 'force')
source=([EMAIL PROTECTED] $pkgname-2.20.1-gdmconf.patch \
- $pkgname-gksu.patch \
+ $pkgname-gksu_categories.patch \
fix_reboot_path.patch \
gdm-fix-the-build.patch \
http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-0.7.tar.bz2)
sha1sums=('de66323b890f2e65a33bb72c5937d1c95ee5bd89' \
'bc0209e8700b01e2369a66e93b2c86766ff988fd' \
- '05f42c18c0ce9fedfeda7de980d230b34a574f2c' \
+ '9665399f5ceaee25e5807f08c53456d5ac2a81fa' \
'b602b6805d1d4787e4404827abf3d6f346843317' \
'7c00f8c4501d13368f4a25cf34422108356f8761' \
'b13852bf7ce59df5d02f27b3603e274fba3e074d')
@@ -50,6 +53,12 @@ build() {
# Install our GDM theme.
mv $Fsrcdir/Frugalware $Fdestdir/usr/share/gdm/themes/Frugalware || Fdie
+
+ # Install the Login Window icon in the right place
+ Fmkdir /usr/share/applications
+ Fmv /usr/share/gdm/applications/gdmsetup.desktop
/usr/share/applications/gdmsetup.desktop
+
+ Fbuild_gnome_scriptlet
}
# optimization OK
diff --git a/source/gnome/gdm/gdm-gksu.patch b/source/gnome/gdm/gdm-gksu.patch
deleted file mode 100644
index 22e6b4f..0000000
--- a/source/gnome/gdm/gdm-gksu.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur gdm-2.20.3/gui/gdmsetup.desktop.in.in
gdm-2.20.3-p/gui/gdmsetup.desktop.in.in
---- gdm-2.20.3/gui/gdmsetup.desktop.in.in 2008-01-07 20:39:05.000000000
+0100
-+++ gdm-2.20.3-p/gui/gdmsetup.desktop.in.in 2008-01-23 19:03:42.000000000
+0100
-@@ -2,8 +2,8 @@
- Encoding=UTF-8
- _Name=Login Window
- _Comment=Configure GDM login window appearance and behavior
[EMAIL PROTECTED]@/gdmsetup
[EMAIL PROTECTED]@/gdmsetup
-+TryExec=gksu @sbindir@/gdmsetup
-+Exec=gksu @sbindir@/gdmsetup
- Icon=gdmsetup
- StartupNotify=true
- Terminal=false
diff --git a/source/gnome/gdm/gdm-gksu_categories.patch
b/source/gnome/gdm/gdm-gksu_categories.patch
new file mode 100644
index 0000000..c0b2938
--- /dev/null
+++ b/source/gnome/gdm/gdm-gksu_categories.patch
@@ -0,0 +1,19 @@
+diff -Naur gdm-2.20.3/gui/gdmsetup.desktop.in.in
gdm-2.20.3.new/gui/gdmsetup.desktop.in.in
+--- gdm-2.20.3/gui/gdmsetup.desktop.in.in 2008-01-08 01:09:05.000000000
+0530
++++ gdm-2.20.3.new/gui/gdmsetup.desktop.in.in 2008-03-01 19:32:38.000000000
+0530
+@@ -2,13 +2,12 @@
+ Encoding=UTF-8
+ _Name=Login Window
+ _Comment=Configure GDM login window appearance and behavior
[EMAIL PROTECTED]@/gdmsetup
[EMAIL PROTECTED]@/gdmsetup
++Exec=gksu @sbindir@/gdmsetup
+ Icon=gdmsetup
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;Settings;System;
++Categories=Application;GTK;Settings;X-GNOME-SystemSettings;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gdm
+ X-GNOME-Bugzilla-Component=general
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
