pool/gnome-menus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-menus?expand=0&rev=1

Browse Source
This commit is contained in:
OBS User unknown 2007-01-09 16:44:15 +00:00 committed by Git OBS Bridge
commit b5ddc8d718
19 changed files with 1723 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

5
Gnomecc-Hardware.directory.in Normal file
View File

@ -0,0 +1,5 @@
[Desktop Entry]
_Name=Hardware
_Comment=Hardware Settings
Type=Directory
Icon=hardware-directory

5
Gnomecc-LookAndFeel.directory.in Normal file
View File

@ -0,0 +1,5 @@
[Desktop Entry]
_Name=Look and Feel
_Comment=Appearance of the desktop
Type=Directory
Icon=lookandfeel-directory

5
Gnomecc-Personal.directory.in Normal file
View File

@ -0,0 +1,5 @@
[Desktop Entry]
_Name=Personal
_Comment=Personal preferences and settings
Type=Directory
Icon=personal-directory

5
Gnomecc-System.directory.in Normal file
View File

@ -0,0 +1,5 @@
[Desktop Entry]
_Name=System
_Comment=System Settings
Type=Directory
Icon=system-directory

5
Hidden.directory Normal file
View File

@ -0,0 +1,5 @@
[Desktop Entry]
Encoding=UTF-8
Name=Hidden
Type=Directory
NoDisplay=true

332
applications.menu Normal file
View File

@ -0,0 +1,332 @@
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
<Menu>
<!-- Scan legacy dirs first, as later items take priority -->
<KDELegacyDirs/>
<LegacyDir>/etc/X11/applnk/</LegacyDir>
<!-- Merge in the GNOME1 menus if you build into a non-default prefix -->
<LegacyDir>/opt/gnome/share/gnome/apps/</LegacyDir>
<!-- Read standard .directory and .desktop file locations -->
<!-- Default .directory location -->
<!-- This needs to be finally changed to ../desktop-directories/, instead of ../vfolders/ -->
<DirectoryDir>/opt/gnome/share/gnome/vfolders/</DirectoryDir>
<!-- Default .desktop location -->
<AppDir>/opt/gnome/share/applications/</AppDir>
<!-- Add Ximian Menu Entries, uncomment for menu nirvana -->
<AppDir>/opt/gnome/share/gnome/ximian/applications/</AppDir>
<!-- Root menu -->
<Name>Applications</Name>
<Directory>Root.directory</Directory>
<!-- Menu items to include in the toplevel -->
<Include>
<And>
<Or>
<Category>X-Ximian-Toplevel</Category>
<Category>X-Novell-Toplevel</Category>
</Or>
</And>
</Include>
<!-- Menu items to exclude from the toplevel -->
<Exclude>
<Filename>gnome-search-tool.desktop</Filename>
<Filename>Gmc.desktop</Filename>
<Filename>nautilus-help.desktop</Filename>
<Filename>gnome-help.desktop</Filename>
</Exclude>
<Include>
<Filename>sep.desktop</Filename>
</Include>
<!-- Merge in these other files as submenus -->
<!-- Accessories submenu -->
<Menu>
<Name>Accessories</Name>
<Directory>Accessories.directory</Directory>
<Include>
<Or>
<And>
<Or>
<Category>X-Ximian-Main</Category>
<Category>X-Novell-Main</Category>
</Or>
<Or>
<Category>Utility</Category>
<Category>Calendar</Category>
</Or>
</And>
<And>
<Category>Application</Category>
<Category>Accessibility</Category>
<Not>
<Category>Settings</Category>
</Not>
</And>
</Or>
</Include>
<!-- More -->
<Menu>
<Name>More</Name>
<Directory>More.directory</Directory>
<Include>
<Or>
<And>
<Category>Utility</Category>
<Not><Category>System</Category></Not>
</And>
<And>
<Category>Application</Category>
<Not>
<Or>
<Category>Development</Category>
<Filename>emacs.desktop</Filename>
<Category>Game</Category>
<Category>Graphics</Category>
<Category>Network</Category>
<Category>AudioVideo</Category>
<Category>Office</Category>
<Category>Education</Category>
<Category>System</Category>
<!-- Settings is being added to avoid un-allocated Preferences items like Themes, Keyboard -->
<Category>Settings</Category>
<!-- Other categories like Core,FileTransfer,News,.. should be added here to clean-up the menu -->
<!-- Refer http://standards.freedesktop.org/menu-spec/0.9/apa.html -->
</Or>
</Not>
</And>
</Or>
</Include>
<OnlyUnallocated/>
</Menu>
</Menu> <!-- End Accessories -->
<!-- System Tools-->
<Menu>
<Name>System Tools</Name>
<Directory>System.directory</Directory>
<Include>
<Or>
<Category>X-Ximian-System-Toplevel</Category>
<Category>X-Novell-System-Toplevel</Category>
</Or>
</Include>
<!-- More -->
<Menu>
<Name>More</Name>
<Directory>More.directory</Directory>
<Include>
<And>
<Category>System</Category>
<Not><Category>Settings</Category></Not>
</And>
</Include>
<OnlyUnallocated/>
</Menu>
</Menu> <!-- End System Tools -->
<!-- Games -->
<Menu>
<Name>Games</Name>
<Directory>Games.directory</Directory>
<Include>
<And>
<Or>
<Category>X-Ximian-Main</Category>
<Category>X-Novell-Main</Category>
</Or>
<Category>Application</Category>
<Category>Game</Category>
</And>
</Include>
<!-- More -->
<Menu>
<Name>More</Name>
<Directory>More.directory</Directory>
<Include>
<And>
<Category>Game</Category>
</And>
</Include>
<OnlyUnallocated/>
</Menu>
</Menu> <!-- End Games -->
<!-- Development Tools -->
<Menu>
<Name>Programming</Name>
<Directory>Development.directory</Directory>
<Include>
<And>
<Or>
<Category>X-Ximian-Main</Category>
<Category>X-Novell-Main</Category>
</Or>
<Category>Application</Category>
<Category>Development</Category>
</And>
</Include>
<!-- More -->
<Menu>
<Name>More</Name>
<Directory>More.directory</Directory>
<Include>
<And>
<Category>Development</Category>
</And>
<Filename>emacs.desktop</Filename>
</Include>
<OnlyUnallocated/>
</Menu>
</Menu> <!-- End Development Tools -->
<!-- Graphics -->
<Menu>
<Name>Graphics</Name>
<Directory>Graphics.directory</Directory>
<Include>
<And>
<Or>
<Category>X-Ximian-Main</Category>
<Category>X-Novell-Main</Category>
</Or>
<Category>Application</Category>
<Category>Graphics</Category>
</And>
</Include>
<!-- More -->
<Menu>
<Name>More</Name>
<Directory>More.directory</Directory>
<Include>
<And>
<Category>Graphics</Category>
</And>
</Include>
<OnlyUnallocated/>
</Menu>
</Menu> <!-- End Graphics -->
<!-- Internet -->
<Menu>
<Name>Internet</Name>
<Directory>Internet.directory</Directory>
<Include>
<And>
<Or>
<Category>X-Ximian-Main</Category>
<Category>X-Novell-Main</Category>
</Or>
<Category>Application</Category>
<Or>
<Category>Internet</Category>
<Category>Network</Category>
<Category>Email</Category>
</Or>
</And>
</Include>
<!-- More -->
<Menu>
<Name>More</Name>
<Directory>More.directory</Directory>
<Include>
<And>
<Category>Network</Category>
</And>
</Include>
<OnlyUnallocated/>
</Menu>
</Menu> <!-- End Internet -->
<!-- Multimedia -->
<Menu>
<Name>Multimedia</Name>
<Directory>Multimedia.directory</Directory>
<Include>
<And>
<Or>
<Category>X-Ximian-Main</Category>
<Category>X-Novell-Main</Category>
</Or>
<Category>Application</Category>
<Category>AudioVideo</Category>
</And>
</Include>
<Exclude>
<Filename>vumeter.desktop</Filename>
<Filename>reclevel.desktop</Filename>
</Exclude>
<!-- More -->
<Menu>
<Name>More</Name>
<Directory>More.directory</Directory>
<Include>
<And>
<Category>AudioVideo</Category>
</And>
</Include>
<OnlyUnallocated/>
</Menu>
</Menu> <!-- End Multimedia -->
<!-- Office -->
<Menu>
<Name>Office</Name>
<Directory>Office.directory</Directory>
<Include>
<And>
<Or>
<Category>X-Ximian-Main</Category>
<Category>X-Novell-Main</Category>
</Or>
<Category>Application</Category>
<Or>
<Category>Finance</Category>
<Category>Office</Category>
<Category>Spreadsheet</Category>
<Category>WordProcessor</Category>
<Category>ProjectManagement</Category>
</Or>
</And>
</Include>
<Include>
<Filename>sep.desktop</Filename>
</Include>
<!-- More -->
<Menu>
<Name>More</Name>
<Directory>More.directory</Directory>
<Include>
<And>
<Or>
<Category>Office</Category>
<Category>Education</Category>
</Or>
</And>
</Include>
<OnlyUnallocated/>
</Menu>
</Menu> <!-- End Office -->
</Menu> <!-- End Applications -->

