diff --git a/.gitignore b/.gitignore index c75e292..dc8fae3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +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-*.tar.gz +/xdg-user-dirs-*.tar.xz +/xdg-user-dirs-*-build 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/monitoring.toml b/monitoring.toml new file mode 100644 index 0000000..fc852a3 --- /dev/null +++ b/monitoring.toml @@ -0,0 +1,13 @@ +# Enable/disable monitoring +monitoring = false +# 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 diff --git a/sources b/sources index b1acc6f..95ad3cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xdg-user-dirs-0.17.tar.gz) = a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f +SHA512 (xdg-user-dirs-0.20.tar.xz) = 4793fa246bc846cf5c28c0715c112cfd077dd2036ae3e27163949b711dcb6f65582a29c1e8993472538f92825cbff1c8537015ddaac8798aa6f2d6de64dcb47d 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) - { diff --git a/xdg-user-dirs.spec b/xdg-user-dirs.spec index 358ab98..1cc93b3 100644 --- a/xdg-user-dirs.spec +++ b/xdg-user-dirs.spec @@ -1,189 +1,58 @@ -%global _changelog_trimtime %(date +%s -d "1 year ago") - - Name: xdg-user-dirs -Version: 0.17 -Release: 8%{?dist} +Version: 0.20 +Release: %autorelease 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 +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: make -BuildRequires: gcc -BuildRequires: gettext -BuildRequires: docbook-style-xsl -BuildRequires: libxslt -Requires: %{_sysconfdir}/xdg/autostart +BuildRequires: meson +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 -p1 %build -%configure -%make_build - -cd po -touch *.po -make update-gmo +%meson +%meson_build %install -%make_install - +%meson_install %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 +%doc NEWS AUTHORS README.md %{_bindir}/* %config(noreplace) %{_sysconfdir}/xdg/user-dirs.conf %config(noreplace) %{_sysconfdir}/xdg/user-dirs.defaults %{_sysconfdir}/xdg/autostart/* %{_mandir}/man1/* %{_mandir}/man5/* +%{_userunitdir}/xdg-user-dirs.service %changelog -* 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