From 0a722fdbb512440d8d211e14d68a55506a87bb6c Mon Sep 17 00:00:00 2001 From: madomado Date: Sat, 7 Oct 2023 18:26:22 +0800 Subject: [PATCH] chore: revert bad changes in Terra 38 --- anda/apps/armcord-bin/armcord-bin.spec | 2 +- anda/apps/armcord/armcord.spec | 2 +- .../elementary-greeter/elementary-greeter.spec | 10 ++++++---- anda/desktops/elementary/wingpanel/wingpanel.spec | 6 +++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/anda/apps/armcord-bin/armcord-bin.spec b/anda/apps/armcord-bin/armcord-bin.spec index 2b907fa7a6..190319e0d8 100644 --- a/anda/apps/armcord-bin/armcord-bin.spec +++ b/anda/apps/armcord-bin/armcord-bin.spec @@ -14,7 +14,7 @@ %global __provides_exclude_from %{_datadir}/armcord/.*\\.so Name: armcord-bin -Version: 3.2.4.libwebp +Version: 3.2.4 Release: 1%{?dist} License: OSL-3.0 Summary: Custom lightweight Discord client designed to enhance your experience diff --git a/anda/apps/armcord/armcord.spec b/anda/apps/armcord/armcord.spec index 2ec3f229ab..2d1dc3fd9c 100644 --- a/anda/apps/armcord/armcord.spec +++ b/anda/apps/armcord/armcord.spec @@ -1,7 +1,7 @@ %define debug_package %nil Name: armcord -Version: 3.2.4.libwebp +Version: 3.2.4 Release: 1%{?dist} License: OSL-3.0 Summary: Custom lightweight Discord client designed to enhance your experience diff --git a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec index f439a76a57..7883426b40 100644 --- a/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec +++ b/anda/desktops/elementary/elementary-greeter/elementary-greeter.spec @@ -11,6 +11,8 @@ URL: https://github.com/elementary/greeter Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz Source1: 40-%{appname}.conf +Patch0: https://github.com/elementary/greeter/commit/dbd9b6f9701f5992c3b3257c025b9cd80d041cc8.patch + BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libappstream-glib @@ -34,9 +36,9 @@ BuildRequires: pkgconfig(granite) >= 5.0 BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libhandy-1) BuildRequires: pkgconfig(liblightdm-gobject-1) -BuildRequires: pkgconfig(mutter-clutter-12) -BuildRequires: pkgconfig(mutter-cogl-12) -BuildRequires: pkgconfig(mutter-cogl-pango-12) +BuildRequires: pkgconfig(mutter-clutter-13) +BuildRequires: pkgconfig(mutter-cogl-13) +BuildRequires: pkgconfig(mutter-cogl-pango-13) BuildRequires: pkgconfig(x11) Provides: pantheon-greeter = %{version}-%{release} @@ -68,7 +70,7 @@ The elementary Greeter is a styled Login Screen for LightDM. %prep -%autosetup -n %{srcname}-%{version} +%autosetup -p1 -n %{srcname}-%{version} %build diff --git a/anda/desktops/elementary/wingpanel/wingpanel.spec b/anda/desktops/elementary/wingpanel/wingpanel.spec index 59ef67a72d..cda694cc5a 100644 --- a/anda/desktops/elementary/wingpanel/wingpanel.spec +++ b/anda/desktops/elementary/wingpanel/wingpanel.spec @@ -27,9 +27,9 @@ BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(glib-2.0) >= 2.32 BuildRequires: pkgconfig(granite) >= 5.4.0 BuildRequires: pkgconfig(gtk+-3.0) >= 3.10 -BuildRequires: pkgconfig(mutter-clutter-12) -BuildRequires: pkgconfig(mutter-cogl-12) -BuildRequires: pkgconfig(mutter-cogl-pango-12) +BuildRequires: pkgconfig(mutter-clutter-13) +BuildRequires: pkgconfig(mutter-cogl-13) +BuildRequires: pkgconfig(mutter-cogl-pango-13) Requires: %{name}-libs%{?_isa} = %{version}-%{release}