Compare commits
No commits in common. "c9s" and "c8" have entirely different histories.
7
.gitignore
vendored
7
.gitignore
vendored
@ -1,6 +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
|
|
||||||
|
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
|
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-$@
|
@ -3,15 +3,17 @@
|
|||||||
|
|
||||||
Name: xdg-user-dirs
|
Name: xdg-user-dirs
|
||||||
Version: 0.17
|
Version: 0.17
|
||||||
Release: 10%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Handles user special directories
|
Summary: Handles user special directories
|
||||||
|
|
||||||
License: GPLv2+ and MIT
|
License: GPLv2+ and MIT
|
||||||
URL: http://freedesktop.org/wiki/Software/xdg-user-dirs
|
URL: http://freedesktop.org/wiki/Software/xdg-user-dirs
|
||||||
Source0: http://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz
|
Source0: http://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
BuildRequires: make
|
# use fuzzy translations (for Downloads)
|
||||||
BuildRequires: gcc
|
# https://bugzilla.redhat.com/show_bug.cgi?id=532399
|
||||||
|
Patch0: use-fuzzy.patch
|
||||||
|
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: docbook-style-xsl
|
BuildRequires: docbook-style-xsl
|
||||||
BuildRequires: libxslt
|
BuildRequires: libxslt
|
||||||
@ -23,6 +25,7 @@ homedirectory based on the defaults configured by the administrator.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1 -b .use-fuzzy
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
@ -50,34 +53,6 @@ make update-gmo
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.17-10
|
|
||||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
|
||||||
Related: rhbz#1991688
|
|
||||||
|
|
||||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.17-9
|
|
||||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
|
||||||
|
|
||||||
* 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-9
|
|
||||||
decision_context: osci_compose_gate
|
|
||||||
rules:
|
|
||||||
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
|
|
1
sources
1
sources
@ -1 +0,0 @@
|
|||||||
SHA512 (xdg-user-dirs-0.17.tar.gz) = a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
|
|
@ -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)
|
|
||||||
{
|
|
Loading…
Reference in New Issue
Block a user