Browse Source

xdg-user-dirs package update

Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>
master
guibuilder_pel7x64builder0 6 years ago
parent
commit
504ad724ee
  1. 45
      SOURCES/autostart.patch
  2. 22
      SOURCES/use-fuzzy.patch
  3. 180
      SOURCES/xdg-user-dirs-translations.patch
  4. 146
      SPECS/xdg-user-dirs.spec

45
SOURCES/autostart.patch

@ -0,0 +1,45 @@
From eff699165095bdc150d58e8dfca98af11c9ee2af Mon Sep 17 00:00:00 2001
From: Matthias Klumpp <matthias@tenstral.net>
Date: Thu, 17 Aug 2017 04:05:46 +0200
Subject: Add autostart .desktop file for user-dirs-update

The user-dirs update was traditionally done by an Xsession.d snippet,
which does not work in a Wayland session.
To avoid duplicating the .desktop file in every distribution, we ship it
upstream.

https://bugs.freedesktop.org/show_bug.cgi?id=102303

diff --git a/Makefile.am b/Makefile.am
index 9a40e68..a3ef127 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,9 @@ EXTRA_DIST= config.rpath translate.c autogen.sh \
xdgdir=$(sysconfdir)/xdg
xdg_DATA=user-dirs.conf user-dirs.defaults
+xdgautostartdir=$(xdgdir)/autostart
+xdgautostart_DATA = xdg-user-dirs.desktop
+
libraries = $(LIBINTL)
bin_PROGRAMS = \
diff --git a/xdg-user-dirs.desktop b/xdg-user-dirs.desktop
new file mode 100644
index 0000000..6b969d4
--- /dev/null
+++ b/xdg-user-dirs.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=User folders update
+TryExec=xdg-user-dirs-update
+Exec=xdg-user-dirs-update
+StartupNotify=false
+NoDisplay=true
+
+X-GNOME-Autostart-Phase=Initialization
+X-KDE-autostart-phase=1
--
cgit v0.10.2

22
SOURCES/use-fuzzy.patch

@ -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-$@

180
SOURCES/xdg-user-dirs-translations.patch

@ -0,0 +1,180 @@
From eff699165095bdc150d58e8dfca98af11c9ee2af Mon Sep 17 00:00:00 2001
From: git
Date: Thu, 17 Aug 2017 04:05:46 +0200
Subject: translations

This commit adds translations

diff --git a/po/pa.po b/po/pa.po
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,133 +1,132 @@
# Translation of xdg-user-dirs to Punjabi.
# Copyright (C) 2008 Red Hat, Inc
# This file is distributed under the same license as the PACKAGE package.
-#
+#
# A S Alam <aalam@users.sf.net>, 2007.
+# asaini <asaini@redhat.com>, 2013. #zanata
msgid ""
msgstr ""
"Project-Id-Version: xdg-user-dirs\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-06-27 10:18+0200\n"
-"PO-Revision-Date: 2007-02-27 04:43+0530\n"
-"Last-Translator: A S Alam <aalam@users.sf.net>\n"
+"PO-Revision-Date: 2013-10-08 08:16-0400\n"
+"Last-Translator: asaini <asaini@redhat.com>\n"
"Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
-"Language: pa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: pa\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Zanata 3.1.2\n"
-#: translate.c:2
+#: ../translate.c:2
msgid "Applications"
-msgstr ""
+msgstr "ਐਪਲਸ਼ਨ"
-#: translate.c:2
+#: ../translate.c:2
msgid "applications"
-msgstr ""
+msgstr "ਐਪਲਸ਼ਨ"
-#: translate.c:3
+#: ../translate.c:3
msgid "Desktop"
msgstr "ਡਸਕਟਪ"
-#: translate.c:3
+#: ../translate.c:3
msgid "desktop"
msgstr "ਡਸਕਟਪ"
-#: translate.c:4
+#: ../translate.c:4
msgid "Documents"
msgstr "ਦਸਤ"
-#: translate.c:4
+#: ../translate.c:4
msgid "documents"
msgstr "ਦਸਤ"
-#: translate.c:5
+#: ../translate.c:5
msgid "Download"
msgstr "ਡਊਨਲਡ"
-#: translate.c:5
+#: ../translate.c:5
msgid "download"
msgstr "ਡਊਨਲਡ"
-#: translate.c:6
-#, fuzzy
+#: ../translate.c:6
msgid "Downloads"
msgstr "ਡਊਨਲਡ"
-#: translate.c:6
-#, fuzzy
+#: ../translate.c:6
msgid "downloads"
msgstr "ਡਊਨਲਡ"
-#: translate.c:7
+#: ../translate.c:7
msgid "Movies"
msgstr "ਮ"
-#: translate.c:7
+#: ../translate.c:7
msgid "movies"
msgstr "ਮ"
-#: translate.c:8
+#: ../translate.c:8
msgid "Music"
msgstr "ਸਤ"
-#: translate.c:8
+#: ../translate.c:8
msgid "music"
msgstr "ਸਤ"
-#: translate.c:9
+#: ../translate.c:9
msgid "Photos"
msgstr "ਫ"
-#: translate.c:9
+#: ../translate.c:9
msgid "photos"
msgstr "ਫ"
-#: translate.c:10
+#: ../translate.c:10
msgid "Pictures"
msgstr "ਤਸਵ"
-#: translate.c:10
+#: ../translate.c:10
msgid "pictures"
msgstr "ਤਸਵ"
-#: translate.c:11
+#: ../translate.c:11
msgid "Projects"
msgstr "ਪਕਟ"
-#: translate.c:11
+#: ../translate.c:11
msgid "projects"
msgstr "ਪਕਟ"
-#: translate.c:12
+#: ../translate.c:12
msgid "Public"
msgstr "ਪਬਲਿਕ"
-#: translate.c:12
+#: ../translate.c:12
msgid "public"
msgstr "ਪਬਲਿਕ"
-#: translate.c:13
+#: ../translate.c:13
msgid "Share"
msgstr "ਸਝ"
-#: translate.c:13
+#: ../translate.c:13
msgid "share"
msgstr "ਸਝ"
-#: translate.c:14
+#: ../translate.c:14
msgid "Templates"
msgstr "ਨਮ"
-#: translate.c:14
+#: ../translate.c:14
msgid "templates"
msgstr "ਨਮ"
-#: translate.c:15
+#: ../translate.c:15
msgid "Videos"
msgstr "ਵਿਓ"
-#: translate.c:15
+#: ../translate.c:15
msgid "videos"
msgstr "ਵਿਓ"

