[packages/nautilus-actions] - updated to 3.2.2
baggins
baggins at pld-linux.org
Fri Jan 3 15:44:46 CET 2014
commit bd243a9f5b871e5db1dcaca7e92dfa5c36d33db0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Jan 3 15:44:35 2014 +0100
- updated to 3.2.2
nautilus-actions-desktop.patch | 6 ++--
nautilus-actions-toolbar.patch | 68 ------------------------------------------
nautilus-actions.spec | 48 ++++++++++++++++++++++++-----
3 files changed, 43 insertions(+), 79 deletions(-)
---
diff --git a/nautilus-actions.spec b/nautilus-actions.spec
index 01bb529..e3ee3d9 100644
--- a/nautilus-actions.spec
+++ b/nautilus-actions.spec
@@ -1,14 +1,17 @@
+#
+# Conditinal build:
+%bcond_without apidocs # disable API documentation
+
Summary: Nautilus extension which adds customized command in Nautilus menu
Summary(pl.UTF-8): Rozszerzenie dodające własne polecenia w menu Nautilusa
Name: nautilus-actions
-Version: 3.0.7
+Version: 3.2.2
Release: 1
License: GPL v2+
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/3.0/%{name}-%{version}.tar.bz2
-# Source0-md5: 40b3807e7ddc0926782d2d85e99e2fc4
+Source0: http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/3.2/%{name}-%{version}.tar.xz
+# Source0-md5: a84d89d50d958edd6b6b9798c9b78904
Patch0: %{name}-desktop.patch
-Patch1: %{name}-toolbar.patch
URL: http://www.grumz.net/node/8/
BuildRequires: GConf2-devel >= 2.8.0
BuildRequires: autoconf >= 2.53
@@ -54,10 +57,21 @@ Header files for nautilus-actions.
%description devel -l pl.UTF-8
Pliki nagłówkowe nautilus-actions.
+%package apidocs
+Summary: Nautilus Actions API documentation
+Summary(pl.UTF-8): Dokumentacja API Nautilus Actions
+Group: Documentation
+Requires: gtk-doc-common
+
+%description apidocs
+Nautilus Actions API documentation.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API Nautilus Actions.
+
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%{__intltoolize}
@@ -67,6 +81,8 @@ Pliki nagłówkowe nautilus-actions.
%{__autoheader}
%{__automake}
%configure \
+ --%{?with_apidocs:en}%{!?with_apidocs:dis}able-gtk-doc \
+ --with-html-dir=%{_gtkdocdir} \
--disable-schemas-install
%{__make}
@@ -77,10 +93,16 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+rm -rf docs-installed
+cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} docs-installed
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/*.la
%{__rm} $RPM_BUILD_ROOT%{_libdir}/nautilus-actions/*.la
-%find_lang %{name}
+%{!?with_apidocs:%{__rm} -rf $RPM_BUILD_ROOT%{_gtkdocdir}}
+
+%find_lang %{name} --with-gnome --with-omf --all-name
%clean
rm -rf $RPM_BUILD_ROOT
@@ -93,16 +115,20 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog
+%doc docs-installed/*
%attr(755,root,root) %{_bindir}/nautilus-actions-config-tool
%attr(755,root,root) %{_bindir}/nautilus-actions-new
+%attr(755,root,root) %{_bindir}/nautilus-actions-print
%attr(755,root,root) %{_bindir}/nautilus-actions-run
-%attr(755,root,root) %{_bindir}/nautilus-actions-schemas
%dir %{_libdir}/nautilus-actions
%attr(755,root,root) %{_libdir}/nautilus-actions/libna-core.so
%attr(755,root,root) %{_libdir}/nautilus-actions/libna-io-desktop.so
%attr(755,root,root) %{_libdir}/nautilus-actions/libna-io-gconf.so
%attr(755,root,root) %{_libdir}/nautilus-actions/libna-io-xml.so
+%attr(755,root,root) %{_libdir}/nautilus-actions/na-delete-xmltree
+%attr(755,root,root) %{_libdir}/nautilus-actions/na-gconf2key.sh
+%attr(755,root,root) %{_libdir}/nautilus-actions/na-print-schemas
+%attr(755,root,root) %{_libdir}/nautilus-actions/na-set-conf
%{_datadir}/%{name}
%{_desktopdir}/nact.desktop
%{_iconsdir}/hicolor/*/apps/*.png
@@ -113,3 +139,9 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%{_includedir}/nautilus-actions
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/nautilus-actions-3
+%endif
diff --git a/nautilus-actions-desktop.patch b/nautilus-actions-desktop.patch
index 73aaf18..dd5eadb 100644
--- a/nautilus-actions-desktop.patch
+++ b/nautilus-actions-desktop.patch
@@ -2,9 +2,9 @@ diff -urN nautilus-actions-2.30.0/src/nact/nact.desktop.in nautilus-actions-2.30
--- nautilus-actions-2.30.0/src/nact/nact.desktop.in 2010-03-25 22:16:28.000000000 +0100
+++ nautilus-actions-2.30.0.new//src/nact/nact.desktop.in 2010-03-26 22:12:03.198163675 +0100
@@ -6,5 +6,5 @@
- _Comment=Add items to the Nautilus popup menu
+ _Comment=Configure items to be added to the Nautilus context menus
Exec=nautilus-actions-config-tool
Icon=nautilus-actions
--Categories=Application;FileManager;DesktopSettings;Settings;AdvancedSettings;
-+Categories=GTK;GNOME;Settings;AdvancedSettings;X-Capplet;
+-Categories=System;FileTools;FileManager;
++Categories=GTK;GNOME;Settings;System;FileTools;FileManager;
StartupNotify=true
diff --git a/nautilus-actions-toolbar.patch b/nautilus-actions-toolbar.patch
deleted file mode 100644
index 928934b..0000000
--- a/nautilus-actions-toolbar.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- nautilus-actions-3.0.7/src/plugin-menu/nautilus-actions.c~ 2011-01-19 21:47:57.000000000 +0100
-+++ nautilus-actions-3.0.7/src/plugin-menu/nautilus-actions.c 2011-04-21 20:46:37.140206073 +0200
-@@ -86,7 +86,6 @@
- static void menu_provider_iface_init( NautilusMenuProviderIface *iface );
- static GList *menu_provider_get_background_items( NautilusMenuProvider *provider, GtkWidget *window, NautilusFileInfo *current_folder );
- static GList *menu_provider_get_file_items( NautilusMenuProvider *provider, GtkWidget *window, GList *files );
--static GList *menu_provider_get_toolbar_items( NautilusMenuProvider *provider, GtkWidget *window, NautilusFileInfo *current_folder );
-
- static GList *get_menus_items( NautilusActions *plugin, guint target, GList *selection );
- static GList *expand_tokens( GList *tree, NATokens *tokens );
-@@ -395,7 +394,6 @@
-
- iface->get_file_items = menu_provider_get_file_items;
- iface->get_background_items = menu_provider_get_background_items;
-- iface->get_toolbar_items = menu_provider_get_toolbar_items;
- }
-
- /*
-@@ -484,39 +482,6 @@
- na_selected_info_free_list( selected );
- }
- }
--
-- return( nautilus_menus_list );
--}
--
--/*
-- * as of 2.26, this function is only called for folders, but for the
-- * desktop (x-nautilus-desktop:///) which seems to be only called by
-- * get_background_items ; also, only actions (not menus) are displayed
-- */
--static GList *
--menu_provider_get_toolbar_items( NautilusMenuProvider *provider, GtkWidget *window, NautilusFileInfo *current_folder )
--{
-- static const gchar *thisfn = "nautilus_actions_menu_provider_get_toolbar_items";
-- GList *nautilus_menus_list = NULL;
-- gchar *uri;
-- GList *selected;
--
-- g_return_val_if_fail( NAUTILUS_IS_ACTIONS( provider ), NULL );
--
-- if( !NAUTILUS_ACTIONS( provider )->private->dispose_has_run ){
--
-- selected = na_selected_info_get_list_from_item( current_folder );
--
-- if( selected ){
-- uri = nautilus_file_info_get_uri( current_folder );
-- g_debug( "%s: provider=%p, window=%p, current_folder=%p (%s)",
-- thisfn, ( void * ) provider, ( void * ) window, ( void * ) current_folder, uri );
-- g_free( uri );
--
-- nautilus_menus_list = get_menus_items( NAUTILUS_ACTIONS( provider ), ITEM_TARGET_TOOLBAR, selected );
-- na_selected_info_free_list( selected );
-- }
-- }
-
- return( nautilus_menus_list );
- }
---- nautilus-actions-3.0.7/src/plugin-tracker/na-tracker.c~ 2011-01-01 13:50:12.000000000 +0100
-+++ nautilus-actions-3.0.7/src/plugin-tracker/na-tracker.c 2011-04-21 20:47:01.723541599 +0200
-@@ -259,7 +259,6 @@
-
- iface->get_background_items = menu_provider_get_background_items;
- iface->get_file_items = menu_provider_get_file_items;
-- iface->get_toolbar_items = NULL;
- }
-
- static GList *
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nautilus-actions.git/commitdiff/bd243a9f5b871e5db1dcaca7e92dfa5c36d33db0
More information about the pld-cvs-commit
mailing list