Hello community,
here is the log from the commit of package desktop-file-utils for
openSUSE:Factory checked in at 2015-03-16 09:37:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/desktop-file-utils (Old)
and /work/SRC/openSUSE:Factory/.desktop-file-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "desktop-file-utils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/desktop-file-utils/desktop-file-utils.changes
2014-12-25 23:20:39.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.desktop-file-utils.new/desktop-file-utils.changes
2015-03-16 09:37:49.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Mar 10 15:17:27 UTC 2015 - [email protected]
+
+- Cleanup with spec-cleaner
+- Update suse-update-mime-defaults to search subfolders for desktop
+ files by changing to find from simple ls bnc#867135
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ desktop-file-utils.spec ++++++
--- /var/tmp/diff_new_pack.3xnVmN/_old 2015-03-16 09:37:50.000000000 +0100
+++ /var/tmp/diff_new_pack.3xnVmN/_new 2015-03-16 09:37:50.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package desktop-file-utils
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,10 +35,9 @@
Patch3: U_add-EDE-desktop-environment_97d6ba3.patch
BuildRequires: glib2-devel
BuildRequires: pkg-config
-#!BuildIgnore: dbus-1-x11
-# Only needed because we don't (and won't) support building xz tarballs by
default... See bnc#697467
BuildRequires: xz
Requires: aaa_base
+#!BuildIgnore: dbus-1-x11
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -50,7 +49,7 @@
%prep
%setup -q
-%patch0 -p0
+%patch0
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -58,10 +57,10 @@
%build
%configure \
--with-lispdir=%{_datadir}/emacs/site-lisp
-%__make %{?_smp_mflags}
+make %{?_smp_mflags}
%install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
# we don't want to buildrequire emacs, but recent automake make it
# impossible to install a lisp file without emacs installed. So we
# manually do it.
@@ -70,7 +69,7 @@
# Install suse-update-mime-defaults
install -m0755 %{SOURCE1} %{buildroot}%{_bindir}/suse-update-mime-defaults
# Install rpm macros
-install -D -m644 %{S:2}
%{buildroot}%{_sysconfdir}/rpm/macros.desktop-file-utils
+install -D -m644 %{SOURCE2}
%{buildroot}%{_sysconfdir}/rpm/macros.desktop-file-utils
# Create ghosts based on default $XDG_DATA_DIRS:
mkdir -p %{buildroot}%{_datadir}/applications
touch %{buildroot}%{_datadir}/applications/mimeinfo.cache
++++++ suse-update-mime-defaults ++++++
--- /var/tmp/diff_new_pack.3xnVmN/_old 2015-03-16 09:37:50.000000000 +0100
+++ /var/tmp/diff_new_pack.3xnVmN/_new 2015-03-16 09:37:50.000000000 +0100
@@ -141,7 +141,7 @@
for (i = split("XDG_DATA_DIRS" in ENVIRON ? ENVIRON["XDG_DATA_DIRS"] : \
"/usr/local/share:/usr/share", xdg_data_dirs, /:/); i > 0; i--) {
# XDG_DATA_DIRS is trusted here because it has been reset
- cmd = "ls -1 -- \"" root xdg_data_dirs[i] "/applications/\"*.desktop "
\
+ cmd = "find \"" root xdg_data_dirs[i] "/applications/\" -name
\"*.desktop\" " \
"2>/dev/null"
while ((cmd | getline desktopfile) > 0) {
l = split(desktopfile, arr, "/")
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
