diff --git a/.gitignore b/.gitignore index 938f499..0070639 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ usermode-1.105.tar.xz /usermode-1.109.tar.xz /usermode-1.110.tar.xz /usermode-1.111.tar.xz +/usermode-1.112.tar.xz diff --git a/sources b/sources index 7fc5776..dd92272 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -28ba510fbd8da9f4e86e57d6c31cff29 usermode-1.111.tar.xz +SHA512 (usermode-1.112.tar.xz) = 2c975eea65c74b0b05d9f2faf767862e55ace042b3c6bf072a8cabb724841c3c1e7f55be8afcff459ba599b2077d96c44e11dac4d3cc051cd39ab1e9e3b6451d diff --git a/translations.patch b/translations.patch new file mode 100644 index 0000000..b5365bf --- /dev/null +++ b/translations.patch @@ -0,0 +1,14 @@ +diff --git a/po/tr.po b/po/tr.po +index 84e5021..a28e947 100644 +--- a/po/tr.po ++++ b/po/tr.po +@@ -408,7 +408,7 @@ msgstr "Grafik pencere açılamadı ve uçbirim denetimi bulunamadı.\n" + #: ../../po/../userpasswd.c:37 + #, c-format + msgid "Unexpected command-line arguments\n" +-msgstr "Beklenmeyen komut satırı argümanları" ++msgstr "Beklenmeyen komut satırı argümanları\n" + + #: ../../po/../userinfo.c:411 + #, c-format + diff --git a/usermode-1.111-format-security.patch b/usermode-1.111-format-security.patch deleted file mode 100644 index efd1c49..0000000 --- a/usermode-1.111-format-security.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit b562472980ecd903d13e69279a31fcf77fac57bc -Author: Miloslav Trmač -Date: Mon Apr 24 21:58:56 2017 +0200 - - Don't unnecessarily use g_strdup_printf() - - This avoids a build failure with Werror=format-security. - -diff --git a/userhelper.c b/userhelper.c -index 15d2c5e..287aa4d 100644 ---- a/userhelper.c -+++ b/userhelper.c -@@ -583,7 +583,7 @@ converse_console(int num_msg, const struct pam_message **msg, - - if (banner == 0) { - if ((data->banner != NULL) && (data->domain != NULL)) { -- text = g_strdup_printf(dgettext(data->domain, data->banner)); -+ text = g_strdup (dgettext(data->domain, data->banner)); - } else { - if ((service != NULL) && (strlen(service) > 0)) { - if (data->fallback_allowed) { diff --git a/usermode.spec b/usermode.spec index 062228d..c79e802 100644 --- a/usermode.spec +++ b/usermode.spec @@ -1,14 +1,14 @@ Summary: Tools for certain user account management tasks Name: usermode -Version: 1.111 -Release: 14%{?dist} +Version: 1.112 +Release: 1%{?dist} License: GPLv2+ Group: Applications/System URL: https://pagure.io/usermode/ Source: https://releases.pagure.org/usermode/usermode-%{version}.tar.xz Source1: config-util -# Upstream commit b562472980ecd903d13e69279a31fcf77fac57bc -Patch0: usermode-1.111-format-security.patch +# Corrects missing `\n' in `po/tr.po' +Patch0: translations.patch Requires: pam, passwd, util-linux # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJFYI5Q2BYZKIGDFS2WLOBDUSEGWHIKV/ BuildRequires: gcc @@ -41,8 +41,8 @@ graphical tools for certain account management tasks. %prep %setup -q - -%patch0 -p1 -b .format-security +%patch0 -p1 +./autogen.sh %build %configure --with-selinux @@ -96,6 +96,10 @@ done %{_datadir}/applications/* %changelog +* Thu Feb 22 2018 Jiri Kucera - 1.112-1 +- Update to usermode-1.112 + Resolves #1269643 + * Wed Feb 21 2018 Jiri Kucera - 1.111-14 - Added missing gcc dependency