Compare commits
No commits in common. "c10s" and "c8" have entirely different histories.
8
.gitignore
vendored
8
.gitignore
vendored
@ -1,7 +1 @@
|
|||||||
xdg-user-dirs-0.11.tar.gz
|
SOURCES/xdg-user-dirs-0.17.tar.gz
|
||||||
/xdg-user-dirs-0.13.tar.gz
|
|
||||||
/xdg-user-dirs-0.14.tar.gz
|
|
||||||
/xdg-user-dirs-0.15.tar.gz
|
|
||||||
/xdg-user-dirs-0.16.tar.gz
|
|
||||||
/xdg-user-dirs-0.17.tar.gz
|
|
||||||
/xdg-user-dirs-0.18.tar.gz
|
|
||||||
|
|||||||
1
.xdg-user-dirs.metadata
Normal file
1
.xdg-user-dirs.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
246cea7db52ef7e29774fa416981a548377de557 SOURCES/xdg-user-dirs-0.17.tar.gz
|
||||||
@ -1,57 +0,0 @@
|
|||||||
From 2a63d3f0ffb76135790bb1168a3270a599904380 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Redondo <kde@david-redondo.de>
|
|
||||||
Date: Tue, 20 Sep 2022 10:37:51 +0200
|
|
||||||
Subject: [PATCH 1/2] Add a systemd service to run xdg-user-dirs-update
|
|
||||||
|
|
||||||
Recently GNOME and Plasma have been embracing systemd for handling
|
|
||||||
their session startup. To enable autostart integration with this
|
|
||||||
systemd includes systemd-xdg-autostart-generator which creates units
|
|
||||||
from autostart desktop files. xdg-user-dirs installs such a desktop
|
|
||||||
file (xdg-user-dirs.desktop). However because this file contains
|
|
||||||
X-GNOME-Autostart-Phase=Initialization systemd will skip it since
|
|
||||||
it assumes it will be handles by GNOME itself. This a problem for
|
|
||||||
Plasma and other desktop environments that do not handle this
|
|
||||||
themselves, assuming that systemd takes care about autostart
|
|
||||||
xdg-user-dirs-update will not be run.
|
|
||||||
See https://github.com/systemd/systemd/issues/18791
|
|
||||||
We can provide a systemd service file to make sure xdg-user-dirs-update
|
|
||||||
is run during session startup. This ensures that the relevant
|
|
||||||
directories of the user exist on login and during startup as
|
|
||||||
specifying to be run before graphical-session-pre.target
|
|
||||||
means that it runs sufficiently early in the startup process while
|
|
||||||
using the generator would result in 'After=graphical-session.target'.
|
|
||||||
---
|
|
||||||
xdg-user-dirs.desktop | 1 +
|
|
||||||
xdg-user-dirs.service | 11 +++++++++++
|
|
||||||
2 files changed, 12 insertions(+)
|
|
||||||
create mode 100644 xdg-user-dirs.service
|
|
||||||
|
|
||||||
diff --git a/xdg-user-dirs.desktop b/xdg-user-dirs.desktop
|
|
||||||
index 6b969d4..b14a973 100644
|
|
||||||
--- a/xdg-user-dirs.desktop
|
|
||||||
+++ b/xdg-user-dirs.desktop
|
|
||||||
@@ -8,3 +8,4 @@ NoDisplay=true
|
|
||||||
|
|
||||||
X-GNOME-Autostart-Phase=Initialization
|
|
||||||
X-KDE-autostart-phase=1
|
|
||||||
+X-systemd-skip=true
|
|
||||||
diff --git a/xdg-user-dirs.service b/xdg-user-dirs.service
|
|
||||||
new file mode 100644
|
|
||||||
index 0000000..6795045
|
|
||||||
--- /dev/null
|
|
||||||
+++ b/xdg-user-dirs.service
|
|
||||||
@@ -0,0 +1,11 @@
|
|
||||||
+[Unit]
|
|
||||||
+Description=User folders update
|
|
||||||
+Documentation=man:xdg-user-dirs-update(1)
|
|
||||||
+Before=graphical-session-pre.target
|
|
||||||
+
|
|
||||||
+[Service]
|
|
||||||
+Type=oneshot
|
|
||||||
+ExecStart=/usr/bin/xdg-user-dirs-update
|
|
||||||
+
|
|
||||||
+[Install]
|
|
||||||
+WantedBy=graphical-session-pre.target
|
|
||||||
--
|
|
||||||
2.48.1
|
|
||||||
|
|
||||||
@ -1,51 +0,0 @@
|
|||||||
From 1512365de068446f8b5e14163601dd71e34e8bc1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Redondo <kde@david-redondo.de>
|
|
||||||
Date: Thu, 9 Feb 2023 11:57:37 +0100
|
|
||||||
Subject: [PATCH 2/2] Install systemd service file
|
|
||||||
|
|
||||||
---
|
|
||||||
Makefile.am | 4 +++-
|
|
||||||
configure.ac | 5 +++++
|
|
||||||
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/Makefile.am b/Makefile.am
|
|
||||||
index f649564..81d9976 100644
|
|
||||||
--- a/Makefile.am
|
|
||||||
+++ b/Makefile.am
|
|
||||||
@@ -14,7 +14,7 @@ INCLUDES = \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
EXTRA_DIST= config.rpath translate.c autogen.sh \
|
|
||||||
- user-dirs.conf user-dirs.defaults xdg-user-dir xdg-user-dirs.desktop
|
|
||||||
+ user-dirs.conf user-dirs.defaults xdg-user-dir xdg-user-dirs.desktop xdg-user-dirs.service
|
|
||||||
|
|
||||||
xdgdir=$(sysconfdir)/xdg
|
|
||||||
xdg_DATA=user-dirs.conf user-dirs.defaults
|
|
||||||
@@ -22,6 +22,8 @@ xdg_DATA=user-dirs.conf user-dirs.defaults
|
|
||||||
xdgautostartdir=$(xdgdir)/autostart
|
|
||||||
xdgautostart_DATA = xdg-user-dirs.desktop
|
|
||||||
|
|
||||||
+systemduserunit_DATA = xdg-user-dirs.service
|
|
||||||
+
|
|
||||||
libraries = $(LIBINTL)
|
|
||||||
|
|
||||||
bin_PROGRAMS = \
|
|
||||||
diff --git a/configure.ac b/configure.ac
|
|
||||||
index 2cce082..dc389db 100644
|
|
||||||
--- a/configure.ac
|
|
||||||
+++ b/configure.ac
|
|
||||||
@@ -77,6 +77,11 @@ if test x$enable_documentation = xyes; then
|
|
||||||
fi
|
|
||||||
AM_CONDITIONAL(BUILD_DOCUMENTATION, test x$enable_documentation = xyes)
|
|
||||||
|
|
||||||
+PKG_CHECK_EXISTS([systemd],
|
|
||||||
+ [systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)],
|
|
||||||
+ [systemduserunitdir='${prefix}/lib/systemd/user'])
|
|
||||||
+AC_SUBST(systemduserunitdir)
|
|
||||||
+
|
|
||||||
AC_OUTPUT([ po/Makefile.in
|
|
||||||
Makefile
|
|
||||||
man/Makefile
|
|
||||||
--
|
|
||||||
2.48.1
|
|
||||||
|
|
||||||
22
SOURCES/use-fuzzy.patch
Normal file
22
SOURCES/use-fuzzy.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
diff -up xdg-user-dirs-0.11/po/Makefile.in.in.use-fuzzy xdg-user-dirs-0.11/po/Makefile.in.in
|
||||||
|
--- xdg-user-dirs-0.11/po/Makefile.in.in.use-fuzzy 2008-10-24 04:17:03.000000000 -0400
|
||||||
|
+++ xdg-user-dirs-0.11/po/Makefile.in.in 2009-11-03 00:57:15.319114230 -0500
|
||||||
|
@@ -61,14 +61,14 @@ CATALOGS = @CATALOGS@
|
||||||
|
.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
|
||||||
|
|
||||||
|
.po.mo:
|
||||||
|
- @echo "$(MSGFMT) -c -o $@ $<"; \
|
||||||
|
- $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
|
||||||
|
+ @echo "$(MSGFMT) -c -f -o $@ $<"; \
|
||||||
|
+ $(MSGFMT) -c -f -o t-$@ $< && mv t-$@ $@
|
||||||
|
|
||||||
|
.po.gmo:
|
||||||
|
@lang=`echo $* | sed -e 's,.*/,,'`; \
|
||||||
|
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
|
||||||
|
- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
|
||||||
|
- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
|
||||||
|
+ echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c -f --statistics -o $${lang}.gmo $${lang}.po"; \
|
||||||
|
+ cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c -f --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
|
||||||
|
|
||||||
|
.sin.sed:
|
||||||
|
sed -e '/^#/d' $< > t-$@
|
||||||
@ -2,27 +2,21 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: xdg-user-dirs
|
Name: xdg-user-dirs
|
||||||
Version: 0.18
|
Version: 0.17
|
||||||
Release: 7%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Handles user special directories
|
Summary: Handles user special directories
|
||||||
|
|
||||||
License: GPL-2.0-or-later AND MIT
|
License: GPLv2+ and MIT
|
||||||
URL: https://freedesktop.org/wiki/Software/xdg-user-dirs
|
URL: http://freedesktop.org/wiki/Software/xdg-user-dirs
|
||||||
Source0: https://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz
|
Source0: http://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
# Backports from upstream
|
# use fuzzy translations (for Downloads)
|
||||||
Patch0001: 0001-Add-a-systemd-service-to-run-xdg-user-dirs-update.patch
|
# https://bugzilla.redhat.com/show_bug.cgi?id=532399
|
||||||
Patch0002: 0002-Install-systemd-service-file.patch
|
Patch0: use-fuzzy.patch
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: gettext
|
||||||
BuildRequires: automake
|
|
||||||
BuildRequires: make
|
|
||||||
BuildRequires: gcc
|
|
||||||
BuildRequires: gettext-devel
|
|
||||||
BuildRequires: git-core
|
|
||||||
BuildRequires: docbook-style-xsl
|
BuildRequires: docbook-style-xsl
|
||||||
BuildRequires: libxslt
|
BuildRequires: libxslt
|
||||||
BuildRequires: systemd-rpm-macros
|
|
||||||
Requires: %{_sysconfdir}/xdg/autostart
|
Requires: %{_sysconfdir}/xdg/autostart
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -30,31 +24,23 @@ Contains xdg-user-dirs-update that updates folders in a users
|
|||||||
homedirectory based on the defaults configured by the administrator.
|
homedirectory based on the defaults configured by the administrator.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -S git_am
|
%setup -q
|
||||||
|
%patch0 -p1 -b .use-fuzzy
|
||||||
%conf
|
|
||||||
autoreconf -fiv
|
|
||||||
%configure
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%configure
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
|
cd po
|
||||||
|
touch *.po
|
||||||
|
make update-gmo
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%make_install
|
||||||
|
|
||||||
%find_lang %name
|
%find_lang %name
|
||||||
|
|
||||||
|
|
||||||
%post
|
|
||||||
%systemd_user_post xdg-user-dirs.service
|
|
||||||
|
|
||||||
%preun
|
|
||||||
%systemd_user_preun xdg-user-dirs.service
|
|
||||||
|
|
||||||
%postun
|
|
||||||
%systemd_user_postun_with_reload xdg-user-dirs.service
|
|
||||||
|
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc NEWS AUTHORS README
|
%doc NEWS AUTHORS README
|
||||||
@ -64,64 +50,9 @@ autoreconf -fiv
|
|||||||
%{_sysconfdir}/xdg/autostart/*
|
%{_sysconfdir}/xdg/autostart/*
|
||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
%{_mandir}/man5/*
|
%{_mandir}/man5/*
|
||||||
%{_userunitdir}/xdg-user-dirs.service
|
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Feb 17 2025 Neal Gompa <ngompa@centosproject.org> - 0.18-7
|
|
||||||
- Backport patches to install systemd units to fix initialization races
|
|
||||||
Resolves: RHEL-79119
|
|
||||||
- Fix minor spec formatting inconsistencies
|
|
||||||
|
|
||||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.18-6
|
|
||||||
- Bump release for October 2024 mass rebuild:
|
|
||||||
Resolves: RHEL-64018
|
|
||||||
|
|
||||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.18-5
|
|
||||||
- Bump release for June 2024 mass rebuild
|
|
||||||
|
|
||||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.18-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.18-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.18-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Dec 19 2022 David King <amigadave@amigadave.com> - 0.18-1
|
|
||||||
- Update to 0.18 (#2135324)
|
|
||||||
|
|
||||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-11
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-10
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-9
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Sep 21 2020 FeRD (Frank Dana) <ferdnyc@gmail.com> - 0.17-7
|
|
||||||
- Drop fuzzy translations patch, no longer necessary
|
|
||||||
|
|
||||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.17-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Mar 14 2018 Kalev Lember <klember@redhat.com> - 0.17-1
|
* Wed Mar 14 2018 Kalev Lember <klember@redhat.com> - 0.17-1
|
||||||
- Update to 0.17
|
- Update to 0.17
|
||||||
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-10
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
|
||||||
Loading…
Reference in New Issue
Block a user