[packages/xdg-utils] - updated to 1.1.1 - removed obsolete xdg-settings-add-MATE-support patch

qboosh qboosh at pld-linux.org
Wed Nov 4 16:47:06 CET 2015


commit fb3377f08f9d747372bb4a09cf899d49d4a42406
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Nov 4 16:47:09 2015 +0100

    - updated to 1.1.1
    - removed obsolete xdg-settings-add-MATE-support patch

 0001-xdg-settings-add-MATE-support.patch | 61 --------------------------------
 xdg-utils.spec                           | 42 +++++++++++-----------
 2 files changed, 22 insertions(+), 81 deletions(-)
---
diff --git a/xdg-utils.spec b/xdg-utils.spec
index ebab1a6..7e3fcac 100644
--- a/xdg-utils.spec
+++ b/xdg-utils.spec
@@ -1,17 +1,13 @@
-%define		subver	rc1
-%define		rel		3
 Summary:	Set of tools that assist applications with desktop integration
 Summary(pl.UTF-8):	Zestaw narzędzi ułatwiających integrację aplikacji ze środowiskami graficznymi
 Name:		xdg-utils
-Version:	1.1.0
-Release:	%{rel}.%{subver}
+Version:	1.1.1
+Release:	1
 License:	MIT
 Group:		X11/Applications
-#Source0:	http://portland.freedesktop.org/download/%{name}-%{version}.tgz
-Source0:	%{name}-v%{version}-%{subver}-71-g050333e.tar.gz
-# Source0-md5:	7a83a4867afc6f5df896f0be0bace74a
+Source0:	http://portland.freedesktop.org/download/%{name}-%{version}.tar.gz
+# Source0-md5:	2d0aec6037769a5f138ff404b1bb4b15
 Source1:	get-source.sh
-Patch0:		0001-xdg-settings-add-MATE-support.patch
 URL:		http://portland.freedesktop.org/wiki/XdgUtils
 BuildRequires:	xmlto
 Requires:	coreutils
@@ -37,19 +33,11 @@ danej aplikacji, a druga połowa przydaje się już w czasie działania
 aplikacji w danym środowisku graficznym.
 
 %prep
-%setup -qc
-mv xdg-utils-v%{version}-*/* .
-%patch0 -p1
+%setup -q
 
 %build
 %configure
 
-# for snapshot. need to regenerate scripts
-%if 0%{?subver:1}
-%{__make} scripts-clean -C scripts
-%{__make} man scripts -C scripts
-%endif
-
 %{__make}
 
 %install
@@ -62,6 +50,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README TODO
-%attr(755,root,root) %{_bindir}/xdg-*
-%{_mandir}/man1/xdg-*.1*
+%doc ChangeLog LICENSE README RELEASE_NOTES TODO
+%attr(755,root,root) %{_bindir}/xdg-desktop-icon
+%attr(755,root,root) %{_bindir}/xdg-desktop-menu
+%attr(755,root,root) %{_bindir}/xdg-email
+%attr(755,root,root) %{_bindir}/xdg-icon-resource
+%attr(755,root,root) %{_bindir}/xdg-mime
+%attr(755,root,root) %{_bindir}/xdg-open
+%attr(755,root,root) %{_bindir}/xdg-screensaver
+%attr(755,root,root) %{_bindir}/xdg-settings
+%{_mandir}/man1/xdg-desktop-icon.1*
+%{_mandir}/man1/xdg-desktop-menu.1*
+%{_mandir}/man1/xdg-email.1*
+%{_mandir}/man1/xdg-icon-resource.1*
+%{_mandir}/man1/xdg-mime.1*
+%{_mandir}/man1/xdg-open.1*
+%{_mandir}/man1/xdg-screensaver.1*
+%{_mandir}/man1/xdg-settings.1*
diff --git a/0001-xdg-settings-add-MATE-support.patch b/0001-xdg-settings-add-MATE-support.patch
deleted file mode 100644
index e77a7c3..0000000
--- a/0001-xdg-settings-add-MATE-support.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 0e0954c71d09bd09c3c2ffacb7386349c59cbeb8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen at delfi.ee>
-Date: Sat, 29 Dec 2012 16:06:20 +0200
-Subject: [PATCH] xdg-settings: add MATE support
-
-MATE support was incomplete in b961235b197647d6649ef3d48d7cc2cecafe3d47
-it did not add support for xdg-settings which Google Chrome/Chromium
-uses to detect and set default browser.
-
-MATE 1.5 uses same schema as gnome3, so shortcut to gnome3 methods
-
-testcases:
-$ xdg-settings get default-web-browser
-chromium-browser.desktop
-$ xdg-settings check
-default-web-browser chromium-browser.desktop
-yes
----
- scripts/xdg-settings.in | 19 ++++++++++++++++++-
- 1 file changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/xdg-settings.in b/scripts/xdg-settings.in
-index eaed991..b1e43cb 100644
---- a/scripts/xdg-settings.in
-+++ b/scripts/xdg-settings.in
-@@ -243,6 +243,23 @@ set_browser_kde()
- }
- 
- # }}} KDE
-+# {{{ MATE
-+get_browser_mate()
-+{
-+	get_browser_gnome3 "$@"
-+}
-+
-+check_browser_mate()
-+{
-+	check_browser_gnome3 "$@"
-+}
-+
-+set_browser_mate()
-+{
-+	set_browser_gnome3 "$@"
-+}
-+
-+# }}} MATE
- # {{{ GNOME
- 
- get_browser_gnome()
-@@ -738,7 +755,7 @@ fi
- detectDE
- 
- case "$DE" in
--    kde|gnome*|xfce)
-+    kde|gnome*|mate|xfce)
-     dispatch_specific "$@"
-     ;;
- 
--- 
-1.8.0.1
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xdg-utils.git/commitdiff/fb3377f08f9d747372bb4a09cf899d49d4a42406



More information about the pld-cvs-commit mailing list