commit 1e9c59e88f8663a6a69680319a41cfa9fdc42fdb
Author: Elan Ruusamäe <[email protected]>
Date: Sun Feb 24 20:27:51 2013 +0200
0.9.17 from git, builds against MATE
glib.patch | 11 +++++
gnome-main-menu.spec | 128 ++++++++++++++++++---------------------------------
2 files changed, 56 insertions(+), 83 deletions(-)
---
diff --git a/gnome-main-menu.spec b/gnome-main-menu.spec
index 5649e06..802c83f 100644
--- a/gnome-main-menu.spec
+++ b/gnome-main-menu.spec
@@ -1,12 +1,16 @@
Summary: The GNOME Desktop Menu
Summary(pl.UTF-8): Menu dla środowiska GNOME
Name: gnome-main-menu
-Version: 0.9.16
+Version: 0.9.17
Release: 0.1
License: GPL
Group: X11/Applications
-Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-main-menu/0.9/%{name}-%{version}.tar.bz2
-# Source0-md5: c52c95536dadd64d08d566f8aafc2da2
+# git clone git://git.gnome.org/gnome-main-menu
+# tar caf gnome-main-menu.tar.bz2 gnome-main-menu --exclude-vcs
+#Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-main-menu/0.9/%{name}-%{version}.tar.bz2
+Source0: %{name}.tar.bz2
+# Source0-md5: a044b1d201740ff5cb22452beb26fb05
+Patch0: glib.patch
URL: http://en.opensuse.org/GNOME_Main_Menu
BuildRequires: NetworkManager-devel
BuildRequires: autoconf
@@ -14,34 +18,35 @@ BuildRequires: automake
BuildRequires: avahi-devel
BuildRequires: fam-devel
BuildRequires: gettext-devel
-BuildRequires: gnome-common
-BuildRequires: gnome-desktop-devel
-BuildRequires: gnome-menus-devel
-BuildRequires: gnome-panel-devel
+BuildRequires: glib2-devel >= 1:2.16.0
+#BuildRequires: gnome-common
+#BuildRequires: gnome-menus-devel
BuildRequires: gnutls-devel
-BuildRequires: hal-devel
+BuildRequires: gtk+2-devel >= 2:2.18
+#BuildRequires: hal-devel
BuildRequires: intltool
-BuildRequires: libgnomeprintui-devel
BuildRequires: libgtop-devel
BuildRequires: libidn-devel
BuildRequires: libiw-devel
BuildRequires: librsvg-devel
BuildRequires: libtool
+BuildRequires: libunique-devel
BuildRequires: libwnck2-devel
+BuildRequires: mate-control-center-devel
+BuildRequires: mate-control-center-devel >= 1.5.2
+BuildRequires: mate-desktop-devel
BuildRequires: perl-XML-Parser
BuildRequires: python-devel
BuildRequires: python-pygtk-gtk
BuildRequires: scrollkeeper
-Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): scrollkeeper
-Requires(post,preun): GConf2
-Requires: dbus-glib
-Requires: gnome-panel
-Requires: gnome-system-monitor
-Requires: gnome-terminal
-Requires: hal
-Requires: tango-icon-theme
-Requires: wireless-tools
+#Requires: dbus-glib
+Requires: glib2 >= 1:2.26.0
+#Requires: gnome-panel
+#Requires: gnome-system-monitor
+#Requires: gnome-terminal
+#Requires: hal
+#Requires: tango-icon-theme
+#Requires: wireless-tools
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -55,29 +60,9 @@ itself.
%description -l pl.UTF-8
Menu i przeglądarka aplikacji dla środowiska GNOME.
-%package devel
-Summary: Header files for GNOME Desktop Menu library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki menu środowiska GNOME
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel
-Requires: gnome-desktop-devel
-Requires: gnome-menus-devel
-Requires: gtk+2-devel
-Requires: libbonoboui-devel
-Requires: libglade2-devel
-Requires: libgnomeui-devel
-Requires: librsvg-devel
-Requires: pango-devel
-
-%description devel
-Header files for GNOME Desktop Menu library.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki menu środowiska GNOME.
-
%prep
-%setup -q
+%setup -q -n %{name}
+%patch0 -p1
%build
%{__intltoolize}
@@ -91,15 +76,12 @@ Pliki nagłówkowe biblioteki menu środowiska GNOME.
%install
rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-install -d $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
-install application-browser/etc/application-browser.desktop
$RPM_BUILD_ROOT%{_datadir}/gnome/autostart/
-sed -i "/^Exec=/ s/application-browser *$/application-browser -h/"
$RPM_BUILD_ROOT%{_datadir}/gnome/autostart/application-browser.desktop
-rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/en_IGID
+#install -d $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
+#install application-browser%{_sysconfdir}/application-browser.desktop
$RPM_BUILD_ROOT%{_datadir}/gnome/autostart/
+#sed -i "/^Exec=/ s/application-browser *$/application-browser -h/"
$RPM_BUILD_ROOT%{_datadir}/gnome/autostart/application-browser.desktop
%find_lang %{name} --with-gnome --all-name
@@ -107,46 +89,26 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/en_IGID
rm -rf $RPM_BUILD_ROOT
%post
-%gconf_schema_install slab.schemas
-%gconf_schema_install control-center.schemas
-%gconf_schema_install application-browser.schemas
-%scrollkeeper_update_post
-/sbin/ldconfig
-
-%preun
-%gconf_schema_uninstall slab.schemas
-%gconf_schema_uninstall control-center.schemas
-%gconf_schema_uninstall application-browser.schemas
+%glib_compile_schemas
%postun
-%scrollkeeper_update_postun
-/sbin/ldconfig
+%glib_compile_schemas
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog NEWS README
-%{_sysconfdir}/gconf/schemas/slab.schemas
-%{_sysconfdir}/gconf/schemas/control-center.schemas
-%{_sysconfdir}/gconf/schemas/application-browser.schemas
+%doc AUTHORS ChangeLog NEWS README
%attr(755,root,root) %{_bindir}/application-browser
-%attr(755,root,root) %{_bindir}/control-center
-%attr(755,root,root) %{_libexecdir}/main-menu
-%attr(755,root,root) %{_libdir}/*.so.*.*.*
-%{_libdir}/bonobo/servers/GNOME_MainMenu.server
+%attr(755,root,root) %{_bindir}/trigger-panel-run-dialog
+%attr(755,root,root) %{_libdir}/main-menu
%{_desktopdir}/application-browser.desktop
-%{_desktopdir}/control-center.desktop
-%{_desktopdir}/gnome-screensaver-lock.desktop
-%{_desktopdir}/gnome-session-kill.desktop
-%{_datadir}/gnome-main-menu
-%{_datadir}/gnome-2.0/ui/GNOME_MainMenu_ContextMenu.xml
-%{_datadir}/gnome/autostart/application-browser.desktop
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
-%{_includedir}/slab
-%{_pkgconfigdir}/*.pc
-
-# static? (if exists)
-#%{_libdir}/*.a
+%{_desktopdir}/mate-screensaver-lock.desktop
+%{_desktopdir}/mate-session-logout.desktop
+%{_desktopdir}/mate-session-shutdown.desktop
+%{_desktopdir}/trigger-panel-run-dialog.desktop
+%{_datadir}/%{name}
+%{_datadir}/dbus-1/services/org.mate.panel.applet.GNOMEMainMenuFactory.service
+%{_datadir}/glib-2.0/schemas/org.mate.gnome-main-menu.application-browser.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.mate.gnome-main-menu.gschema.xml
+%{_datadir}/mate-control-center/*.xbel
+%{_datadir}/mate-control-center/empty.*
+%{_datadir}/mate-panel/applets/org.mate.GNOMEMainMenu.mate-panel-applet
diff --git a/glib.patch b/glib.patch
new file mode 100644
index 0000000..587cbd0
--- /dev/null
+++ b/glib.patch
@@ -0,0 +1,11 @@
+--- gnome-main-menu/main-menu/src/tomboykeybinder.h~ 2013-02-24
19:58:30.000000000 +0200
++++ gnome-main-menu/main-menu/src/tomboykeybinder.h 2013-02-24
20:18:02.717290894 +0200
+@@ -21,7 +21,7 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+
+-#include <glib/gtypes.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-main-menu.git/commitdiff/1e9c59e88f8663a6a69680319a41cfa9fdc42fdb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
