diff --git a/mate-applets-1.24.0.tar.xz b/mate-applets-1.26.1.tar.xz similarity index 51% rename from mate-applets-1.24.0.tar.xz rename to mate-applets-1.26.1.tar.xz index ae2fd3c1a9566b8854091e15e750f54731788b95..d4edad8be6e16eb5f2026aca3cc345286d5f7133 100644 Binary files a/mate-applets-1.24.0.tar.xz and b/mate-applets-1.26.1.tar.xz differ diff --git a/mate-applets-icons.tar.xz b/mate-applets-icons.tar.xz deleted file mode 100644 index 7ed8576ca0fe450d3993dd3f1b4ed500f4cd0e9a..0000000000000000000000000000000000000000 Binary files a/mate-applets-icons.tar.xz and /dev/null differ diff --git a/mate-applets.spec b/mate-applets.spec index bebc4c18adcd32b09258a540d7bc8358d3d78aad..0fc8683f00e5f068e16df408c4216f5b841e7cf3 100644 --- a/mate-applets.spec +++ b/mate-applets.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.24 +%global branch 1.26 # Settings used for build from snapshots. %{!?rel_build:%global commit c3b48ea39ab358b45048e300deafaa3f569748ad} @@ -13,12 +13,8 @@ %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} Name: mate-applets -Version: %{branch}.0 -%if 0%{?rel_build} -Release: 5 -%else -Release: 0.13%{?git_rel} -%endif +Version: %{branch}.1 +Release: 1 Summary: MATE Desktop panel applets License: GPLv2+ and LGPLv2+ URL: http://mate-desktop.org @@ -29,20 +25,16 @@ URL: http://mate-desktop.org # Source for snapshot-builds. %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} -Source1: mate-applets-icons.tar.xz - -# https://github.com/mate-desktop/mate-applets/pull/447 -Patch1: mate-applets_0001-eyes-generate-missing-256x256-and-64x64-icons-from-s.patch -Patch2: mate-applets_0002-cpufreq-generate-missing-256x256-and-64x64-icons-fro.patch - BuildRequires: gucharmap-devel BuildRequires: libgtop2-devel -BuildRequires: libnotify-devel BuildRequires: libmateweather-devel -BuildRequires: libwnck3-devel -BuildRequires: libxml2-devel +BuildRequires: libnl3-devel +BuildRequires: libnotify-devel BuildRequires: libICE-devel BuildRequires: libSM-devel +BuildRequires: libwnck3-devel +BuildRequires: libxml2-devel +BuildRequires: make BuildRequires: mate-common BuildRequires: mate-settings-daemon-devel BuildRequires: mate-notification-daemon @@ -51,11 +43,13 @@ BuildRequires: polkit-devel BuildRequires: startup-notification-devel Buildrequires: upower-devel Buildrequires: gtksourceview3-devel -BuildRequires: wireless-tools-devel %ifnarch s390 s390x sparc64 BuildRequires: kernel-tools-libs-devel %endif +# not kernel-tools for this arch any more +ExcludeArch: i386 i686 + Provides: mate-netspeed%{?_isa} = %{version}-%{release} Provides: mate-netspeed = %{version}-%{release} Obsoletes: mate-netspeed < %{version}-%{release} @@ -71,10 +65,7 @@ MATE Desktop panel applets %autosetup -n %{name}-%{commit} -p1 %endif -tar -xf %{SOURCE1} -cp -rf mate-applets-icons/cpufreq . -cp -rf mate-applets-icons/geyes . - +%build %if 0%{?rel_build} #NOCONFIGURE=1 ./autogen.sh %else # 0%{?rel_build} @@ -82,10 +73,6 @@ cp -rf mate-applets-icons/geyes . NOCONFIGURE=1 ./autogen.sh %endif # 0%{?rel_build} -# patch 1,2 -NOCONFIGURE=1 ./autogen.sh - -%build %configure \ --disable-schemas-compile \ --disable-static \ @@ -94,7 +81,6 @@ NOCONFIGURE=1 ./autogen.sh --enable-ipv6 \ --enable-stickynotes \ --libexecdir=%{_libexecdir}/mate-applets \ - --with-cpufreq-lib=cpupower \ --with-dbus-sys=%{_datadir}/dbus-1/system.d make %{?_smp_mflags} V=1 @@ -143,28 +129,20 @@ make %{?_smp_mflags} V=1 %{_datadir}/icons/hicolor/*/status/*.png %{_datadir}/icons/hicolor/scalable/apps/*.svg %{_mandir}/man1/* -%{_datadir}/mate/ui/accessx-status-applet-menu.xml -%{_datadir}/mate/ui/battstat-applet-menu.xml -%{_datadir}/mate/ui/charpick-applet-menu.xml -%{_datadir}/mate/ui/drivemount-applet-menu.xml -%{_datadir}/mate/ui/geyes-applet-menu.xml -%{_datadir}/mate/ui/stickynotes-applet-menu.xml -%{_datadir}/mate/ui/trashapplet-menu.xml -%{_datadir}/mate/ui/mateweather-applet-menu.xml -%{_datadir}/mate/ui/multiload-applet-menu.xml -%{_datadir}/mate/ui/cpufreq-applet-menu.xml -%{_datadir}/mate/ui/netspeed-menu.xml %{_datadir}/pixmaps/mate-cpufreq-applet %changelog +* Mon Aug 19 2024 yueyaoqiang - 1.26.1-1 +- update to 1.26.1 + * Thu Jul 14 2022 longcheng - 1.24.0-5 - remove %{?dist} * Tue Jul 28 2020 Fedora Release Engineering - 1.24.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Fri Apr 25 2020 Wolfgang Ulbrich - 1.24.0-3 +* Sat Apr 25 2020 Wolfgang Ulbrich - 1.24.0-3 - rebuild against latest kernel to fix cpu-freq-applet - fix rhbz (#1827937) diff --git a/mate-applets_0001-eyes-generate-missing-256x256-and-64x64-icons-from-s.patch b/mate-applets_0001-eyes-generate-missing-256x256-and-64x64-icons-from-s.patch deleted file mode 100644 index 2a495b1531ad381b1a3cac3f64f162879bc153de..0000000000000000000000000000000000000000 --- a/mate-applets_0001-eyes-generate-missing-256x256-and-64x64-icons-from-s.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cffde850e424717331598f34037fd39fb2fbdf20 Mon Sep 17 00:00:00 2001 -From: rbuj -Date: Wed, 25 Mar 2020 19:37:01 +0100 -Subject: [PATCH 1/2] eyes: generate missing 256x256 and 64x64 icons from svg - file rsvg-convert -w 64 -h 64 mate-eyes-applet.svg -o mate-eyes-applet.64.png - rsvg-convert -w 256 -h 256 mate-eyes-applet.svg -o mate-eyes-applet.256.png - ---- - geyes/Makefile.am | 10 +- - 1 files changed, 266 insertions(+), 297 deletions(-) - -diff --git a/geyes/Makefile.am b/geyes/Makefile.am -index 38921e31..c3e0550a 100644 ---- a/geyes/Makefile.am -+++ b/geyes/Makefile.am -@@ -53,10 +53,12 @@ gsettings_SCHEMAS = $(geyes_gschema_in_files:.xml.in=.xml) - themesdir = $(pkgdatadir)/geyes - - icons = \ -- mate-eyes-applet.svg \ -- mate-eyes-applet.32.png \ -- mate-eyes-applet.24.png \ -- mate-eyes-applet.22.png \ -+ mate-eyes-applet.svg \ -+ mate-eyes-applet.256.png \ -+ mate-eyes-applet.64.png \ -+ mate-eyes-applet.32.png \ -+ mate-eyes-applet.24.png \ -+ mate-eyes-applet.22.png \ - mate-eyes-applet.16.png - - CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid --- -2.21.1 - diff --git a/mate-applets_0002-cpufreq-generate-missing-256x256-and-64x64-icons-fro.patch b/mate-applets_0002-cpufreq-generate-missing-256x256-and-64x64-icons-fro.patch deleted file mode 100644 index 05b70b1fa1cb824793ad22fe29b793ddaee543a9..0000000000000000000000000000000000000000 --- a/mate-applets_0002-cpufreq-generate-missing-256x256-and-64x64-icons-fro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From eb08b8d65f897e27166e298cbe7e2228ba1a2ba7 Mon Sep 17 00:00:00 2001 -From: rbuj -Date: Wed, 25 Mar 2020 19:52:18 +0100 -Subject: [PATCH 2/2] cpufreq: generate missing 256x256 and 64x64 icons from - svg file rsvg-convert -w 64 -h 64 mate-cpu-frequency-applet.svg -o - mate-cpu-frequency-applet.64.png rsvg-convert -w 256 -h 256 - mate-cpu-frequency-applet.svg -o mate-cpu-frequency-applet.256.png - ---- - cpufreq/pixmaps/Makefile.am | 2 + - 1 files changed, 431 insertions(+), 526 deletions(-) - -diff --git a/cpufreq/pixmaps/Makefile.am b/cpufreq/pixmaps/Makefile.am -index fab407c3..5f5c257d 100644 ---- a/cpufreq/pixmaps/Makefile.am -+++ b/cpufreq/pixmaps/Makefile.am -@@ -12,6 +12,8 @@ icons = \ - mate-cpu-frequency-applet.22.png \ - mate-cpu-frequency-applet.24.png \ - mate-cpu-frequency-applet.32.png \ -+ mate-cpu-frequency-applet.64.png \ -+ mate-cpu-frequency-applet.256.png \ - mate-cpu-frequency-applet.svg - - EXTRA_DIST = \ --- -2.21.1 -