diff --git a/metacity-3.37.1.tar.xz b/metacity-3.37.1.tar.xz deleted file mode 100644 index 9f1afeb43c7cf45054b1f17678ae0677a76c22e8..0000000000000000000000000000000000000000 Binary files a/metacity-3.37.1.tar.xz and /dev/null differ diff --git a/metacity-3.46.0.tar.xz b/metacity-3.46.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..039bf7ef134fe494fa5c25078b729b7a1fca5c32 Binary files /dev/null and b/metacity-3.46.0.tar.xz differ diff --git a/metacity.spec b/metacity.spec index 3671cde5ed6ffb14655ca0a531ff3bd8b35a61b4..feeadcc027540f942bc7f34177348f2d2b5e4c7d 100644 --- a/metacity.spec +++ b/metacity.spec @@ -1,6 +1,6 @@ Name: metacity -Version: 3.37.1 -Release: 3 +Version: 3.46.0 +Release: 1 Summary: Window Manager for the MATE and GNOME Flashback desktops License: GPLv2+ URL: https://download.gnome.org/sources/metacity/ @@ -17,6 +17,8 @@ BuildRequires: pkgconfig(xres) vulkan-devel %endif BuildRequires: pkgconfig(libstartup-notification-1.0) pkgconfig(xcomposite) pkgconfig(xfixes) pkgconfig(xrender) BuildRequires: pkgconfig(xdamage) pkgconfig(xrender) pkgconfig(xcursor) pkgconfig(libgtop-2.0) +BuildRequires: pkgconfig(xpresent) make +BuildRequires: pkgconfig(xres) >= 1.2 Requires: startup-notification gsettings-desktop-schemas zenity Provides: firstboot(windowmanager) = metacity @@ -43,18 +45,33 @@ developing applications that use %{name}. %autosetup -n %{name}-%{version} -p1 rm -f src/org.gnome.metacity.gschema.valid + + %build -CPPFLAGS="$CPPFLAGS -I$RPM_BUILD_ROOT%{_includedir}" -export CPPFLAGS +# Always rerun configure for now rm -f configure (if ! test -x configure; then autoreconf -i -f; fi; %configure \ %if !0%{?openEuler} --disable-canberra \ %endif + --disable-static \ --disable-schemas-compile) -make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS" %{?_smp_mflags} +SHOULD_HAVE_DEFINED="HAVE_SM HAVE_XINERAMA HAVE_RANDR HAVE_STARTUP_NOTIFICATION" + +for I in $SHOULD_HAVE_DEFINED; do + if ! grep -q "define $I" config.h; then + echo "$I was not defined in config.h" + grep "$I" config.h + exit 1 + else + echo "$I was defined as it should have been" + grep "$I" config.h + fi +done + +%make_build %install %make_install @@ -86,6 +103,9 @@ make CPPFLAGS="$CPPFLAGS" LIBS="$LIBS" %{?_smp_mflags} %{_mandir}/man1/*.gz %changelog +* Tue Jul 25 2023 haomimi - 3.46.0-1 +- update to 3.46.0 + * Fri Apr 1 2022 wuchaochao - 3.37.1-3 - remove XResQueryClientIds to get pid and remove BuildRequires:vulkan-devel