Accepting request 950431 from GNOME:Next
Versionbump and mesonfix OBS-URL: https://build.opensuse.org/request/show/950431 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/malcontent?expand=0&rev=12
This commit is contained in:
Git OBS Bridge
parent
d90ea388e1
commit
8ed755a0fa
57
f433aaf8c8f82f0aeaedee664f08bc6fcad47b0d.patch
Normal file
57
f433aaf8c8f82f0aeaedee664f08bc6fcad47b0d.patch
Normal file
@ -0,0 +1,57 @@
|
||||
From f433aaf8c8f82f0aeaedee664f08bc6fcad47b0d Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Becker <heirecka@exherbo.org>
|
||||
Date: Wed, 12 Jan 2022 23:45:53 +0100
|
||||
Subject: [PATCH] Remove superfluous arguments to i18n.merge_file
|
||||
|
||||
It fixes the build with meson 0.61.0. The positional argument was
|
||||
ignored in the past, became a warning in meson 0.60 and a hard error
|
||||
starting with 0.61.0.
|
||||
---
|
||||
accounts-service/meson.build | 2 +-
|
||||
malcontent-control/meson.build | 6 +++---
|
||||
2 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/accounts-service/meson.build b/accounts-service/meson.build
|
||||
index 6942d2b..198692c 100644
|
||||
--- a/accounts-service/meson.build
|
||||
+++ b/accounts-service/meson.build
|
||||
@@ -1,4 +1,4 @@
|
||||
-i18n.merge_file('com.endlessm.ParentalControls.policy',
|
||||
+i18n.merge_file(
|
||||
input: 'com.endlessm.ParentalControls.policy.in',
|
||||
output: 'com.endlessm.ParentalControls.policy',
|
||||
po_dir: po_dir,
|
||||
diff --git a/malcontent-control/meson.build b/malcontent-control/meson.build
|
||||
index 8263306..d4ef3c1 100644
|
||||
--- a/malcontent-control/meson.build
|
||||
+++ b/malcontent-control/meson.build
|
||||
@@ -36,7 +36,7 @@ malcontent_control = executable('malcontent-control',
|
||||
install: true,
|
||||
)
|
||||
|
||||
-desktop_file = i18n.merge_file('desktop-file',
|
||||
+desktop_file = i18n.merge_file(
|
||||
type: 'desktop',
|
||||
input: '@0@.desktop.in'.format(application_id),
|
||||
output: '@0@.desktop'.format(application_id),
|
||||
@@ -57,7 +57,7 @@ if desktop_file_validate.found()
|
||||
)
|
||||
endif
|
||||
|
||||
-appdata_file = i18n.merge_file('appdata-file',
|
||||
+appdata_file = i18n.merge_file(
|
||||
input: '@0@.appdata.xml.in'.format(application_id),
|
||||
output: '@0@.appdata.xml'.format(application_id),
|
||||
po_dir: join_paths(meson.current_source_dir(), '..', 'po'),
|
||||
@@ -94,7 +94,7 @@ if xmllint.found()
|
||||
)
|
||||
endif
|
||||
|
||||
-policy_file = i18n.merge_file('policy-file',
|
||||
+policy_file = i18n.merge_file(
|
||||
input: '@0@.policy.in'.format(application_id),
|
||||
output: '@0@.policy'.format(application_id),
|
||||
po_dir: join_paths(meson.current_source_dir(), '..', 'po'),
|
||||
--
|
||||
GitLab
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c84f3a29bc1132b3b77412713b4f9a4ccae647cce95e6485e9af0938b486f9ba
|
||||
size 257220
|
||||
3
malcontent-0.10.3.tar.xz
Normal file
3
malcontent-0.10.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:70bf40961bf1c26a9b82f5c9c388c9de0af602e6ef117546e8f4f443611e5d6f
|
||||
size 258428
|
||||
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 1 12:58:52 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Update to version 0.10.3:
|
||||
+ Bugs fixed:
|
||||
- Do not make malcontent-control user uninstallable using gui
|
||||
- malcontent-control:
|
||||
. Fix an unterminated option entry array
|
||||
. Focus controls rather than user selector
|
||||
+ Updated translations.
|
||||
- Changes from version 0.10.2:
|
||||
+ Hide the launcher for malcontent-control from gnome-shell if
|
||||
using the GNOME desktop; find it via gnome-control-center
|
||||
instead
|
||||
+ Bugs fixed:
|
||||
- Limit depth of clone of subprojects
|
||||
- Rename master to main branch
|
||||
+ Updated translations.
|
||||
- Add f433aaf8c8f82f0aeaedee664f08bc6fcad47b0d.patch: Fix build
|
||||
with meson 0.61.0.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 28 13:36:51 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package malcontent
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,12 +17,15 @@
|
||||
|
||||
|
||||
Name: malcontent
|
||||
Version: 0.10.1
|
||||
Version: 0.10.3
|
||||
Release: 0
|
||||
Summary: Parental control system
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
URL: https://gitlab.freedesktop.org/pwithnall/malcontent
|
||||
Source: https://tecnocode.co.uk/downloads/%{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-UPSTREAM https://gitlab.freedesktop.org/pwithnall/malcontent/-/commit/f433aaf8c8f82f0aeaedee664f08bc6fcad47b0d.patch -- Fix build with meson 0.61.0
|
||||
Patch: https://gitlab.freedesktop.org/pwithnall/malcontent/-/commit/f433aaf8c8f82f0aeaedee664f08bc6fcad47b0d.patch
|
||||
|
||||
BuildRequires: itstool
|
||||
BuildRequires: meson >= 0.50.0
|
||||
BuildRequires: pam-devel
|
||||
@ -97,12 +100,13 @@ Requires: malcontent >= %{version}
|
||||
Parental Control management application for Malcontent
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
%autosetup -p1
|
||||
sed -i 's|env python3|python3|' malcontent-client/malcontent-client.py
|
||||
|
||||
%build
|
||||
%meson \
|
||||
-Dpamlibdir=%{_pam_moduledir}
|
||||
-Dpamlibdir=%{_pam_moduledir}
|
||||
%{nil}
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user