commit
338b979417
@ -0,0 +1 @@
|
|||||||
|
SOURCES/xdg-user-dirs-gtk-0.10.tar.xz
|
@ -0,0 +1 @@
|
|||||||
|
7af51ac84ca269377a9699482e43a03b87d4277c SOURCES/xdg-user-dirs-gtk-0.10.tar.xz
|
@ -0,0 +1,91 @@
|
|||||||
|
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,12 @@
|
|||||||
|
diff -up xdg-user-dirs-gtk-0.10/user-dirs-update-gtk.desktop.in.mate xdg-user-dirs-gtk-0.10/user-dirs-update-gtk.desktop.in
|
||||||
|
--- xdg-user-dirs-gtk-0.10/user-dirs-update-gtk.desktop.in.mate 2014-01-27 19:09:55.954616086 -0500
|
||||||
|
+++ xdg-user-dirs-gtk-0.10/user-dirs-update-gtk.desktop.in 2014-01-27 19:10:02.965602005 -0500
|
||||||
|
@@ -4,7 +4,7 @@ Exec=xdg-user-dirs-gtk-update
|
||||||
|
_Name=User folders update
|
||||||
|
_Comment=Update common folders names to match current locale
|
||||||
|
Terminal=false
|
||||||
|
-OnlyShowIn=GNOME;LXDE;Unity;
|
||||||
|
+OnlyShowIn=GNOME;LXDE;Unity;MATE;
|
||||||
|
Type=Application
|
||||||
|
StartupNotify=false
|
||||||
|
X-KDE-autostart-after=panel
|
@ -0,0 +1,195 @@
|
|||||||
|
Name: xdg-user-dirs-gtk
|
||||||
|
Version: 0.10
|
||||||
|
Release: 22%{?dist}
|
||||||
|
Summary: Gnome integration of special directories
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
# upstream fix
|
||||||
|
Patch0: 0001-Make-the-Don-t-ask-again-checkbox-work-properly.patch
|
||||||
|
|
||||||
|
Patch1: show-in-mate.patch
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: gcc
|
||||||
|
BuildRequires: desktop-file-utils
|
||||||
|
BuildRequires: gettext
|
||||||
|
BuildRequires: gtk3-devel
|
||||||
|
BuildRequires: intltool
|
||||||
|
BuildRequires: xdg-user-dirs
|
||||||
|
|
||||||
|
Requires: xdg-user-dirs
|
||||||
|
|
||||||
|
%description
|
||||||
|
Contains some integration of xdg-user-dirs with the gnome
|
||||||
|
desktop, including creating default bookmarks and detecting
|
||||||
|
locale changes.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
%configure
|
||||||
|
%make_build
|
||||||
|
|
||||||
|
|
||||||
|
%install
|
||||||
|
%make_install
|
||||||
|
|
||||||
|
%find_lang %name
|
||||||
|
|
||||||
|
desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/user-dirs-update-gtk.desktop
|
||||||
|
|
||||||
|
|
||||||
|
%files -f %{name}.lang
|
||||||
|
%doc NEWS AUTHORS README ChangeLog COPYING
|
||||||
|
%{_bindir}/*
|
||||||
|
%config(noreplace) %{_sysconfdir}/xdg/autostart/user-dirs-update-gtk.desktop
|
||||||
|
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.10-22
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.10-21
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-12
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.10-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 0.10-7
|
||||||
|
- Rebuilt for Fedora 23 Change
|
||||||
|
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
|
||||||
|
|
||||||
|
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jan 27 2014 Matthias Clasen <mclasen@redhat.com> - 0.10-4
|
||||||
|
- Add Mate to OnlyShowIn
|
||||||
|
|
||||||
|
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu May 30 2013 Matthias Clasen <mclasen@redhat.com> - 0.10-2
|
||||||
|
- Make 'Don't ask again' checkbox work properly (#968955)
|
||||||
|
|
||||||
|
* Wed Feb 06 2013 Kalev Lember <kalevlember@gmail.com> - 0.10-1
|
||||||
|
- Update to 0.10
|
||||||
|
|
||||||
|
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Apr 11 2012 Kalev Lember <kalevlember@gmail.com> - 0.9-1
|
||||||
|
- Update to 0.9
|
||||||
|
- Adjust BuildRequires to build with gtk3
|
||||||
|
- Drop lxde patch, merged upstream
|
||||||
|
- Validate the desktop file
|
||||||
|
|
||||||
|
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Nov 18 2011 Adam Jackson <ajax@redhat.com> 0.8-7
|
||||||
|
- Rebuild to break bogus libpng dep
|
||||||
|
|
||||||
|
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 13 2010 Matthias Clasen <mclasen@redhat.com>
|
||||||
|
- Work in LXDE too (#563827)
|
||||||
|
|
||||||
|
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Sep 8 2008 Tomas Bzatek <tbzatek@redhat.com> - 0.8-2
|
||||||
|
- Require intltool
|
||||||
|
|
||||||
|
* Fri Sep 5 2008 Matthias Clasen <mclasen@redhat.com> - 0.8-1
|
||||||
|
- Update to 0.8
|
||||||
|
|
||||||
|
* Tue Aug 12 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 0.7-2
|
||||||
|
- Fix license tag.
|
||||||
|
|
||||||
|
* Tue Feb 12 2008 Alexander Larsson <alexl@redhat.com> - 0.7-1
|
||||||
|
- Update to 0.7
|
||||||
|
- Uncomment missing patches
|
||||||
|
|
||||||
|
* Sun Nov 4 2007 Matthias Clasen <mclasen@redhat.com> - 0.6-4
|
||||||
|
- Correct the URL
|
||||||
|
|
||||||
|
* Mon Oct 1 2007 Matthias Clasen <mclasen@redhat.com> - 0.6-2
|
||||||
|
- Fix the special case for en_US (#307881)
|
||||||
|
|
||||||
|
* Tue Aug 21 2007 Alexander Larsson <alexl@redhat.com> - 0.6-1
|
||||||
|
- Update to 0.6 (new translations)
|
||||||
|
|
||||||
|
* Fri Jul 6 2007 Matthias Clasen <mclasen@redhat.com> - 0.5-2
|
||||||
|
- Make the autostart file work in KDE (#247304)
|
||||||
|
|
||||||
|
* Wed Apr 25 2007 <alexl@redhat.com> - 0.5-1
|
||||||
|
- Update to 0.5
|
||||||
|
- Fixes silly dialog when no translations (#237384)
|
||||||
|
|
||||||
|
* Wed Apr 11 2007 Alexander Larsson <alexl@redhat.com> - 0.4-1
|
||||||
|
- update to 0.4 (#234512)
|
||||||
|
|
||||||
|
* Tue Mar 6 2007 Alexander Larsson <alexl@redhat.com> - 0.3-1
|
||||||
|
- update to 0.3
|
||||||
|
- Add xdg-user-dirs buildreq
|
||||||
|
|
||||||
|
* Fri Mar 2 2007 Alexander Larsson <alexl@redhat.com> - 0.2-1
|
||||||
|
- Update to 0.2
|
||||||
|
|
||||||
|
* Fri Mar 2 2007 Alexander Larsson <alexl@redhat.com> - 0.1-2
|
||||||
|
- Add buildrequires
|
||||||
|
- Mark autostart file as config
|
||||||
|
|
||||||
|
* Wed Feb 28 2007 Alexander Larsson <alexl@redhat.com> - 0.1-1
|
||||||
|
- Initial version
|
||||||
|
|
Loading…
Reference in new issue