19
gnome-desktop-ximian-menus.patch Normal file
View File

@ -0,0 +1,19 @@
diff -pruN -x '*~' gnome-menus-2.9.2-orig/desktop-directories/Development.directory.in gnome-menus-2.9.2/desktop-directories/Development.directory.in
--- gnome-menus-2.9.2-orig/desktop-directories/Development.directory.in Tue Nov 9 16:06:27 2004
+++ gnome-menus-2.9.2/desktop-directories/Development.directory.in Fri Dec 17 21:18:33 2004
@@ -1,5 +1,5 @@
[Desktop Entry]
-_Name=Programming
+_Name=Software Development
_Comment=Tools for software development
Icon=gnome-devel
Type=Directory
diff -pruN -x '*~' gnome-menus-2.9.2-orig/desktop-directories/Office.directory.in gnome-menus-2.9.2/desktop-directories/Office.directory.in
--- gnome-menus-2.9.2-orig/desktop-directories/Office.directory.in Tue Nov 9 16:06:27 2004
+++ gnome-menus-2.9.2/desktop-directories/Office.directory.in Fri Dec 17 21:20:36 2004
@@ -3,4 +3,5 @@ _Name=Office
_Comment=Office Applications
Icon=gnome-applications
Type=Directory
+SortOrder=drawing.desktop;presentation.desktop;spreadsheet.desktop;textdoc.desktop;sep.desktop;gnome-calculator.desktop;acroread.desktop;gnucash.desktop;ggv.desktop;mrpro\ject.desktop
Encoding=UTF-8

3
gnome-menus-2.16.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:72238f33406ada505fde8555ff93c00e7fec055a41500339b434c5445b09c87b
size 416053

580
gnome-menus-gnome-vfs.patch Normal file
View File

