Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[f39] fix: switchboard-plug-datetime (#1676) #1700

Merged
merged 2 commits into from
Jul 29, 2024
Merged

[f39] fix: switchboard-plug-datetime (#1676) #1700

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
670b31b
fix: switchboard-plug-datetime (#1676)
madonuko Jul 27, 2024
b7940bd
Merge branch 'f39' into backport/f39/pr-1676
madonuko Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions anda/desktops/elementary/switchboard-plug-datetime/switchboard-plug-datetime.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

%global plug_type system
%global plug_name datetime
%global plug_rdnn io.elementary.switchboard.datetime
%global plug_rdnn io.elementary.settings.datetime

Name: switchboard-plug-datetime
Summary: Switchboard Date & Time Plug
Expand All @@ -18,11 +18,8 @@ Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala
BuildRequires: fdupes

BuildRequires: pkgconfig(granite)
BuildRequires: pkgconfig(libadwaita-1)
BuildRequires: switchboard-devel

Requires: switchboard%{?_isa}
Expand All @@ -44,24 +41,24 @@ Supplements: switchboard%{?_isa}
%install
%meson_install
%fdupes %buildroot%_datadir/locale/
%find_lang %{plug_name}-plug
%find_lang %{plug_rdnn}

# remove the specified stock icon from appdata (invalid in libappstream-glib)
sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
# remove the specified stock icon from metainfo (invalid in libappstream-glib)
sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


%check
appstream-util validate-relax --nonet \
%{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
%{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


%files -f %{plug_name}-plug.lang
%files -f %{plug_rdnn}.lang
%doc README.md
%license COPYING

%{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
%{_libdir}/switchboard-3/%{plug_type}/lib%{plug_name}.so

%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


%changelog
Expand Down
Loading