From 618d226bef3d5553b25ed04033a9f108cf4b4b59 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:11:29 +0000 Subject: import xdg-user-dirs-0.15-5.el7 --- diff --git a/SOURCES/autostart.patch b/SOURCES/autostart.patch new file mode 100644 index 0000000..60076cb --- /dev/null +++ b/SOURCES/autostart.patch @@ -0,0 +1,45 @@ +From eff699165095bdc150d58e8dfca98af11c9ee2af Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp +Date: Thu, 17 Aug 2017 04:05:46 +0200 +Subject: Add autostart .desktop file for user-dirs-update + +The user-dirs update was traditionally done by an Xsession.d snippet, +which does not work in a Wayland session. +To avoid duplicating the .desktop file in every distribution, we ship it +upstream. + +https://bugs.freedesktop.org/show_bug.cgi?id=102303 + +diff --git a/Makefile.am b/Makefile.am +index 9a40e68..a3ef127 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -19,6 +19,9 @@ EXTRA_DIST= config.rpath translate.c autogen.sh \ + xdgdir=$(sysconfdir)/xdg + xdg_DATA=user-dirs.conf user-dirs.defaults + ++xdgautostartdir=$(xdgdir)/autostart ++xdgautostart_DATA = xdg-user-dirs.desktop ++ + libraries = $(LIBINTL) + + bin_PROGRAMS = \ +diff --git a/xdg-user-dirs.desktop b/xdg-user-dirs.desktop +new file mode 100644 +index 0000000..6b969d4 +--- /dev/null ++++ b/xdg-user-dirs.desktop +@@ -0,0 +1,10 @@ ++[Desktop Entry] ++Type=Application ++Name=User folders update ++TryExec=xdg-user-dirs-update ++Exec=xdg-user-dirs-update ++StartupNotify=false ++NoDisplay=true ++ ++X-GNOME-Autostart-Phase=Initialization ++X-KDE-autostart-phase=1 +-- +cgit v0.10.2 + diff --git a/SOURCES/xdg-user-dirs-translations.patch b/SOURCES/xdg-user-dirs-translations.patch index 9a21642..1b1b629 100644 --- a/SOURCES/xdg-user-dirs-translations.patch +++ b/SOURCES/xdg-user-dirs-translations.patch @@ -1,5 +1,13 @@ ---- a/xdg-user-dirs-0.15/po/pa.po 2013-11-28 18:14:06.627837017 +0530 -+++ a/xdg-user-dirs-0.15/po/pa.po 2013-11-28 18:15:08.386409371 +0530 +From eff699165095bdc150d58e8dfca98af11c9ee2af Mon Sep 17 00:00:00 2001 +From: git +Date: Thu, 17 Aug 2017 04:05:46 +0200 +Subject: translations + +This commit adds translations + +diff --git a/po/pa.po b/po/pa.po +--- a/po/pa.po ++++ b/po/pa.po @@ -1,133 +1,132 @@ # Translation of xdg-user-dirs to Punjabi. # Copyright (C) 2008 Red Hat, Inc diff --git a/SOURCES/xdg-user-dirs.sh b/SOURCES/xdg-user-dirs.sh deleted file mode 100644 index 92dfe5a..0000000 --- a/SOURCES/xdg-user-dirs.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# Copyright (C) 2007 Red Hat, Inc. All rights reserved. This -# copyrighted material is made available to anyone wishing to use, modify, -# copy, or redistribute it subject to the terms and conditions of the -# GNU General Public License version 2. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -# -if [ -x /usr/bin/xdg-user-dirs-update ]; then - /usr/bin/xdg-user-dirs-update -fi diff --git a/SPECS/xdg-user-dirs.spec b/SPECS/xdg-user-dirs.spec index ff7b8f7..3559adc 100644 --- a/SPECS/xdg-user-dirs.spec +++ b/SPECS/xdg-user-dirs.spec @@ -3,21 +3,23 @@ Name: xdg-user-dirs Version: 0.15 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Handles user special directories Group: User Interface/Desktops License: GPLv2+ and MIT URL: http://freedesktop.org/wiki/Software/xdg-user-dirs Source0: http://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz -Source1: xdg-user-dirs.sh # use fuzzy translations (for Downloads) # https://bugzilla.redhat.com/show_bug.cgi?id=532399 Patch0: use-fuzzy.patch Patch1: xdg-user-dirs-translations.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1412762 +Patch2: autostart.patch -BuildRequires: gettext +BuildRequires: git +BuildRequires: gettext, autoconf, automake, intltool BuildRequires: docbook-style-xsl BuildRequires: libxslt Requires: %{_sysconfdir}/X11/xinit/xinitrc.d @@ -27,10 +29,9 @@ Contains xdg-user-dirs-update that updates folders in a users homedirectory based on the defaults configured by the administrator. %prep -%setup -q -%patch0 -p1 -b .use-fuzzy -%patch1 -p2 -b .translations +%autosetup -S git +autoreconf --force --install %build %configure make %{?_smp_mflags} @@ -41,8 +42,6 @@ make update-gmo %install make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d -install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d %find_lang %name @@ -52,12 +51,16 @@ install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d %{_bindir}/* %config(noreplace) %{_sysconfdir}/xdg/user-dirs.conf %config(noreplace) %{_sysconfdir}/xdg/user-dirs.defaults -%{_sysconfdir}/X11/xinit/xinitrc.d/* +%{_sysconfdir}/xdg/autostart/xdg-user-dirs.desktop %{_mandir}/man1/* %{_mandir}/man5/* %changelog +* Thu Oct 05 2017 Ray Strode - 0.15-5 +- Start using autostart mechanism instead of xinitrc.d script + Resolves: #1412762 + * Fri Jan 24 2014 Daniel Mach - 0.15-4 - Mass rebuild 2014-01-24