@ -0,0 +1,580 @@
Index: configure.in
================================================================================
--- configure.in
+++ configure.in
@@ -36,25 +36,11 @@
dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS")
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6.0)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-dnl check for FAM
-FAM_LIBS=
-AC_CHECK_LIB(fam, FAMOpen,
- [AC_CHECK_HEADERS(fam.h,
- [AC_DEFINE(HAVE_FAM, [], [Define if we have FAM])
- FAM_LIBS="-lfam"],
- AC_MSG_WARN(*** FAM support will not be built (header files not found) ***))],
- AC_MSG_WARN(*** FAM support will not be built (FAM library not found) ***))
-AC_SUBST(FAM_LIBS)
-
-dnl check for gamin extension
-gmenu_save_libs="$LIBS"
-LIBS="$LIBS $FAM_LIBS"
-AC_CHECK_FUNCS(FAMNoExists)
-LIBS="$gmenu_save_libs"
+PKG_CHECK_MODULES(LIBMENU,
+ glib-2.0 >= 2.5.6 \
+ gnome-vfs-2.0 >= 2.8.2)
+AC_SUBST(LIBMENU_CFLAGS)
+AC_SUBST(LIBMENU_LIBS)
GNOME_COMPILE_WARNINGS(yes)
@@ -63,11 +49,15 @@
[warn about deprecated usages [default=no]])],,
[enable_deprecations=no])
-DISABLE_DEPRECATED_CFLAGS=
if test "x$enable_deprecations" = "xyes"; then
- DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED"
+ DISABLE_DEPRECATED_CFLAGS="\
+-DG_DISABLE_DEPRECATED \
+-DGDK_DISABLE_DEPRECATED \
+-DGTK_DISABLE_DEPRECATED \
+-DGDK_PIXBUF_DISABLE_DEPRECATED \
+-DGNOME_DISABLE_DEPRECATED"
+ AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
fi
-AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
dnl --enable-debug=(yes|minimum|no)
AC_ARG_ENABLE(debug, [ --enable-debug=[no/yes] turn on debugging [default=no]],,enable_debug=yes)
--- libmenu/Makefile.am
+++ libmenu/Makefile.am
@@ -2,7 +2,7 @@
INCLUDES = \
-DGMENU_I_KNOW_THIS_IS_UNSTABLE \
- $(GLIB_CFLAGS) \
+ $(LIBMENU_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(DEBUG_CFLAGS) \
$(WARN_CFLAGS) \
@@ -21,8 +21,6 @@
gmenu-tree.h \
menu-layout.c \
menu-layout.h \
- menu-monitor.c \
- menu-monitor.h \
menu-monitor-backend.h \
menu-monitor-fam.c \
menu-util.c \
@@ -30,8 +28,7 @@
$(NULL)
libgnome_menu_la_LIBADD = \
- $(GLIB_LIBS) \
- $(FAM_LIBS) \
+ $(LIBMENU_LIBS) \
$(NULL)
libgnome_menu_la_LDFLAGS = \
-version-info $(LIB_MENU_LT_VERSION) \
@@ -52,3 +49,6 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgnome-menu.pc
+
+
+
--- libmenu/entry-directories.c
+++ libmenu/entry-directories.c
@@ -25,9 +25,9 @@
#include <errno.h>
#include <sys/types.h>
#include <dirent.h>
+#include <libgnomevfs/gnome-vfs.h>
#include "menu-util.h"
-#include "menu-monitor.h"
#include "canonicalize.h"
typedef struct CachedDir CachedDir;
@@ -58,13 +58,15 @@
GSList *entries;
GSList *subdirs;
- MenuMonitor *dir_monitor;
- GSList *monitors;
+ GnomeVFSMonitorHandle *monitor;
+ GSList *monitors;
guint have_read_entries : 1;
guint deleted : 1;
guint references : 28;
+
+ gboolean no_monitor_support;
};
struct CachedDirMonitor
@@ -78,11 +80,6 @@
static gboolean cached_dir_load_entries_recursive (CachedDir *dir,
const char *dirname);
-static void handle_cached_dir_changed (MenuMonitor *monitor,
- MenuMonitorEvent event,
- const char *path,
- CachedDir *dir);
-
/*
* Entry directory cache
*/
@@ -104,14 +101,9 @@
static void
cached_dir_free (CachedDir *dir)
{
- if (dir->dir_monitor)
- {
- menu_monitor_remove_notify (dir->dir_monitor,
- (MenuMonitorNotifyFunc) handle_cached_dir_changed,
- dir);
- menu_monitor_unref (dir->dir_monitor);
- dir->dir_monitor = NULL;
- }
+ if (dir->monitor)
+ gnome_vfs_monitor_cancel (dir->monitor);
+ dir->monitor = NULL;
g_slist_foreach (dir->monitors, (GFunc) g_free, NULL);
g_slist_free (dir->monitors);
@@ -399,20 +391,31 @@
}
static void
-handle_cached_dir_changed (MenuMonitor *monitor,
- MenuMonitorEvent event,
- const char *path,
- CachedDir *dir)
+handle_cached_dir_changed (GnomeVFSMonitorHandle *handle,
+ const char *monitor_uri,
+ const char *info_uri,
+ GnomeVFSMonitorEventType event,
+ CachedDir *dir)
{
gboolean handled = FALSE;
+ char *path;
char *basename;
char *dirname;
+ if (event != GNOME_VFS_MONITOR_EVENT_CREATED &&
+ event != GNOME_VFS_MONITOR_EVENT_DELETED &&
+ event != GNOME_VFS_MONITOR_EVENT_CHANGED)
+ return;
+
+ if (!(path = gnome_vfs_get_local_path_from_uri (info_uri)))
+ return;
+
menu_verbose ("'%s' notified of '%s' %s - invalidating cache\n",
dir->name,
path,
- event == MENU_MONITOR_EVENT_CREATED ? ("created") :
- event == MENU_MONITOR_EVENT_DELETED ? ("deleted") : ("changed"));
+ event == GNOME_VFS_MONITOR_EVENT_CREATED ? ("created") :
+ event == GNOME_VFS_MONITOR_EVENT_DELETED ? ("deleted") :
+ event == GNOME_VFS_MONITOR_EVENT_CHANGED ? ("changed") : ("unknown-event"));
dirname = g_path_get_dirname (path);
basename = g_path_get_basename (path);
@@ -424,12 +427,12 @@
{
switch (event)
{
- case MENU_MONITOR_EVENT_CREATED:
- case MENU_MONITOR_EVENT_CHANGED:
+ case GNOME_VFS_MONITOR_EVENT_CREATED:
+ case GNOME_VFS_MONITOR_EVENT_CHANGED:
handled = cached_dir_update_entry (dir, basename, path);
break;
- case MENU_MONITOR_EVENT_DELETED:
+ case GNOME_VFS_MONITOR_EVENT_DELETED:
handled = cached_dir_remove_entry (dir, basename);
break;
@@ -442,14 +445,14 @@
{
switch (event)
{
- case MENU_MONITOR_EVENT_CREATED:
+ case GNOME_VFS_MONITOR_EVENT_CREATED:
handled = cached_dir_add_subdir (dir, basename, path);
break;
- case MENU_MONITOR_EVENT_CHANGED:
+ case GNOME_VFS_MONITOR_EVENT_CHANGED:
break;
- case MENU_MONITOR_EVENT_DELETED:
+ case GNOME_VFS_MONITOR_EVENT_DELETED:
handled = cached_dir_remove_subdir (dir, basename);
break;
@@ -461,6 +464,7 @@
g_free (basename);
g_free (dirname);
+ g_free (path);
if (handled)
{
@@ -472,13 +476,23 @@
cached_dir_ensure_monitor (CachedDir *dir,
const char *dirname)
{
- if (dir->dir_monitor == NULL)
+ char *uri;
+
+ if (dir->monitor != NULL || dir->no_monitor_support)
+ return;
+
+ uri = gnome_vfs_get_uri_from_local_path (dirname);
+
+ if (gnome_vfs_monitor_add (&dir->monitor,
+ uri,
+ GNOME_VFS_MONITOR_DIRECTORY,
+ (GnomeVFSMonitorCallback) handle_cached_dir_changed,
+ dir) != GNOME_VFS_OK)
{
- dir->dir_monitor = menu_get_directory_monitor (dirname);
- menu_monitor_add_notify (dir->dir_monitor,
- (MenuMonitorNotifyFunc) handle_cached_dir_changed,
- dir);
+ dir->no_monitor_support = TRUE;
}
+
+ g_free (uri);
}
static gboolean
--- libmenu/gmenu-tree.c
+++ libmenu/gmenu-tree.c
@@ -23,9 +23,10 @@
#include <string.h>
#include <errno.h>
+#include <libgnomevfs/gnome-vfs.h>
+
#include "menu-layout.h"
-#include "menu-monitor.h"
#include "menu-util.h"
#include "canonicalize.h"
@@ -263,24 +264,19 @@
MENU_FILE_MONITOR_DIRECTORY
} MenuFileMonitorType;
-typedef struct
-{
- MenuFileMonitorType type;
- MenuMonitor *monitor;
-} MenuFileMonitor;
-
static void
-handle_nonexistent_menu_file_changed (MenuMonitor *monitor,
- MenuMonitorEvent event,
- const char *path,
- GMenuTree *tree)
+handle_nonexistent_menu_file_changed (GnomeVFSMonitorHandle *handle,
+ const char *monitor_uri,
+ const char *info_uri,
+ GnomeVFSMonitorEventType event,
+ GMenuTree *tree)
{
- if (event == MENU_MONITOR_EVENT_CHANGED ||
- event == MENU_MONITOR_EVENT_CREATED)
+ if (event == GNOME_VFS_MONITOR_EVENT_CHANGED ||
+ event == GNOME_VFS_MONITOR_EVENT_CREATED)
{
menu_verbose ("\"%s\" %s, marking tree for recanonicalization\n",
- path,
- event == MENU_MONITOR_EVENT_CREATED ? "created" : "changed");
+ info_uri,
+ event == GNOME_VFS_MONITOR_EVENT_CREATED ? "created" : "changed");
gmenu_tree_force_recanonicalize (tree);
gmenu_tree_invoke_monitors (tree);
@@ -288,33 +284,45 @@
}
static void
-handle_menu_file_changed (MenuMonitor *monitor,
- MenuMonitorEvent event,
- const char *path,
- GMenuTree *tree)
-{
+handle_menu_file_changed (GnomeVFSMonitorHandle *handle,
+ const char *monitor_uri,
+ const char *info_uri,
+ GnomeVFSMonitorEventType event,
+ GMenuTree *tree)
+{
+ if (event != GNOME_VFS_MONITOR_EVENT_DELETED &&
+ event != GNOME_VFS_MONITOR_EVENT_CHANGED &&
+ event != GNOME_VFS_MONITOR_EVENT_CREATED)
+ return;
+
menu_verbose ("\"%s\" %s, marking tree for recanicalization\n",
- path,
- event == MENU_MONITOR_EVENT_CREATED ? "created" :
- event == MENU_MONITOR_EVENT_CHANGED ? "changed" : "deleted");
+ info_uri,
+ event == GNOME_VFS_MONITOR_EVENT_CREATED ? "created" :
+ event == GNOME_VFS_MONITOR_EVENT_CHANGED ? "changed" : "deleted");
gmenu_tree_force_recanonicalize (tree);
gmenu_tree_invoke_monitors (tree);
}
static void
-handle_menu_file_directory_changed (MenuMonitor *monitor,
- MenuMonitorEvent event,
- const char *path,
- GMenuTree *tree)
-{
- if (!g_str_has_suffix (path, ".menu"))
+handle_menu_file_directory_changed (GnomeVFSMonitorHandle *handle,
+ const char *monitor_uri,
+ const char *info_uri,
+ GnomeVFSMonitorEventType event,
+ GMenuTree *tree)
+{
+ if (event != GNOME_VFS_MONITOR_EVENT_DELETED &&
+ event != GNOME_VFS_MONITOR_EVENT_CHANGED &&
+ event != GNOME_VFS_MONITOR_EVENT_CREATED)
+ return;
+
+ if (!g_str_has_suffix (info_uri, ".menu"))
return;
menu_verbose ("\"%s\" %s, marking tree for recanicalization\n",
- path,
- event == MENU_MONITOR_EVENT_CREATED ? "created" :
- event == MENU_MONITOR_EVENT_CHANGED ? "changed" : "deleted");
+ info_uri,
+ event == GNOME_VFS_MONITOR_EVENT_CREATED ? "created" :
+ event == GNOME_VFS_MONITOR_EVENT_CHANGED ? "changed" : "deleted");
gmenu_tree_force_recanonicalize (tree);
gmenu_tree_invoke_monitors (tree);
@@ -325,39 +333,44 @@
const char *path,
MenuFileMonitorType type)
{
- MenuFileMonitor *monitor;
+ GnomeVFSMonitorHandle *handle;
+ GnomeVFSResult result;
+ char *uri;
- monitor = g_new0 (MenuFileMonitor, 1);
+ uri = gnome_vfs_get_uri_from_local_path (path);
- monitor->type = type;
+ handle = NULL;
switch (type)
{
case MENU_FILE_MONITOR_FILE:
menu_verbose ("Adding a menu file monitor for \"%s\"\n", path);
- monitor->monitor = menu_get_file_monitor (path);
- menu_monitor_add_notify (monitor->monitor,
- (MenuMonitorNotifyFunc) handle_menu_file_changed,
- tree);
+ result = gnome_vfs_monitor_add (&handle,
+ uri,
+ GNOME_VFS_MONITOR_FILE,
+ (GnomeVFSMonitorCallback) handle_menu_file_changed,
+ tree);
break;
case MENU_FILE_MONITOR_NONEXISTENT_FILE:
menu_verbose ("Adding a menu file monitor for non-existent \"%s\"\n", path);
- monitor->monitor = menu_get_file_monitor (path);
- menu_monitor_add_notify (monitor->monitor,
- (MenuMonitorNotifyFunc) handle_nonexistent_menu_file_changed,
- tree);
+ result = gnome_vfs_monitor_add (&handle,
+ uri,
+ GNOME_VFS_MONITOR_FILE,
+ (GnomeVFSMonitorCallback) handle_nonexistent_menu_file_changed,
+ tree);
break;
case MENU_FILE_MONITOR_DIRECTORY:
menu_verbose ("Adding a menu directory monitor for \"%s\"\n", path);
- monitor->monitor = menu_get_directory_monitor (path);
- menu_monitor_add_notify (monitor->monitor,
- (MenuMonitorNotifyFunc) handle_menu_file_directory_changed,
- tree);
+ result = gnome_vfs_monitor_add (&handle,
+ uri,
+ GNOME_VFS_MONITOR_DIRECTORY,
+ (GnomeVFSMonitorCallback) handle_menu_file_directory_changed,
+ tree);
break;
default:
@@ -365,44 +378,18 @@
break;
}
- tree->menu_file_monitors = g_slist_prepend (tree->menu_file_monitors, monitor);
-}
-
-static void
-remove_menu_file_monitor (MenuFileMonitor *monitor,
- GMenuTree *tree)
-{
- switch (monitor->type)
+ if (result == GNOME_VFS_OK)
{
- case MENU_FILE_MONITOR_FILE:
- menu_monitor_remove_notify (monitor->monitor,
- (MenuMonitorNotifyFunc) handle_menu_file_changed,
- tree);
- break;
-
- case MENU_FILE_MONITOR_NONEXISTENT_FILE:
- menu_monitor_remove_notify (monitor->monitor,
- (MenuMonitorNotifyFunc) handle_nonexistent_menu_file_changed,
- tree);
- break;
-
- case MENU_FILE_MONITOR_DIRECTORY:
- menu_monitor_remove_notify (monitor->monitor,
- (MenuMonitorNotifyFunc) handle_menu_file_directory_changed,
- tree);
- break;
-
- default:
- g_assert_not_reached ();
- break;
+ tree->menu_file_monitors = g_slist_prepend (tree->menu_file_monitors, handle);
+ }
+ else
+ {
+ g_assert (handle == NULL);
+ menu_verbose ("Failed to add monitor for %s: %s\n",
+ path, gnome_vfs_result_to_string (result));
}
- menu_monitor_unref (monitor->monitor);
- monitor->monitor = NULL;
-
- monitor->type = MENU_FILE_MONITOR_INVALID;
-
- g_free (monitor);
+ g_free (uri);
}
static void
@@ -411,8 +398,8 @@
menu_verbose ("Removing all menu file monitors\n");
g_slist_foreach (tree->menu_file_monitors,
- (GFunc) remove_menu_file_monitor,
- tree);
+ (GFunc) gnome_vfs_monitor_cancel,
+ NULL);
g_slist_free (tree->menu_file_monitors);
tree->menu_file_monitors = NULL;
}
--- python/Makefile.am
+++ python/Makefile.am
@@ -5,7 +5,7 @@
-I$(srcdir)/../libmenu \
$(WARN_CFLAGS) \
$(NO_STRICT_ALIASING_CFLAGS) \
- $(GLIB_CFLAGS) \
+ $(LIBMENU_CFLAGS) \
$(PYTHON_INCLUDES) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(DEBUG_CFLAGS) \
@@ -15,5 +15,5 @@
gmenu_LTLIBRARIES = gmenu.la
gmenu_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initgmenu
-gmenu_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/libmenu/libgnome-menu.la
+gmenu_la_LIBADD = $(top_builddir)/libmenu/libgnome-menu.la
gmenu_la_SOURCES = gmenu.c
--- python/gmenu.c
+++ python/gmenu.c
@@ -21,6 +21,7 @@
#include <Python.h>
#include <gmenu-tree.h>
+#include <libgnomevfs/gnome-vfs-init.h>
typedef struct
{
@@ -1716,6 +1717,9 @@
if (!PyArg_ParseTuple (args, "s|i:gmenu.lookup_tree", &menu_file, &flags))
return NULL;
+ if (!gnome_vfs_initialized ())
+ gnome_vfs_init ();
+
if (!(tree = gmenu_tree_lookup (menu_file, flags)))
{
Py_INCREF (Py_None);
--- util/Makefile.am
+++ util/Makefile.am
@@ -4,7 +4,7 @@
-DGMENU_I_KNOW_THIS_IS_UNSTABLE \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-I$(srcdir)/../libmenu \
- $(GLIB_CFLAGS) \
+ $(LIBMENU_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(DEBUG_CFLAGS) \
$(WARN_CFLAGS) \
@@ -20,5 +20,5 @@
gnome_menu_spec_test_LDADD = \
../libmenu/libgnome-menu.la \
- $(GLIB_LIBS) \
+ $(LIBMENU_LIBS) \
$(NULL)
--- util/test-menu-spec.c
+++ util/test-menu-spec.c
@@ -23,6 +23,7 @@
#include <glib/gi18n.h>
#include <string.h>
+#include <libgnomevfs/gnome-vfs.h>
static char *menu_file = NULL;
static gboolean monitor = FALSE;
@@ -186,6 +187,8 @@
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
+ gnome_vfs_init ();
+
options_context = g_option_context_new (_("- test GNOME's implementation of the Desktop Menu Specification"));
g_option_context_add_main_entries (options_context, options, GETTEXT_PACKAGE);
g_option_context_parse (options_context, &argc, &argv, NULL);
@@ -231,5 +234,7 @@
gmenu_tree_unref (tree);
+ gnome_vfs_shutdown ();
+
return 0;
}

13
gnome-menus-preferences-no-merge.patch Normal file
View File

@ -0,0 +1,13 @@
diff -pruN gnome-menus-2.10.0-old/layout/preferences.menu gnome-menus-2.10.0/layout/preferences.menu
--- gnome-menus-2.10.0-old/layout/preferences.menu Tue Nov 9 16:06:30 2004
+++ gnome-menus-2.10.0/layout/preferences.menu Sat Mar 12 21:03:12 2005
@@ -9,9 +9,6 @@
<DefaultAppDirs/>
<DefaultDirectoryDirs/>
- <!-- Read in overrides and child menus from preferences-merged/ -->
- <DefaultMergeDirs/>
-
<!-- Stuff in the toplevel -->
<Include>
<And>

26
gnome-menus-preferences.patch Normal file
View File

@ -0,0 +1,26 @@
--- desktop-directories/Makefile.am
+++ desktop-directories/Makefile.am
@@ -20,6 +20,10 @@
Settings.directory.in \
System-Settings.directory.in \
System-Tools.directory.in \
+ Gnomecc-Hardware.directory.in \
+ Gnomecc-LookAndFeel.directory.in \
+ Gnomecc-Personal.directory.in \
+ Gnomecc-System.directory.in \
$(NULL)
directory_DATA = $(directory_in_files:.directory.in=.directory)
--- po/POTFILES.in
+++ po/POTFILES.in
@@ -17,6 +17,10 @@
desktop-directories/Settings.directory.in
desktop-directories/System-Settings.directory.in
desktop-directories/System-Tools.directory.in
+desktop-directories/Gnomecc-Hardware.directory.in
+desktop-directories/Gnomecc-LookAndFeel.directory.in
+desktop-directories/Gnomecc-Personal.directory.in
+desktop-directories/Gnomecc-System.directory.in
simple-editor/gmenu-simple-editor.desktop.in
simple-editor/gmenu-simple-editor.glade
simple-editor/GMenuSimpleEditor/maindialog.py

92
gnome-menus-x-suse-unimportant.patch Normal file
View File

@ -0,0 +1,92 @@
? gnome-menus-x-suse-unimportant.patch
? libmenu/menu-verbose
Index: libmenu/desktop-entries.c
===================================================================
RCS file: /cvs/gnome/gnome-menus/libmenu/desktop-entries.c,v
retrieving revision 1.7
diff -u -r1.7 desktop-entries.c
--- libmenu/desktop-entries.c 8 Mar 2005 18:01:11 -0000 1.7
+++ libmenu/desktop-entries.c 14 Mar 2005 00:15:29 -0000
@@ -33,7 +33,8 @@
DESKTOP_ENTRY_NO_DISPLAY = 1 << 0,
DESKTOP_ENTRY_HIDDEN = 1 << 1,
DESKTOP_ENTRY_SHOW_IN_GNOME = 1 << 2,
- DESKTOP_ENTRY_TRYEXEC_FAILED = 1 << 3
+ DESKTOP_ENTRY_TRYEXEC_FAILED = 1 << 3,
+ DESKTOP_ENTRY_UNIMPORTANT = 1 << 4
};
struct DesktopEntry
@@ -49,7 +50,7 @@
char *exec;
guint type : 2;
- guint flags : 4;
+ guint flags : 5;
guint refcount : 24;
};
@@ -74,6 +75,7 @@
gboolean hidden;
gboolean show_in_gnome;
gboolean tryexec_failed;
+ gboolean unimportant;
char *tryexec;
guint flags;
int i;
@@ -156,6 +158,17 @@
g_free (tryexec);
}
+ error = NULL;
+ unimportant = g_key_file_get_boolean (key_file,
+ desktop_entry_group,
+ "X-SuSE-Unimportant",
+ &error);
+ if (error)
+ {
+ unimportant = FALSE;
+ g_error_free (error);
+ }
+
flags = 0;
if (no_display)
flags |= DESKTOP_ENTRY_NO_DISPLAY;
@@ -165,6 +178,8 @@
flags |= DESKTOP_ENTRY_SHOW_IN_GNOME;
if (tryexec_failed)
flags |= DESKTOP_ENTRY_TRYEXEC_FAILED;
+ if (unimportant)
+ flags |= DESKTOP_ENTRY_UNIMPORTANT;
return flags;
}
@@ -282,7 +297,7 @@
#undef GET_LOCALE_STRING
- menu_verbose ("Desktop entry \"%s\" (%s, %s, %s) flags: NoDisplay=%s, Hidden=%s, ShowInGNOME=%s, TryExecFailed=%s\n",
+ menu_verbose ("Desktop entry \"%s\" (%s, %s, %s) flags: NoDisplay=%s, Hidden=%s, ShowInGNOME=%s, TryExecFailed=%s, Unimportant=%s\n",
retval->basename,
retval->name,
retval->comment ? retval->comment : "(null)",
@@ -290,7 +305,8 @@
retval->flags & DESKTOP_ENTRY_NO_DISPLAY ? "(true)" : "(false)",
retval->flags & DESKTOP_ENTRY_HIDDEN ? "(true)" : "(false)",
retval->flags & DESKTOP_ENTRY_SHOW_IN_GNOME ? "(true)" : "(false)",
- retval->flags & DESKTOP_ENTRY_TRYEXEC_FAILED ? "(true)" : "(false)");
+ retval->flags & DESKTOP_ENTRY_TRYEXEC_FAILED ? "(true)" : "(false)",
+ retval->flags & DESKTOP_ENTRY_UNIMPORTANT ? "(true)" : "(false)");
out:
g_key_file_free (key_file);
@@ -494,7 +510,8 @@
gboolean
desktop_entry_get_no_display (DesktopEntry *entry)
{
- return (entry->flags & DESKTOP_ENTRY_NO_DISPLAY) != 0;
+ return ((entry->flags & DESKTOP_ENTRY_NO_DISPLAY) != 0) ||
+ ((entry->flags & DESKTOP_ENTRY_UNIMPORTANT) != 0);
}
gboolean

