Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
|
|
@ -1 +1,4 @@
|
|||
SOURCES/xdg-user-dirs-gtk-0.10.tar.xz
|
||||
xdg-user-dirs-gtk-0.8.tar.bz2
|
||||
/xdg-user-dirs-gtk-0.9.tar.xz
|
||||
/xdg-user-dirs-gtk-0.10.tar.xz
|
||||
/xdg-user-dirs-gtk-0.11.tar.xz
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
7af51ac84ca269377a9699482e43a03b87d4277c SOURCES/xdg-user-dirs-gtk-0.10.tar.xz
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
From 9c19d7fedadf38cc4fec21efdb3908572448f658 Mon Sep 17 00:00:00 2001
|
||||
From: Matthias Clasen <mclasen@redhat.com>
|
||||
Date: Thu, 30 May 2013 19:21:11 -0400
|
||||
Subject: [PATCH] Make the 'Don't ask again' checkbox work properly
|
||||
|
||||
We used to remove the user-dirs.locale file when this is checked,
|
||||
but that prevents xdg-user-dirs-gtk-update from ever running again.
|
||||
Instead, update it with the current locale. This has the effect
|
||||
of keeping xdg-user-dirs-gtk-update from running until the locale
|
||||
changes again, which is probably closer to the intended effect.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=968955
|
||||
---
|
||||
update.c | 40 +++++++++++++++++++++++++++++++---------
|
||||
1 file changed, 31 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/update.c b/update.c
|
||||
index 4697913..8710c79 100644
|
||||
--- a/update.c
|
||||
+++ b/update.c
|
||||
@@ -48,12 +48,40 @@ has_xdg_translation (void)
|
||||
if (strncmp (locale, "en_US", 5) == 0 ||
|
||||
strcmp (locale, "C") == 0)
|
||||
return TRUE;
|
||||
-
|
||||
+
|
||||
str = "Desktop";
|
||||
return dgettext ("xdg-user-dirs", str) != str;
|
||||
}
|
||||
|
||||
static void
|
||||
+save_locale (void)
|
||||
+{
|
||||
+ FILE *file;
|
||||
+ char *user_locale_file;
|
||||
+ char *locale, *dot;
|
||||
+
|
||||
+ user_locale_file = g_build_filename (g_get_user_config_dir (),
|
||||
+ "user-dirs.locale", NULL);
|
||||
+ file = fopen (user_locale_file, "w");
|
||||
+ g_free (user_locale_file);
|
||||
+
|
||||
+ if (file == NULL)
|
||||
+ {
|
||||
+ fprintf (stderr, "Can't save user-dirs.locale\n");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ locale = g_strdup (setlocale (LC_MESSAGES, NULL));
|
||||
+ /* Skip encoding part */
|
||||
+ dot = strchr (locale, '.');
|
||||
+ if (dot)
|
||||
+ *dot = 0;
|
||||
+ fprintf (file, "%s", locale);
|
||||
+ g_free (locale);
|
||||
+ fclose (file);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
update_locale (XdgDirEntry *old_entries)
|
||||
{
|
||||
XdgDirEntry *new_entries, *entry;
|
||||
@@ -91,10 +119,9 @@ update_locale (XdgDirEntry *old_entries)
|
||||
g_free (std_out);
|
||||
g_free (std_err);
|
||||
g_free (cmdline);
|
||||
-
|
||||
if (!WIFEXITED(exit_status) || WEXITSTATUS(exit_status) != 0)
|
||||
return;
|
||||
-
|
||||
+
|
||||
new_entries = parse_xdg_dirs (filename);
|
||||
g_unlink (filename);
|
||||
g_free (filename);
|
||||
@@ -254,12 +281,7 @@ update_locale (XdgDirEntry *old_entries)
|
||||
|
||||
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check)))
|
||||
{
|
||||
- char *file;
|
||||
-
|
||||
- file = g_build_filename (g_get_user_config_dir (),
|
||||
- "user-dirs.locale", NULL);
|
||||
- g_unlink (file);
|
||||
- g_free (file);
|
||||
+ save_locale ();
|
||||
}
|
||||
|
||||
g_free (new_entries);
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
||||
|
|
@ -0,0 +1 @@
|
|||
SHA512 (xdg-user-dirs-gtk-0.11.tar.xz) = 2a650c6372126f807ac90fb0508e1b11636b38b5960a3037b547e9f1bb1a6b82653f20da7d5aae1144eebec040e3af89a02fbf70c1768724019b384f6d9cf85a
|
||||
|
|
@ -1,22 +1,21 @@
|
|||
Name: xdg-user-dirs-gtk
|
||||
Version: 0.10
|
||||
Release: 13%{?dist}
|
||||
Version: 0.11
|
||||
Release: 5%{?dist}
|
||||
Summary: Gnome integration of special directories
|
||||
|
||||
Group: User Interface/Desktops
|
||||
License: GPL+
|
||||
URL: http://freedesktop.org/wiki/Software/xdg-user-dirs
|
||||
Source0: http://download.gnome.org/sources/xdg-user-dirs-gtk/%{version}/%{name}-%{version}.tar.xz
|
||||
License: GPL-2.0-or-later
|
||||
URL: https://gitlab.gnome.org/GNOME/xdg-user-dirs-gtk
|
||||
Source0: https://download.gnome.org/sources/xdg-user-dirs-gtk/%{version}/%{name}-%{version}.tar.xz
|
||||
|
||||
# upstream fix
|
||||
Patch0: 0001-Make-the-Don-t-ask-again-checkbox-work-properly.patch
|
||||
Patch0: show-in-mate.patch
|
||||
|
||||
Patch1: show-in-mate.patch
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: make
|
||||
BuildRequires: xdg-user-dirs
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
|
||||
Requires: xdg-user-dirs
|
||||
|
||||
|
|
@ -26,17 +25,15 @@ desktop, including creating default bookmarks and detecting
|
|||
locale changes.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%make_install
|
||||
|
||||
%find_lang %name
|
||||
|
||||
|
|
@ -44,12 +41,59 @@ desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/user-dirs-upda
|
|||
|
||||
|
||||
%files -f %{name}.lang
|
||||
%doc NEWS AUTHORS README ChangeLog COPYING
|
||||
%doc NEWS AUTHORS README ChangeLog
|
||||
%license COPYING
|
||||
%{_bindir}/*
|
||||
%config(noreplace) %{_sysconfdir}/xdg/autostart/user-dirs-update-gtk.desktop
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.11-5
|
||||
- Bump release for June 2024 mass rebuild
|
||||
|
||||
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.11-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.11-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.11-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Mon Dec 19 2022 David King <amigadave@amigadave.com> - 0.11-1
|
||||
- Update to 0.11 (#2135328)
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Fri Dec 11 2020 Timm Bäder <tbaeder@redhat.com> - 0.10-19
|
||||
- Use make macros
|
||||
- https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
Loading…
Reference in New Issue