[packages/gnome-main-menu] - cleanup, revised dependencies, added caja extension

qboosh qboosh at pld-linux.org
Sat Jul 12 13:47:06 CEST 2014


commit e6d741bde80f66ae2f4ed9deb6229c3569900413
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 12 13:51:55 2014 +0200

    - cleanup, revised dependencies, added caja extension

 gnome-main-menu.spec | 106 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 76 insertions(+), 30 deletions(-)
---
diff --git a/gnome-main-menu.spec b/gnome-main-menu.spec
index f578c59..b47ff9e 100644
--- a/gnome-main-menu.spec
+++ b/gnome-main-menu.spec
@@ -1,8 +1,12 @@
 # TODO
 # - lock screen fails (but mate own lock screen launches xscreensaver okay)
 #   ** (main-menu:9293): WARNING **: error launching file:///usr/share/applications/mate-screensaver-lock.desktop [Fai
-Summary:	The GNOME Desktop Menu
-Summary(pl.UTF-8):	Menu dla środowiska GNOME
+#
+# Conditional build:
+%bcond_without	caja	# Caja (MATE file manager) extension
+#
+Summary:	The GNOME/MATE Desktop Menu
+Summary(pl.UTF-8):	Menu dla środowiska GNOME/MATE
 Name:		gnome-main-menu
 Version:	1.8.0
 Release:	0.1
@@ -11,59 +15,87 @@ Group:		X11/Applications
 Source0:	http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
 # Source0-md5:	c93b26d9ab7d68209e3e716c69b0c37b
 URL:		http://en.opensuse.org/GNOME_Main_Menu
-BuildRequires:	NetworkManager-devel
-BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	NetworkManager-devel >= 0.8.0
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake >= 1:1.9
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.16.0
+BuildRequires:	cairo-devel
+%{?with_caja:BuildRequires:	caja-devel >= 1.5.0}
+BuildRequires:	glib2-devel >= 1:2.26.0
 BuildRequires:	gnome-common
 BuildRequires:	gtk+2-devel >= 2:2.18
-BuildRequires:	gtk-doc-automake
-BuildRequires:	intltool
+BuildRequires:	gtk-doc >= 1.0
+BuildRequires:	gtk-doc-automake >= 1.0
+BuildRequires:	intltool >= 0.35.0
 BuildRequires:	libgtop-devel
 BuildRequires:	libiw-devel
-BuildRequires:	librsvg-devel
 BuildRequires:	libtool
-BuildRequires:	libunique-devel
+BuildRequires:	libunique-devel >= 1.0
+BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	mate-control-center-devel >= 1.5.2
 BuildRequires:	mate-desktop-devel >= 1.8.0
 BuildRequires:	mate-panel-devel
 BuildRequires:	perl-XML-Parser
 BuildRequires:	pkgconfig
 BuildRequires:	tar >= 1:1.22
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xz
-#Requires:	dbus-glib
 Requires:	glib2 >= 1:2.26.0
-#Requires:	gnome-panel
-#Requires:	gnome-terminal
-#Requires:	hal
+Requires:	gtk+2 >= 2:2.18
+Requires:	mate-control-center >= 1.5.2
+Requires:	mate-panel
+Requires:	mate-panel
 Requires:	mate-system-monitor
-#Requires:	tango-icon-theme
-#Requires:	wireless-tools
+# for mate-screensaver-lock
+Suggests:	mate-screensaver
+# for mate-session-logout, mate-session-shutdown
+Suggests:	mate-session-manager
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_libexecdir	%{_libdir}/mate-panel
+
 %description
-GNOME Main Menu is a convenient menu accessible from a button in the
-desktop panel. It is different from conventional menus, in that it
-lists a user's favourite and recent Applications, Documents and Places
-in one useful interface. Additionally it provides a search bar that
-allows a user to search for applications and documents from the menu
-itself.
+GNOME Main Menu is a convenient menu for GNOME/MATE desktop
+environments accessible from a button in the desktop panel. It is
+different from conventional menus, in that it lists a user's favourite
+and recent Applications, Documents and Places in one useful interface.
+Additionally it provides a search bar that allows a user to search for
+applications and documents from the menu itself.
 
 %description -l pl.UTF-8
-Menu i przeglądarka aplikacji dla środowiska GNOME.
+GNOME Main Menu to wygodne menu dla środowisk GNOME/Mate, dostępne z
+poziomu przycisku w panelu pulpitu. Różni się tym od konwencjonalnych
+menu, że wyświetla ulubione i ostatnio używane przez użytkownika
+aplikacje, dokumenty i miejsca w jednym, użytecznym interfejsie.
+Dodatkowo udostępnia pasek wyszukiwania, pozwalający użytkownikowi
+wyszukać aplikacje i dokumenty z menu.
+
+%package -n caja-extension-main-menu
+Summary:	Main Menu extension for Caja (MATE file manager)
+Summary(pl.UTF-8):	Rozszerzenie Main Menu dla zarządcy plików Caja (ze środowiska MATE)
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Requires:	caja >= 1.5.0
+
+%description -n caja-extension-main-menu
+Main Menu extension for Caja (MATE file manager).
+
+%description -n caja-extension-main-menu -l pl.UTF-8
+Rozszerzenie Main Menu dla zarządcy plików Caja (ze środowiska MATE).
 
 %prep
 %setup -q
 
 %build
 %{__intltoolize}
-%{__aclocal}
 %{__libtoolize}
-%{__autoheader}
+%{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
-%configure
+%configure \
+	%{?with_caja:--enable-caja-extension} \
+	--disable-static
 %{__make}
 
 %install
@@ -71,7 +103,11 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name} --with-gnome --all-name
+%find_lang %{name}
+
+%if %{with caja}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/caja/extensions-2.0/libcaja-main-menu.la
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -87,7 +123,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/application-browser
 %attr(755,root,root) %{_bindir}/trigger-panel-run-dialog
-%attr(755,root,root) %{_libdir}/main-menu
+%attr(755,root,root) %{_libexecdir}/main-menu
 %{_mandir}/man1/application-browser.1*
 %{_desktopdir}/application-browser.desktop
 %{_desktopdir}/mate-screensaver-lock.desktop
@@ -98,6 +134,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_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-control-center/applications.xbel
+%{_datadir}/mate-control-center/documents.xbel
+%{_datadir}/mate-control-center/places.xbel
+%{_datadir}/mate-control-center/system-items.xbel
+%{_datadir}/mate-control-center/empty.ots
+%{_datadir}/mate-control-center/empty.ott
 %{_datadir}/mate-panel/applets/org.mate.GNOMEMainMenu.mate-panel-applet
+
+%if %{with caja}
+%files -n caja-extension-main-menu
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/caja/extensions-2.0/libcaja-main-menu.so
+%endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnome-main-menu.git/commitdiff/e6d741bde80f66ae2f4ed9deb6229c3569900413



More information about the pld-cvs-commit mailing list