226
gnome-menus.changes Normal file
View File

@ -0,0 +1,226 @@
-------------------------------------------------------------------
Tue Jan 9 17:03:04 CET 2007 - sbrabec@suse.cz
- More spec file cleanups.
-------------------------------------------------------------------
Wed Dec 13 16:30:08 CST 2006 - maw@suse.de
- Move to /usr
- Do some spec cleanup.
-------------------------------------------------------------------
Tue Nov 21 16:20:50 CET 2006 - sbrabec@suse.cz
- Do not explicitly require mDNSResponder-lib blocking avahi compat
package.
-------------------------------------------------------------------
Fri Oct 13 15:36:58 CEST 2006 - danw@suse.de
- Remove dead patches
-------------------------------------------------------------------
Mon Oct 2 22:52:48 CEST 2006 - jhargadon@suse.de
- update to version 2.16.1
- updated translations
-------------------------------------------------------------------
Tue Sep 26 00:13:55 CEST 2006 - jhargadon@suse.de
- added %py_requires to the specfile for bug #207922
-------------------------------------------------------------------
Thu Sep 14 01:08:45 CEST 2006 - jhargadon@suse.de
- update to version 2.16.0
- updated translations
-------------------------------------------------------------------
Mon Aug 21 23:18:40 CEST 2006 - jhargadon@suse.de
- update to version 2.15.91
- update translations
-------------------------------------------------------------------
Wed Aug 2 00:34:22 CEST 2006 - gekker@suse.de
- Update to version 2.15.90
* Correctly update LT_VERSION (Vincent)
* Add new API to know if an application should be launched in a
terminal and to know the path to the desktop file (Travis Watkins)
* Complete python bindings for the "No Display" flag (Travis Watkins)
* Allow specifying alternate menu files as command line arguments
* Start inotify support
* Add "include NoDisplay" flag (Mark McLoughlin)
* Fix issue where menu wouldn't fully reload after lots of
file change events (Mark McLoughlin, Frederic Crozat)
* Remove some unused code (Kjartan Maraas)
* Fix incorrect escaping of C format string (The Written Word)
* Update translations
-------------------------------------------------------------------
Tue May 2 15:53:33 CEST 2006 - sbrabec@suse.cz
- Moved system language settings from Personal to System (#171526).
-------------------------------------------------------------------
Wed Apr 19 19:13:54 CEST 2006 - sreeves@suse.de
- Fix for 152999 - Add "yast2 lan" to CC
Fix for 152681 - Add "yast2 modem" and "yast2 dsl" to CC
-------------------------------------------------------------------
Wed Mar 29 01:56:37 CEST 2006 - sreeves@suse.de
- Look for new X-SuSE-ControlCenter-* category in preferences.menu
-------------------------------------------------------------------
Tue Feb 21 18:00:41 CET 2006 - sbrabec@suse.cz
- Added infrastructure to allow translation of control center
labels (144946#c12).
-------------------------------------------------------------------
Sun Feb 5 15:01:19 CET 2006 - aj@suse.de
- Cleanup Requires.
-------------------------------------------------------------------
Wed Jan 25 21:31:46 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Sat Dec 17 01:48:01 CET 2005 - sreeves@suse.de
- Add additional yast items into control-center as per the spec
-------------------------------------------------------------------
Mon Sep 26 22:12:37 CEST 2005 - mls@suse.de
- make devel package require base package
-------------------------------------------------------------------
Fri Sep 9 21:29:11 CEST 2005 - jpr@suse.de
- Revert patch for #113531
-------------------------------------------------------------------
Tue Sep 6 12:10:37 CEST 2005 - sbrabec@suse.cz
- Updated to version 2.12.0.
-------------------------------------------------------------------
Wed Aug 31 20:55:43 CEST 2005 - clahey@suse.de
- Switch from fam to gnome-vfs. Thanks cutch. Fixes bug #112846.
-------------------------------------------------------------------
Wed Aug 31 18:15:46 CEST 2005 - clahey@suse.de
- Patch from Meeks. Fixes bug #113531
-------------------------------------------------------------------
Tue Aug 23 18:03:35 CEST 2005 - gekker@suse.de
- Update to version 2.11.92
- Remove upstreamed patch
-------------------------------------------------------------------
Thu Aug 18 23:52:31 CEST 2005 - clahey@suse.de
- Add patch to get rid of Applications->Applications.
-------------------------------------------------------------------
Tue Aug 16 15:55:49 CEST 2005 - sbrabec@suse.cz
- Do not require kdebase3.
-------------------------------------------------------------------
Tue Aug 2 19:09:59 CEST 2005 - gekker@suse.de
- Update to 2.11.90
-------------------------------------------------------------------
Fri Jun 17 18:12:03 CEST 2005 - gekker@suse.de
- Update to 2.11.1.1
-------------------------------------------------------------------
Mon Mar 14 01:23:10 CET 2005 - clahey@suse.de
- Add hack to hide menus items with X-SuSE-Unimportant.
-------------------------------------------------------------------
Sat Mar 12 21:16:39 CET 2005 - clahey@suse.de
- Don't merge in default merge dirs in preferences.gnome.menu.
Fixes 72148.
-------------------------------------------------------------------
Wed Mar 9 23:40:48 CET 2005 - clahey@suse.de
- Replace the first section of Desktop menu with gnomecc and YaST.
-------------------------------------------------------------------
Wed Mar 9 20:41:17 CET 2005 - gekker@suse.de
- Update to version 2.10.0 (GNOME 2.10).
-------------------------------------------------------------------
Tue Mar 8 20:51:24 CET 2005 - clahey@suse.de
- Replaced individual patches with a backport of the fixes in
gnome-menus 2.10.1.
-------------------------------------------------------------------
Fri Mar 4 20:07:23 CET 2005 - clahey@suse.de
- Add patches from gnome cvs for gnome bugs 168444 and 168445.
-------------------------------------------------------------------
Thu Mar 3 19:12:50 CET 2005 - gekker@suse.de
- Update to version 2.9.92
- Remove upstreamed patch
-------------------------------------------------------------------
Thu Feb 24 23:51:17 CET 2005 - clahey@suse.de
- Include the gnome preferences hidden in our preferences so that
they won't appear in OnlyUnallocated <All/>.
-------------------------------------------------------------------
Mon Feb 21 17:36:29 CET 2005 - gekker@suse.de
- Add patch for menus showing up twice in some cases (167758 b.g.o)
-------------------------------------------------------------------
Wed Feb 16 22:31:09 CET 2005 - gekker@suse.de
- Fix control-center2 to show it's capplets (50904).
-------------------------------------------------------------------
Sun Feb 6 01:01:18 CET 2005 - gekker@suse.de
- Update to version 2.9.90
-------------------------------------------------------------------
Fri Feb 4 00:21:00 CET 2005 - clahey@suse.de
- Updated preferences.menu to be more correct.
-------------------------------------------------------------------
Mon Jan 24 10:00:48 CET 2005 - clahey@suse.de
- Added applications.menu.
-------------------------------------------------------------------
Fri Jan 21 16:14:42 CET 2005 - gekker@suse.de
- Adding package gnome-menus to distro
- Initial version 2.9.4

267
gnome-menus.spec Normal file
View File

@ -0,0 +1,267 @@
#
# spec file for package gnome-menus (Version 2.16.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: gnome-menus
BuildRequires: gnome-common gnome-patch-translation gnome-vfs2-devel intltool perl-XML-Parser python-devel python-gtk
License: GNU Free Documentation License, Version 1.1 (GFDL), GNU General Public License (GPL)
Group: System/GUI/GNOME
Autoreqprov: on
Obsoletes: gnome-core
Version: 2.16.1
Release: 37
Summary: The GNOME Desktop Menu
Source: %{name}-%{version}.tar.bz2
Source1: preferences.menu
Source2: applications.menu
Source3: Hidden.directory
Source4: settings.menu
Source5: Gnomecc-Hardware.directory.in
Source6: Gnomecc-LookAndFeel.directory.in
Source7: Gnomecc-Personal.directory.in
Source8: Gnomecc-System.directory.in
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch: gnome-desktop-ximian-menus.patch
Patch2: gnome-menus-preferences-no-merge.patch
Patch3: gnome-menus-x-suse-unimportant.patch
Patch6: gnome-menus-gnome-vfs.patch
Patch7: gnome-menus-preferences.patch
%py_requires
%description
This package is free software and is part of the GNOME project.
The package contains an implementation of the draft "Desktop Menu
Specification" from freedesktop.org:
http://www.freedesktop.org/Standards/menu-spec
Also contained here are the GNOME menu layout configuration files,
.directory files, and assorted menu-related utility programs.
Authors:
--------
Havoc Pennington <hp@redhat.com>
Mark McLoughlin <mark@skynet.ie>
%package devel
Summary: The GNOME Desktop Menu
Group: System/GUI/GNOME
Requires: %{name} = %{version} glib2-devel gnome-vfs2-devel
%description devel
This package is free software and is part of the GNOME project.
The package contains an implementation of the draft "Desktop Menu
Specification" from freedesktop.org:
http://www.freedesktop.org/Standards/menu-spec
Also contained here are the GNOME menu layout configuration files,
.directory files, and assorted menu-related utility programs.
Authors:
--------
Havoc Pennington <hp@redhat.com>
Mark McLoughlin <mark@skynet.ie>
%prep
%setup -q
gnome-patch-translation-prepare
%patch -p1
%patch2 -p1
%patch3
%patch6
# Icons for these desktop directories are part of control-center2.
# Never mind, because these directory files are used only by
# gnome-control-center.
cp -a %{S:5} %{S:6} %{S:7} %{S:8} desktop-directories/
%patch7
gnome-patch-translation-update
%build
autoreconf -f -i
%configure
# ./configure \
# --prefix=%prefix \
# --libdir=%{_libdir} \
# --sysconfdir=%sysconfdir \
# --mandir=%{_mandir} \
# --localstatedir=/var/lib \
# --with-kde-datadir=/opt/kde3 \
# --with-gnome-distributor="SUSE" \
# --enable-platform-gnome2
make %{?jobs:-j%jobs}
%install
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
#for xml in $RPM_BUILD_ROOT%{_datadir}/gnome/help/*/*/*.xml; do
# if echo $xml | egrep 'share/gnome/help/([^/]*)/[^/]*/\1\.xml$' > /dev/null; then
# meinproc --check --cache `echo $xml | sed 's/xml$/cache.bz2/'` $xml || :
# fi
#done
# mv $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/preferences.menu $RPM_BUILD_ROOT%{sysconfdir}/xdg/menus/preferences-gnome.menu
cp %{S:1} $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/
rm $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/applications.menu
cp %{S:2} $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/applications.menu.gnome
cp %{S:3} $RPM_BUILD_ROOT/%{_datadir}/desktop-directories/
cp %{S:4} $RPM_BUILD_ROOT/%{_sysconfdir}/xdg/menus/
#for dir in %{_libdir}/python%py_ver/site-packages ; do
# find $RPM_BUILD_ROOT/$dir \( -name '*.py[co]' -o -name '*.la' \) -print0 | xargs -0 rm
# python %_libdir/python%py_ver/compileall.py -d $dir $RPM_BUILD_ROOT/$dir
# mkdir -p $RPM_BUILD_ROOT/%py_sitedir
# #mv $RPM_BUILD_ROOT/$dir/* $RPM_BUILD_ROOT/%py_sitedir/
#done
rm $RPM_BUILD_ROOT%{py_sitedir}/*.*a
%clean
rm -rf $RPM_BUILD_ROOT
%post
%run_ldconfig
%postun
%run_ldconfig
%files -f %files -f %{name}.lang
%defattr (-, root, root)
%doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README
%{_bindir}/*
%{_datadir}/applications/gmenu-simple-editor.desktop
%dir %{_datadir}/desktop-directories
%{_datadir}/desktop-directories/*.directory
%{_datadir}/gnome-menus
%{_libdir}/*.so.*
%dir %{_sysconfdir}/xdg/menus
%{_sysconfdir}/xdg/menus/*
%{py_sitedir}/GMenuSimpleEditor
%{py_sitedir}/gmenu.so
%files devel
%defattr (-, root, root)
%{_includedir}/gnome-menus
%{_libdir}/*.so
%{_libdir}/*.*a
%{_libdir}/pkgconfig/*.pc
%changelog -n gnome-menus
* Tue Jan 09 2007 - sbrabec@suse.cz
- More spec file cleanups.
* Wed Dec 13 2006 - maw@suse.de
- Move to /usr
- Do some spec cleanup.
* Tue Nov 21 2006 - sbrabec@suse.cz
- Do not explicitly require mDNSResponder-lib blocking avahi compat
package.
* Fri Oct 13 2006 - danw@suse.de
- Remove dead patches
* Mon Oct 02 2006 - jhargadon@suse.de
- update to version 2.16.1
- updated translations
* Tue Sep 26 2006 - jhargadon@suse.de
- added %%py_requires to the specfile for bug #207922
* Thu Sep 14 2006 - jhargadon@suse.de
- update to version 2.16.0
- updated translations
* Mon Aug 21 2006 - jhargadon@suse.de
- update to version 2.15.91
- update translations
* Wed Aug 02 2006 - gekker@suse.de
- Update to version 2.15.90
* Correctly update LT_VERSION (Vincent)
* Add new API to know if an application should be launched in a
terminal and to know the path to the desktop file (Travis Watkins)
* Complete python bindings for the "No Display" flag (Travis Watkins)
* Allow specifying alternate menu files as command line arguments
* Start inotify support
* Add "include NoDisplay" flag (Mark McLoughlin)
* Fix issue where menu wouldn't fully reload after lots of
file change events (Mark McLoughlin, Frederic Crozat)
* Remove some unused code (Kjartan Maraas)
* Fix incorrect escaping of C format string (The Written Word)
* Update translations
* Tue May 02 2006 - sbrabec@suse.cz
- Moved system language settings from Personal to System (#171526).
* Wed Apr 19 2006 - sreeves@suse.de
- Fix for 152999 - Add "yast2 lan" to CC
Fix for 152681 - Add "yast2 modem" and "yast2 dsl" to CC
* Wed Mar 29 2006 - sreeves@suse.de
- Look for new X-SuSE-ControlCenter-* category in preferences.menu
* Tue Feb 21 2006 - sbrabec@suse.cz
- Added infrastructure to allow translation of control center
labels (144946#c12).
* Sun Feb 05 2006 - aj@suse.de
- Cleanup Requires.
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Sat Dec 17 2005 - sreeves@suse.de
- Add additional yast items into control-center as per the spec
* Mon Sep 26 2005 - mls@suse.de
- make devel package require base package
* Fri Sep 09 2005 - jpr@suse.de
- Revert patch for #113531
* Tue Sep 06 2005 - sbrabec@suse.cz
- Updated to version 2.12.0.
* Wed Aug 31 2005 - clahey@suse.de
- Switch from fam to gnome-vfs. Thanks cutch. Fixes bug #112846.
* Wed Aug 31 2005 - clahey@suse.de
- Patch from Meeks. Fixes bug #113531
* Tue Aug 23 2005 - gekker@suse.de
- Update to version 2.11.92
- Remove upstreamed patch
* Thu Aug 18 2005 - clahey@suse.de
- Add patch to get rid of Applications->Applications.
* Tue Aug 16 2005 - sbrabec@suse.cz
- Do not require kdebase3.
* Tue Aug 02 2005 - gekker@suse.de
- Update to 2.11.90
* Fri Jun 17 2005 - gekker@suse.de
- Update to 2.11.1.1
* Mon Mar 14 2005 - clahey@suse.de
- Add hack to hide menus items with X-SuSE-Unimportant.
* Sat Mar 12 2005 - clahey@suse.de
- Don't merge in default merge dirs in preferences.gnome.menu.
Fixes 72148.
* Wed Mar 09 2005 - clahey@suse.de
- Replace the first section of Desktop menu with gnomecc and YaST.
* Wed Mar 09 2005 - gekker@suse.de
- Update to version 2.10.0 (GNOME 2.10).
* Tue Mar 08 2005 - clahey@suse.de
- Replaced individual patches with a backport of the fixes in
gnome-menus 2.10.1.
* Fri Mar 04 2005 - clahey@suse.de
- Add patches from gnome cvs for gnome bugs 168444 and 168445.
* Thu Mar 03 2005 - gekker@suse.de
- Update to version 2.9.92
- Remove upstreamed patch
* Thu Feb 24 2005 - clahey@suse.de
- Include the gnome preferences hidden in our preferences so that
they won't appear in OnlyUnallocated <All/>.
* Mon Feb 21 2005 - gekker@suse.de
- Add patch for menus showing up twice in some cases (167758 b.g.o)
* Wed Feb 16 2005 - gekker@suse.de
- Fix control-center2 to show it's capplets (50904).
* Sun Feb 06 2005 - gekker@suse.de
- Update to version 2.9.90
* Fri Feb 04 2005 - clahey@suse.de
- Updated preferences.menu to be more correct.
* Mon Jan 24 2005 - clahey@suse.de
- Added applications.menu.
* Fri Jan 21 2005 - gekker@suse.de
- Adding package gnome-menus to distro
- Initial version 2.9.4

99
preferences.menu Normal file
View File

@ -0,0 +1,99 @@
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
<Menu>
<Name>Preferences</Name>
<Directory>Settings.directory</Directory>
<!-- Read standard .directory and .desktop file locations -->
<DefaultAppDirs/>
<DefaultDirectoryDirs/>
<!-- Settings -->
<Include>
<And>
<Category>X-Ximian-Settings</Category>
<Not>
<Or>
<Category>AdvancedSettings</Category>
<Category>System</Category>
<Category>Appearance</Category>
<Category>Behavior</Category>
<Category>Hardware</Category>
<Category>Personal</Category>
<Category>Merged</Category>
<Category>AdvancedSettings</Category>
</Or>
</Not>
</And>
</Include>
<Menu>
<Name>Personal</Name>
<Directory>Gnomecc-Personal.directory</Directory>
<Include>
<Category>X-SuSE-ControlCenter-Personal</Category>
<And>
<Category>X-Ximian-Settings</Category>
<Category>Personal</Category>
</And>
</Include>
</Menu>
<Menu>
<Name>Look and Feel</Name>
<Directory>Gnomecc-LookAndFeel.directory</Directory>
<Include>
<Category>X-SuSE-ControlCenter-LookAndFeel</Category>
<And>
<Category>X-Ximian-Settings</Category>
<Or>
<Category>Behavior</Category>
<Category>Appearance</Category>
</Or>
</And>
</Include>
</Menu>
<Menu>
<Name>Hardware</Name>
<Directory>Gnomecc-Hardware.directory</Directory>
<Include>
<Category>X-SuSE-ControlCenter-Hardware</Category>
<And>
<Category>X-Ximian-Settings</Category>
<Category>Hardware</Category>
</And>
<Filename>YaST2-bluetooth.desktop</Filename>
<Filename>YaST2-x11.desktop</Filename>
<Filename>YaST2-scanner.desktop</Filename>
<Filename>YaST2-lan.desktop</Filename>
<Filename>YaST2-modem.desktop</Filename>
<Filename>YaST2-dsl.desktop</Filename>
</Include>
</Menu>
<Menu>
<Name>System</Name>
<Directory>Gnomecc-System.directory</Directory>
<Include>
<Category>X-SuSE-ControlCenter-System</Category>
<And>
<Category>X-Ximian-Settings</Category>
<Or>
<Category>Merged</Category>
<Category>AdvancedSettings</Category>
<Category>System</Category>
</Or>
</And>
<Filename>YaST2-yast-language.desktop</Filename>
<Filename>YaST2-timezone.desktop</Filename>
<Filename>YaST2-users.desktop</Filename>
</Include>
</Menu>
<Menu>
<Name>Hidden</Name>
<MergeFile>preferences-gnome.menu</MergeFile>
<Directory>Hidden.directory</Directory>
</Menu>
</Menu>

0
ready Normal file
View File

17
settings.menu Normal file
View File

@ -0,0 +1,17 @@
<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
"http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
<Menu>
<Name>Settings</Name>
<Directory>Settings.directory</Directory>
<!-- Read standard .directory and .desktop file locations -->
<DefaultAppDirs/>
<DefaultDirectoryDirs/>
<Include>
<Filename>YaST.desktop</Filename>
<Filename>gnomecc.desktop</Filename>
</Include>
</Menu> <!-- End Applications -->