146
SPECS/xdg-user-dirs.spec

@ -0,0 +1,146 @@
%global _changelog_trimtime %(date +%s -d "1 year ago")


Name: xdg-user-dirs
Version: 0.15
Release: 5%{?dist}
Summary: Handles user special directories

Group: User Interface/Desktops
License: GPLv2+ and MIT
URL: http://freedesktop.org/wiki/Software/xdg-user-dirs
Source0: http://user-dirs.freedesktop.org/releases/%{name}-%{version}.tar.gz

# use fuzzy translations (for Downloads)
# https://bugzilla.redhat.com/show_bug.cgi?id=532399
Patch0: use-fuzzy.patch
Patch1: xdg-user-dirs-translations.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1412762
Patch2: autostart.patch

BuildRequires: git
BuildRequires: gettext, autoconf, automake, intltool
BuildRequires: docbook-style-xsl
BuildRequires: libxslt
Requires: %{_sysconfdir}/X11/xinit/xinitrc.d

%description
Contains xdg-user-dirs-update that updates folders in a users
homedirectory based on the defaults configured by the administrator.

%prep
%autosetup -S git

autoreconf --force --install
%build
%configure
make %{?_smp_mflags}

cd po
touch *.po
make update-gmo

%install
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %name


%files -f %{name}.lang
%doc NEWS AUTHORS README COPYING
%{_bindir}/*
%config(noreplace) %{_sysconfdir}/xdg/user-dirs.conf
%config(noreplace) %{_sysconfdir}/xdg/user-dirs.defaults
%{_sysconfdir}/xdg/autostart/xdg-user-dirs.desktop
%{_mandir}/man1/*
%{_mandir}/man5/*


%changelog
* Thu Oct 05 2017 Ray Strode <rstrode@redhat.com> - 0.15-5
- Start using autostart mechanism instead of xinitrc.d script
Resolves: #1412762

* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.15-4
- Mass rebuild 2014-01-24

* Wed Jan 22 2014 Alexander Larsson <alexl@redhat.com> - 0.15-3
- Add missing translations
Resolves: rhbz#1030389

* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 0.15-2
- Mass rebuild 2013-12-27

* Thu Jun 27 2013 Matthias Clasen <mclasen@redhat.com> - 0.15-1
- Man pages
- Translation updates
- Trim %%changelog

* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.14-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

* Tue May 3 2011 Alexander Larsson <alexl@redhat.com> - 0.14-1
- Update to 0.14 (new translations)

* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 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 <alexl@redhat.com> - 0.13-1
- Update to 0.13 with new translations

* Wed Mar 24 2010 Tomas Bzatek <tbzatek@redhat.com> - 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 <alexl@redhat.com> - 0.11-1
- Update to 0.11

* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

* Sun May 4 2008 Matthias Clasen <mclasen@redhat.com> - 0.10-3
- Fix source url again
- Fix license tag

* Mon Mar 17 2008 Matthias Clasen <mclasen@redhat.com> - 0.10-2
- Fix Source URL

* Tue Feb 12 2008 Alexander Larsson <alexl@redhat.com> - 0.10-1
- Update to 0.10 (new translations)

* Tue Aug 21 2007 Alexander Larsson <alexl@redhat.com> - 0.9-1
- Update to 0.9 (new translations)

* Tue May 29 2007 Matthias Clasen <mclasen@redhat.com> - 0.8-2
- Fix a possible crash.

* Wed May 16 2007 <alexl@redhat.com> - 0.8-1
- Update to 0.8, (only) fixing bug that always recreated deleted directories (#240139)

* Wed Apr 11 2007 Alexander Larsson <alexl@redhat.com> - 0.6-1
- Update to 0.6 (minor fixes)

* Mon Mar 26 2007 Alexander Larsson <alexl@redhat.com> - 0.5-1
- update to 0.5 (more translations)

* Wed Mar 7 2007 Alexander Larsson <alexl@redhat.com> - 0.4-1
- Update to 0.4

* Thu Mar 1 2007 Alexander Larsson <alexl@redhat.com> - 0.3-1
- Update to 0.3

* Fri Feb 23 2007 Alexander Larsson <alexl@redhat.com> - 0.2-1
- initial version
Loading…
Cancel
Save