From 0cd131854609b14622e98ebdae7c9710bc087d66 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Thu, 10 Jun 2021 03:22:23 -0400 Subject: [PATCH 01/25] Drop unused patch file --- xdg-user-dirs-0.8-sentinel.patch | 57 -------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 xdg-user-dirs-0.8-sentinel.patch diff --git a/xdg-user-dirs-0.8-sentinel.patch b/xdg-user-dirs-0.8-sentinel.patch deleted file mode 100644 index 6642bbc..0000000 --- a/xdg-user-dirs-0.8-sentinel.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- xdg-user-dirs-0.8/xdg-user-dirs-update.c.sentinel 2007-05-29 15:49:31.000000000 -0400 -+++ xdg-user-dirs-0.8/xdg-user-dirs-update.c 2007-05-29 15:52:30.000000000 -0400 -@@ -761,15 +761,16 @@ save_user_dirs (void) - fprintf (file, "# absolute path. No other format is supported.\n"); - fprintf (file, "# \n"); - -- for (i = 0; user_dirs[i].name != NULL; i++) -- { -- escaped = shell_escape (user_dirs[i].path); -- fprintf (file, "XDG_%s_DIR=\"%s%s\"\n", -- user_dirs[i].name, -- (*escaped == '/')?"":"$HOME/", -- escaped); -- free (escaped); -- } -+ if (user_dirs != NULL) -+ for (i = 0; user_dirs[i].name != NULL; i++) -+ { -+ escaped = shell_escape (user_dirs[i].path); -+ fprintf (file, "XDG_%s_DIR=\"%s%s\"\n", -+ user_dirs[i].name, -+ (*escaped == '/')?"":"$HOME/", -+ escaped); -+ free (escaped); -+ } - - fclose (file); - -@@ -844,11 +845,12 @@ find_dir (Directory *dirs, const char *n - { - int i; - -- for (i = 0; dirs[i].name != NULL; i++) -- { -- if (strcmp (dirs[i].name, name) == 0) -- return &dirs[i]; -- } -+ if (dirs != NULL) -+ for (i = 0; dirs[i].name != NULL; i++) -+ { -+ if (strcmp (dirs[i].name, name) == 0) -+ return &dirs[i]; -+ } - return NULL; - } - -@@ -866,9 +868,7 @@ create_dirs (int force) - for (i = 0; default_dirs[i].name != NULL; i++) - { - default_dir = &default_dirs[i]; -- user_dir = NULL; -- if (user_dirs) -- user_dir = find_dir (user_dirs, default_dir->name); -+ user_dir = find_dir (user_dirs, default_dir->name); - - if (user_dir && !force) - { From 8eb97385a1cf6ecdd9839b21928bc178a76fd154 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:24:19 +0000 Subject: [PATCH 02/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xdg-user-dirs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index 358ab98..179d53b 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,7 +3,7 @@ Name: xdg-user-dirs Version: 0.17 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Handles user special directories License: GPLv2+ and MIT @@ -50,6 +50,9 @@ make update-gmo %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.17-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 0.17-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From e96463503acf1ba7eebbe0f9950eadde49dcbaca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:56:12 +0000 Subject: [PATCH 03/25] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xdg-user-dirs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index 179d53b..44ff24d 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,7 +3,7 @@ Name: xdg-user-dirs Version: 0.17 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Handles user special directories License: GPLv2+ and MIT @@ -50,6 +50,9 @@ make update-gmo %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.17-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 0.17-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 7d58eef144a456aeff98c8f7c4768566228ac88d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:56:21 +0000 Subject: [PATCH 04/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xdg-user-dirs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index 44ff24d..51b2379 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,7 +3,7 @@ Name: xdg-user-dirs Version: 0.17 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Handles user special directories License: GPLv2+ and MIT @@ -50,6 +50,9 @@ make update-gmo %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.17-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 0.17-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f837c49f3b7e29265ca42d069d7d329cf5f6d73c Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 19 Dec 2022 16:31:13 +0000 Subject: [PATCH 05/25] Update to 0.18 (#2135324) --- .gitignore | 1 + sources | 2 +- xdg-user-dirs.spec | 15 +++++++-------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index c75e292..32d8a19 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ xdg-user-dirs-0.11.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 diff --git a/sources b/sources index b1acc6f..32d11d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xdg-user-dirs-0.17.tar.gz) = a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f +SHA512 (xdg-user-dirs-0.18.tar.gz) = f523b2ba4f840a3c2a5730f72182fb5bb798187db769bfb7d36e9f780442813278a2c1bad656b4fb38428131241a51d07200a62b4d7b935d49a74be53f969716 diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index 51b2379..b26ff48 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -2,13 +2,13 @@ Name: xdg-user-dirs -Version: 0.17 -Release: 11%{?dist} +Version: 0.18 +Release: 1%{?dist} Summary: Handles user special directories License: GPLv2+ and MIT -URL: http://freedesktop.org/wiki/Software/xdg-user-dirs -Source0: http://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz +URL: https://freedesktop.org/wiki/Software/xdg-user-dirs +Source0: https://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz BuildRequires: make BuildRequires: gcc @@ -28,10 +28,6 @@ homedirectory based on the defaults configured by the administrator. %configure %make_build -cd po -touch *.po -make update-gmo - %install %make_install @@ -50,6 +46,9 @@ make update-gmo %changelog +* Mon Dec 19 2022 David King - 0.18-1 +- Update to 0.18 (#2135324) + * Sat Jul 23 2022 Fedora Release Engineering - 0.17-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 20fbc66fe06bdaae6193f01d15363464e060c211 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:17:35 +0000 Subject: [PATCH 06/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xdg-user-dirs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index b26ff48..b6d972d 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,7 +3,7 @@ Name: xdg-user-dirs Version: 0.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Handles user special directories License: GPLv2+ and MIT @@ -46,6 +46,9 @@ homedirectory based on the defaults configured by the administrator. %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Dec 19 2022 David King - 0.18-1 - Update to 0.18 (#2135324) From 76fade9c68eb25f9b5a2db843b7acd1254417a96 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:39:50 +0000 Subject: [PATCH 07/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xdg-user-dirs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index b6d972d..0843b51 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,7 +3,7 @@ Name: xdg-user-dirs Version: 0.18 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Handles user special directories License: GPLv2+ and MIT @@ -46,6 +46,9 @@ homedirectory based on the defaults configured by the administrator. %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0.18-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a3cde2410a74a0c55c49589efda70f5404f5cb1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 6 Dec 2023 07:10:56 +0000 Subject: [PATCH 08/25] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- xdg-user-dirs.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index 0843b51..3442831 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -6,7 +6,7 @@ Version: 0.18 Release: 3%{?dist} Summary: Handles user special directories -License: GPLv2+ and MIT +License: GPL-2.0-or-later AND MIT URL: https://freedesktop.org/wiki/Software/xdg-user-dirs Source0: https://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz From 39dac371256ec405857e5c96eb9ed81b8745e8bf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:28:36 +0000 Subject: [PATCH 09/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xdg-user-dirs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index 3442831..b228361 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,7 +3,7 @@ Name: xdg-user-dirs Version: 0.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Handles user special directories License: GPL-2.0-or-later AND MIT @@ -46,6 +46,9 @@ homedirectory based on the defaults configured by the administrator. %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.18-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 0778bedeb7fec70badc33764371d6b707cbc4629 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:52:14 +0000 Subject: [PATCH 10/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xdg-user-dirs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index b228361..e26f648 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,7 +3,7 @@ Name: xdg-user-dirs Version: 0.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Handles user special directories License: GPL-2.0-or-later AND MIT @@ -46,6 +46,9 @@ homedirectory based on the defaults configured by the administrator. %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.18-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2c146e1fdf8ff8ce7e1ff96b9b7877003148d5de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:36:19 +0000 Subject: [PATCH 11/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xdg-user-dirs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index e26f648..e03dfa1 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,7 +3,7 @@ Name: xdg-user-dirs Version: 0.18 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Handles user special directories License: GPL-2.0-or-later AND MIT @@ -46,6 +46,9 @@ homedirectory based on the defaults configured by the administrator. %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.18-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 0.18-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 94925d846b9501d35ce70dbabcda8136940c172e Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 12 Feb 2025 21:28:39 -0500 Subject: [PATCH 12/25] Backport patches to install systemd units to fix initialization races (#2319081) - Fix minor spec formatting inconsistencies --- ...-service-to-run-xdg-user-dirs-update.patch | 57 +++++++++++++++++++ 0002-Install-systemd-service-file.patch | 51 +++++++++++++++++ xdg-user-dirs.spec | 34 ++++++++--- 3 files changed, 133 insertions(+), 9 deletions(-) create mode 100644 0001-Add-a-systemd-service-to-run-xdg-user-dirs-update.patch create mode 100644 0002-Install-systemd-service-file.patch diff --git a/0001-Add-a-systemd-service-to-run-xdg-user-dirs-update.patch b/0001-Add-a-systemd-service-to-run-xdg-user-dirs-update.patch new file mode 100644 index 0000000..e0b07af --- /dev/null +++ b/0001-Add-a-systemd-service-to-run-xdg-user-dirs-update.patch @@ -0,0 +1,57 @@ +From 2a63d3f0ffb76135790bb1168a3270a599904380 Mon Sep 17 00:00:00 2001 +From: David Redondo +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 + diff --git a/0002-Install-systemd-service-file.patch b/0002-Install-systemd-service-file.patch new file mode 100644 index 0000000..1d4a0f4 --- /dev/null +++ b/0002-Install-systemd-service-file.patch @@ -0,0 +1,51 @@ +From 1512365de068446f8b5e14163601dd71e34e8bc1 Mon Sep 17 00:00:00 2001 +From: David Redondo +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 + diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index e03dfa1..088ca39 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,29 +3,40 @@ Name: xdg-user-dirs Version: 0.18 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Handles user special directories License: GPL-2.0-or-later AND MIT URL: https://freedesktop.org/wiki/Software/xdg-user-dirs Source0: https://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz -BuildRequires: make -BuildRequires: gcc -BuildRequires: gettext -BuildRequires: docbook-style-xsl -BuildRequires: libxslt -Requires: %{_sysconfdir}/xdg/autostart +# Backports from upstream +Patch0001: 0001-Add-a-systemd-service-to-run-xdg-user-dirs-update.patch +Patch0002: 0002-Install-systemd-service-file.patch + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: make +BuildRequires: gcc +BuildRequires: gettext-devel +BuildRequires: git-core +BuildRequires: docbook-style-xsl +BuildRequires: libxslt +BuildRequires: systemd-rpm-macros +Requires: %{_sysconfdir}/xdg/autostart %description Contains xdg-user-dirs-update that updates folders in a users homedirectory based on the defaults configured by the administrator. %prep -%setup -q +%autosetup -S git_am + +%conf +autoreconf -fiv +%configure %build -%configure %make_build %install @@ -43,9 +54,14 @@ homedirectory based on the defaults configured by the administrator. %{_sysconfdir}/xdg/autostart/* %{_mandir}/man1/* %{_mandir}/man5/* +%{_userunitdir}/xdg-user-dirs.service %changelog +* Thu Feb 13 2025 Neal Gompa - 0.18-7 +- Backport patches to install systemd units to fix initialization races (#2319081) +- Fix minor spec formatting inconsistencies + * Sun Jan 19 2025 Fedora Release Engineering - 0.18-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From efc91671ba51a32dbc30e6364dc79e67e9d1c692 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 17 Feb 2025 08:03:54 -0500 Subject: [PATCH 13/25] Add scriptlets for systemd user unit --- xdg-user-dirs.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index 088ca39..230dd06 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,7 +3,7 @@ Name: xdg-user-dirs Version: 0.18 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Handles user special directories License: GPL-2.0-or-later AND MIT @@ -45,6 +45,16 @@ autoreconf -fiv %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 %license COPYING %doc NEWS AUTHORS README @@ -58,6 +68,9 @@ autoreconf -fiv %changelog +* Mon Feb 17 2025 Neal Gompa - 0.18-8 +- Add scriptlets for systemd user unit + * Thu Feb 13 2025 Neal Gompa - 0.18-7 - Backport patches to install systemd units to fix initialization races (#2319081) - Fix minor spec formatting inconsistencies From fa502809cfdbf3479c7cc4ae619c1fd0fc124ff4 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 20 Feb 2025 05:39:22 -0500 Subject: [PATCH 14/25] Do not install the systemd unit on - 0.18-9 +- Do not install the systemd unit on - 0.18-8 - Add scriptlets for systemd user unit From 1acf758f9456c6047ffa4acf8394b1e42ba50e03 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 23 Jun 2025 23:47:13 -0400 Subject: [PATCH 15/25] Fix build with gettext-0.25 While previous versions of gettext installed its macros into /usr/share/aclocal where they were always discoverable, as of gettext 0.25, they are installed into a package-specific directory. For autopoint to be called in order to copy them into the tree, AM_GNU_GETTEXT[_REQUIRE]_VERSION must be declared before AM_GNU_GETTEXT. --- 0003-Fix-autopoint-invocation.patch | 26 ++++++++++++++++++++++++++ xdg-user-dirs.spec | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 0003-Fix-autopoint-invocation.patch diff --git a/0003-Fix-autopoint-invocation.patch b/0003-Fix-autopoint-invocation.patch new file mode 100644 index 0000000..57a22fc --- /dev/null +++ b/0003-Fix-autopoint-invocation.patch @@ -0,0 +1,26 @@ +From 12abdfa4c6b193e1ceb48ec44ed253840bb4fcc5 Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +Date: Tue, 24 Jun 2025 03:41:34 +0000 +Subject: [PATCH] Fix autopoint invocation + +AM_GNU_GETTEXT[_REQUIRE]_VERSION must be called before AM_GNU_GETTEXT in +order for autopoint to work or to be called by autoreconf. +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index dc389db..8392f2f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,6 +20,7 @@ GETTEXT_PACKAGE=xdg-user-dirs + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name]) + AC_SUBST(GETTEXT_PACKAGE) + ++AM_GNU_GETTEXT_REQUIRE_VERSION([0.14.4]) + AM_GNU_GETTEXT([external]) + + dnl ========================================================================== +-- +GitLab + diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index 7ea27e3..c7f93d3 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -13,6 +13,8 @@ Source0: https://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz # Backports from upstream Patch0001: 0001-Add-a-systemd-service-to-run-xdg-user-dirs-update.patch Patch0002: 0002-Install-systemd-service-file.patch +# https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/merge_requests/16 +Patch0003: 0003-Fix-autopoint-invocation.patch BuildRequires: autoconf BuildRequires: automake @@ -37,7 +39,7 @@ homedirectory based on the defaults configured by the administrator. %autosetup -S git_am %conf -autoreconf -fiv +autoreconf -fiv -I ./m4 %configure %build From 0fedc65c217496cd889099462fe50963d9af5d94 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 24 Jun 2025 08:40:38 +0200 Subject: [PATCH 16/25] Bump version and update %changelog for the previous commit --- xdg-user-dirs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index c7f93d3..4c1fa4d 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,7 +3,7 @@ Name: xdg-user-dirs Version: 0.18 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Handles user special directories License: GPL-2.0-or-later AND MIT @@ -82,6 +82,9 @@ rm -rf %{buildroot}%{_userunitdir} %changelog +* Mon Jun 23 2025 Yaakov Selkowitz - 0.18-10 +- Fix build with gettext-0.25 + * Thu Feb 20 2025 Neal Gompa - 0.18-9 - Do not install the systemd unit on Date: Fri, 25 Jul 2025 20:43:05 +0000 Subject: [PATCH 17/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xdg-user-dirs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index 4c1fa4d..3252ea1 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,7 +3,7 @@ Name: xdg-user-dirs Version: 0.18 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Handles user special directories License: GPL-2.0-or-later AND MIT @@ -82,6 +82,9 @@ rm -rf %{buildroot}%{_userunitdir} %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.18-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 23 2025 Yaakov Selkowitz - 0.18-10 - Fix build with gettext-0.25 From d3cabb00b627d31984064f22acf0bfaedacc5394 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:32:56 +0000 Subject: [PATCH 18/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xdg-user-dirs.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index 3252ea1..d8e8da6 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,7 +3,7 @@ Name: xdg-user-dirs Version: 0.18 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Handles user special directories License: GPL-2.0-or-later AND MIT @@ -82,6 +82,9 @@ rm -rf %{buildroot}%{_userunitdir} %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0.18-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 0.18-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 2ff4b580696fd95bd6c2b59c7dd50330dcbe1302 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 18 Mar 2026 15:42:41 +0100 Subject: [PATCH 19/25] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 183 ++++++++++++++++++++++++++++++++++++++++++++ xdg-user-dirs.spec | 186 +-------------------------------------------- 2 files changed, 185 insertions(+), 184 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..3b9892a --- /dev/null +++ b/changelog @@ -0,0 +1,183 @@ +* Sat Jan 17 2026 Fedora Release Engineering - 0.18-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 0.18-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Jun 23 2025 Yaakov Selkowitz - 0.18-10 +- Fix build with gettext-0.25 + +* Thu Feb 20 2025 Neal Gompa - 0.18-9 +- Do not install the systemd unit on - 0.18-8 +- Add scriptlets for systemd user unit + +* Thu Feb 13 2025 Neal Gompa - 0.18-7 +- Backport patches to install systemd units to fix initialization races (#2319081) +- Fix minor spec formatting inconsistencies + +* Sun Jan 19 2025 Fedora Release Engineering - 0.18-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 0.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 0.18-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 0.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Dec 19 2022 David King - 0.18-1 +- Update to 0.18 (#2135324) + +* Sat Jul 23 2022 Fedora Release Engineering - 0.17-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.17-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.17-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 0.17-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Sep 21 2020 FeRD (Frank Dana) - 0.17-7 +- Drop fuzzy translations patch, no longer necessary + +* Wed Jul 29 2020 Fedora Release Engineering - 0.17-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 0.17-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 0.17-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 0.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 0.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Mar 14 2018 Kalev Lember - 0.17-1 +- Update to 0.17 + +* Fri Feb 09 2018 Fedora Release Engineering - 0.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Aug 21 2017 Kalev Lember - 0.16-1 +- Update to 0.16 +- Use license macro for COPYING +- Use make_build and make_install macros + +* Thu Aug 03 2017 Fedora Release Engineering - 0.15-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.15-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.15-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 0.15-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Sep 9 2015 Rui Matos - 0.15-7 +- Change the xinit.d script to an xdg autostart file +Resolves: #1259896 + +* Fri Jun 19 2015 Fedora Release Engineering - 0.15-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Feb 21 2015 Till Maas - 0.15-5 +- Rebuilt for Fedora 23 Change + https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code + +* Mon Aug 18 2014 Fedora Release Engineering - 0.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 0.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Jun 27 2013 Matthias Clasen - 0.15-1 +- Man pages +- Translation updates +- Trim %%changelog + +* Fri Feb 15 2013 Fedora Release Engineering - 0.14-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 0.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jan 14 2012 Fedora Release Engineering - 0.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue May 3 2011 Alexander Larsson - 0.14-1 +- Update to 0.14 (new translations) + +* Mon Feb 07 2011 Fedora Release Engineering - 0.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Sep 29 2010 jkeating - 0.13-2 +- Rebuilt for gcc bug 634757 + +* Mon Sep 13 2010 Alexander Larsson - 0.13-1 +- Update to 0.13 with new translations + +* Wed Mar 24 2010 Tomas Bzatek - 0.12-1 +- Update to 0.12 which only has a few new translations of Downloads +- Use fuzzy translations (for Downloads) (#532399) +- Fix a typo in README + +* Fri Sep 25 2009 Alexander Larsson - 0.11-1 +- Update to 0.11 + +* Mon Jul 27 2009 Fedora Release Engineering - 0.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Feb 26 2009 Fedora Release Engineering - 0.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun May 4 2008 Matthias Clasen - 0.10-3 +- Fix source url again +- Fix license tag + +* Mon Mar 17 2008 Matthias Clasen - 0.10-2 +- Fix Source URL + +* Tue Feb 12 2008 Alexander Larsson - 0.10-1 +- Update to 0.10 (new translations) + +* Tue Aug 21 2007 Alexander Larsson - 0.9-1 +- Update to 0.9 (new translations) + +* Tue May 29 2007 Matthias Clasen - 0.8-2 +- Fix a possible crash. + +* Wed May 16 2007 - 0.8-1 +- Update to 0.8, (only) fixing bug that always recreated deleted directories (#240139) + +* Wed Apr 11 2007 Alexander Larsson - 0.6-1 +- Update to 0.6 (minor fixes) + +* Mon Mar 26 2007 Alexander Larsson - 0.5-1 +- update to 0.5 (more translations) + +* Wed Mar 7 2007 Alexander Larsson - 0.4-1 +- Update to 0.4 + +* Thu Mar 1 2007 Alexander Larsson - 0.3-1 +- Update to 0.3 + +* Fri Feb 23 2007 Alexander Larsson - 0.2-1 +- initial version diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index d8e8da6..46717d4 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -3,7 +3,7 @@ Name: xdg-user-dirs Version: 0.18 -Release: 12%{?dist} +Release: %autorelease Summary: Handles user special directories License: GPL-2.0-or-later AND MIT @@ -82,186 +82,4 @@ rm -rf %{buildroot}%{_userunitdir} %changelog -* Sat Jan 17 2026 Fedora Release Engineering - 0.18-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 0.18-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jun 23 2025 Yaakov Selkowitz - 0.18-10 -- Fix build with gettext-0.25 - -* Thu Feb 20 2025 Neal Gompa - 0.18-9 -- Do not install the systemd unit on - 0.18-8 -- Add scriptlets for systemd user unit - -* Thu Feb 13 2025 Neal Gompa - 0.18-7 -- Backport patches to install systemd units to fix initialization races (#2319081) -- Fix minor spec formatting inconsistencies - -* Sun Jan 19 2025 Fedora Release Engineering - 0.18-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 0.18-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 0.18-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 0.18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 0.18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Dec 19 2022 David King - 0.18-1 -- Update to 0.18 (#2135324) - -* Sat Jul 23 2022 Fedora Release Engineering - 0.17-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.17-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.17-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 0.17-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Sep 21 2020 FeRD (Frank Dana) - 0.17-7 -- Drop fuzzy translations patch, no longer necessary - -* Wed Jul 29 2020 Fedora Release Engineering - 0.17-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 0.17-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 0.17-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 0.17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Mar 14 2018 Kalev Lember - 0.17-1 -- Update to 0.17 - -* Fri Feb 09 2018 Fedora Release Engineering - 0.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Aug 21 2017 Kalev Lember - 0.16-1 -- Update to 0.16 -- Use license macro for COPYING -- Use make_build and make_install macros - -* Thu Aug 03 2017 Fedora Release Engineering - 0.15-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.15-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.15-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 0.15-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Sep 9 2015 Rui Matos - 0.15-7 -- Change the xinit.d script to an xdg autostart file -Resolves: #1259896 - -* Fri Jun 19 2015 Fedora Release Engineering - 0.15-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Feb 21 2015 Till Maas - 0.15-5 -- Rebuilt for Fedora 23 Change - https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code - -* Mon Aug 18 2014 Fedora Release Engineering - 0.15-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.15-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 0.15-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Jun 27 2013 Matthias Clasen - 0.15-1 -- Man pages -- Translation updates -- Trim %%changelog - -* Fri Feb 15 2013 Fedora Release Engineering - 0.14-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 0.14-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue May 3 2011 Alexander Larsson - 0.14-1 -- Update to 0.14 (new translations) - -* Mon Feb 07 2011 Fedora Release Engineering - 0.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Sep 29 2010 jkeating - 0.13-2 -- Rebuilt for gcc bug 634757 - -* Mon Sep 13 2010 Alexander Larsson - 0.13-1 -- Update to 0.13 with new translations - -* Wed Mar 24 2010 Tomas Bzatek - 0.12-1 -- Update to 0.12 which only has a few new translations of Downloads -- Use fuzzy translations (for Downloads) (#532399) -- Fix a typo in README - -* Fri Sep 25 2009 Alexander Larsson - 0.11-1 -- Update to 0.11 - -* Mon Jul 27 2009 Fedora Release Engineering - 0.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Feb 26 2009 Fedora Release Engineering - 0.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun May 4 2008 Matthias Clasen - 0.10-3 -- Fix source url again -- Fix license tag - -* Mon Mar 17 2008 Matthias Clasen - 0.10-2 -- Fix Source URL - -* Tue Feb 12 2008 Alexander Larsson - 0.10-1 -- Update to 0.10 (new translations) - -* Tue Aug 21 2007 Alexander Larsson - 0.9-1 -- Update to 0.9 (new translations) - -* Tue May 29 2007 Matthias Clasen - 0.8-2 -- Fix a possible crash. - -* Wed May 16 2007 - 0.8-1 -- Update to 0.8, (only) fixing bug that always recreated deleted directories (#240139) - -* Wed Apr 11 2007 Alexander Larsson - 0.6-1 -- Update to 0.6 (minor fixes) - -* Mon Mar 26 2007 Alexander Larsson - 0.5-1 -- update to 0.5 (more translations) - -* Wed Mar 7 2007 Alexander Larsson - 0.4-1 -- Update to 0.4 - -* Thu Mar 1 2007 Alexander Larsson - 0.3-1 -- Update to 0.3 - -* Fri Feb 23 2007 Alexander Larsson - 0.2-1 -- initial version +%autochangelog From 4bc278f74b1056a954026872dfafdd3abedaaa88 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 18 Mar 2026 16:14:12 +0100 Subject: [PATCH 20/25] Update to 0.19 --- .gitignore | 10 +--- ...-service-to-run-xdg-user-dirs-update.patch | 57 ------------------- 0002-Install-systemd-service-file.patch | 51 ----------------- 0003-Fix-autopoint-invocation.patch | 26 --------- sources | 2 +- xdg-user-dirs.spec | 15 +---- 6 files changed, 7 insertions(+), 154 deletions(-) delete mode 100644 0001-Add-a-systemd-service-to-run-xdg-user-dirs-update.patch delete mode 100644 0002-Install-systemd-service-file.patch delete mode 100644 0003-Fix-autopoint-invocation.patch diff --git a/.gitignore b/.gitignore index 32d8a19..dc8fae3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ -xdg-user-dirs-0.11.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 +/xdg-user-dirs-*.tar.gz +/xdg-user-dirs-*.tar.xz +/xdg-user-dirs-*-build diff --git a/0001-Add-a-systemd-service-to-run-xdg-user-dirs-update.patch b/0001-Add-a-systemd-service-to-run-xdg-user-dirs-update.patch deleted file mode 100644 index e0b07af..0000000 --- a/0001-Add-a-systemd-service-to-run-xdg-user-dirs-update.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 2a63d3f0ffb76135790bb1168a3270a599904380 Mon Sep 17 00:00:00 2001 -From: David Redondo -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 - diff --git a/0002-Install-systemd-service-file.patch b/0002-Install-systemd-service-file.patch deleted file mode 100644 index 1d4a0f4..0000000 --- a/0002-Install-systemd-service-file.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1512365de068446f8b5e14163601dd71e34e8bc1 Mon Sep 17 00:00:00 2001 -From: David Redondo -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 - diff --git a/0003-Fix-autopoint-invocation.patch b/0003-Fix-autopoint-invocation.patch deleted file mode 100644 index 57a22fc..0000000 --- a/0003-Fix-autopoint-invocation.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 12abdfa4c6b193e1ceb48ec44ed253840bb4fcc5 Mon Sep 17 00:00:00 2001 -From: Yaakov Selkowitz -Date: Tue, 24 Jun 2025 03:41:34 +0000 -Subject: [PATCH] Fix autopoint invocation - -AM_GNU_GETTEXT[_REQUIRE]_VERSION must be called before AM_GNU_GETTEXT in -order for autopoint to work or to be called by autoreconf. ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index dc389db..8392f2f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,6 +20,7 @@ GETTEXT_PACKAGE=xdg-user-dirs - AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name]) - AC_SUBST(GETTEXT_PACKAGE) - -+AM_GNU_GETTEXT_REQUIRE_VERSION([0.14.4]) - AM_GNU_GETTEXT([external]) - - dnl ========================================================================== --- -GitLab - diff --git a/sources b/sources index 32d11d8..50a318f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xdg-user-dirs-0.18.tar.gz) = f523b2ba4f840a3c2a5730f72182fb5bb798187db769bfb7d36e9f780442813278a2c1bad656b4fb38428131241a51d07200a62b4d7b935d49a74be53f969716 +SHA512 (xdg-user-dirs-0.19.tar.xz) = 09aafdaec38baf1b55a2d4f0cad619ae67e423bb1284923fa96cb56e98c5690e2211dfedec99540bec542d1106c0a2165a6539841b11a194717caa09026a659a diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index 46717d4..93abc92 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -1,20 +1,11 @@ -%global _changelog_trimtime %(date +%s -d "1 year ago") - - Name: xdg-user-dirs -Version: 0.18 +Version: 0.19 Release: %autorelease Summary: Handles user special directories License: GPL-2.0-or-later AND MIT URL: https://freedesktop.org/wiki/Software/xdg-user-dirs -Source0: https://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz - -# Backports from upstream -Patch0001: 0001-Add-a-systemd-service-to-run-xdg-user-dirs-update.patch -Patch0002: 0002-Install-systemd-service-file.patch -# https://gitlab.freedesktop.org/xdg/xdg-user-dirs/-/merge_requests/16 -Patch0003: 0003-Fix-autopoint-invocation.patch +Source0: https://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.xz BuildRequires: autoconf BuildRequires: automake @@ -69,7 +60,7 @@ rm -rf %{buildroot}%{_userunitdir} %files -f %{name}.lang %license COPYING -%doc NEWS AUTHORS README +%doc NEWS AUTHORS README.md %{_bindir}/* %config(noreplace) %{_sysconfdir}/xdg/user-dirs.conf %config(noreplace) %{_sysconfdir}/xdg/user-dirs.defaults From 8c823cb6ea146c7508bbc099a6721e0029cda79b Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 25 Mar 2026 14:35:39 +0100 Subject: [PATCH 21/25] Add configuration for release-monitoring --- monitoring.toml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 monitoring.toml diff --git a/monitoring.toml b/monitoring.toml new file mode 100644 index 0000000..e80fbc5 --- /dev/null +++ b/monitoring.toml @@ -0,0 +1,13 @@ +# Enable/disable monitoring +monitoring = true +# Enable/disable filling bugzilla ticket for new release +# When disabled it will also disable scratch builds +bugzilla = true +# Enable/disable reporting only stable versions +# Stable versions are recognized based on release-monitoring.org project settings +stable_only = false +# Enable/disable reporting all new versions instead of the latest one +# Enabling this will disable scratch builds +all_versions = false +# Enable/disable scratch build for newly opened version +scratch_build = false From 537ca910b5ecb4fb6170dee7982d4041753c6220 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 25 Mar 2026 18:55:52 +0100 Subject: [PATCH 22/25] Restore release monitoring to original behavior [skip changelog] --- monitoring.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitoring.toml b/monitoring.toml index e80fbc5..fc852a3 100644 --- a/monitoring.toml +++ b/monitoring.toml @@ -1,5 +1,5 @@ # Enable/disable monitoring -monitoring = true +monitoring = false # Enable/disable filling bugzilla ticket for new release # When disabled it will also disable scratch builds bugzilla = true From 33373ae04d62d310fcc64dbbf441e1da99ed5bfe Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Wed, 6 May 2026 17:30:22 -0500 Subject: [PATCH 23/25] Remove old conditionals from spec file [skip changelog] --- xdg-user-dirs.spec | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index 93abc92..b0a6faf 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -16,9 +16,6 @@ BuildRequires: git-core BuildRequires: docbook-style-xsl BuildRequires: libxslt BuildRequires: systemd-rpm-macros -%if 0%{?fedora} && 0%{?fedora} < 42 -BuildRequires: desktop-file-utils -%endif Requires: %{_sysconfdir}/xdg/autostart @@ -41,12 +38,6 @@ autoreconf -fiv -I ./m4 %find_lang %name -%if 0%{?fedora} && 0%{?fedora} < 42 -desktop-file-edit --remove-key=X-systemd-skip %{buildroot}%{_sysconfdir}/xdg/autostart/xdg-user-dirs.desktop -rm -rf %{buildroot}%{_userunitdir} -%endif - -%if ! (0%{?fedora} && 0%{?fedora} < 42) %post %systemd_user_post xdg-user-dirs.service @@ -55,7 +46,6 @@ rm -rf %{buildroot}%{_userunitdir} %postun %systemd_user_postun_with_reload xdg-user-dirs.service -%endif %files -f %{name}.lang @@ -67,9 +57,7 @@ rm -rf %{buildroot}%{_userunitdir} %{_sysconfdir}/xdg/autostart/* %{_mandir}/man1/* %{_mandir}/man5/* -%if ! (0%{?fedora} && 0%{?fedora} < 42) %{_userunitdir}/xdg-user-dirs.service -%endif %changelog From 482754d6ae0dc68a6fa975c4c95f325f71651625 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Wed, 6 May 2026 17:31:08 -0500 Subject: [PATCH 24/25] Update to 0.20 --- sources | 2 +- xdg-user-dirs.spec | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/sources b/sources index 50a318f..95ad3cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xdg-user-dirs-0.19.tar.xz) = 09aafdaec38baf1b55a2d4f0cad619ae67e423bb1284923fa96cb56e98c5690e2211dfedec99540bec542d1106c0a2165a6539841b11a194717caa09026a659a +SHA512 (xdg-user-dirs-0.20.tar.xz) = 4793fa246bc846cf5c28c0715c112cfd077dd2036ae3e27163949b711dcb6f65582a29c1e8993472538f92825cbff1c8537015ddaac8798aa6f2d6de64dcb47d diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index b0a6faf..1cc93b3 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -1,5 +1,5 @@ Name: xdg-user-dirs -Version: 0.19 +Version: 0.20 Release: %autorelease Summary: Handles user special directories @@ -7,9 +7,7 @@ License: GPL-2.0-or-later AND MIT URL: https://freedesktop.org/wiki/Software/xdg-user-dirs Source0: https://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.xz -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: make +BuildRequires: meson BuildRequires: gcc BuildRequires: gettext-devel BuildRequires: git-core @@ -24,18 +22,14 @@ Contains xdg-user-dirs-update that updates folders in a users homedirectory based on the defaults configured by the administrator. %prep -%autosetup -S git_am - -%conf -autoreconf -fiv -I ./m4 -%configure +%autosetup -p1 %build -%make_build +%meson +%meson_build %install -%make_install - +%meson_install %find_lang %name %post From 73c777266f64c6d8962074278f767483b007606a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:06:16 +0000 Subject: [PATCH 25/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild