diff --git a/.gitignore b/.gitignore index 38f8035..125a921 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /x11perf-*.tar.bz2 -/x11perf-*.tar.xz diff --git a/changelog b/changelog deleted file mode 100644 index b39449e..0000000 --- a/changelog +++ /dev/null @@ -1,41 +0,0 @@ -* Fri Jul 17 2026 Fedora Release Engineering - 1.6.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.6.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.6.1-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.6.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 1.6.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.6.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Sep 28 2023 Peter Hutterer - 1.6.1-8 -- SPDX migration - -* Sat Jul 22 2023 Fedora Release Engineering - 1.6.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.6.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.6.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.6.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.6.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Apr 08 2021 Peter Hutterer - 1.6.1-2 -- Fix Obsoletes line to actually obsolete the -30 xorg-x11-apps (#1947245) - -* Tue Mar 02 2021 Peter Hutterer 1.6.1-1 -- Split x11perf out from xorg-x11-apps into a separate package (#1933936) diff --git a/sources b/sources index 582dea5..3323ff8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x11perf-1.7.0.tar.xz) = de8185bfbac15fb5eb15c18ba8450d8e383e1356675e0368c9a443d4c2d14245fab87ac0aa4ddcc5ebf731af0ad1173f53c6937104c1be824bfda5b58112fd5e +SHA512 (x11perf-1.6.1.tar.bz2) = b386151bfe3d7c04ab9953ae1882f3c5b627d6d1afb9a8cfe87c58236a88883fc11bbadb2226b9aa61df84b4fce625a1c9e3d146a124ac17e8d7d605b35d9c0b diff --git a/x11perf-1.6.0-x11perf-datadir-cleanups.patch b/x11perf-1.6.0-x11perf-datadir-cleanups.patch new file mode 100644 index 0000000..9e4710b --- /dev/null +++ b/x11perf-1.6.0-x11perf-datadir-cleanups.patch @@ -0,0 +1,12 @@ +diff -Naur x11perf-1.6.0.old/configure.ac x11perf-1.6.0/configure.ac +--- x11perf-1.6.0.old/configure.ac 2015-04-30 15:03:46.668372759 +0200 ++++ x11perf-1.6.0/configure.ac 2015-04-30 15:03:56.617354502 +0200 +@@ -39,7 +39,7 @@ + XORG_DEFAULT_OPTIONS + + # Define the installation directory for the x11 performance compare scripts +-AC_SUBST([x11perfcompdir], [$libdir/X11/x11perfcomp]) ++AC_SUBST([x11perfcompdir], [$datadir/X11/x11perfcomp]) + + # Checks for programs run by the scripts we install + AC_PATH_PROG(MKTEMP, mktemp) diff --git a/x11perf.spec b/x11perf.spec index cf563a9..6b5cb22 100644 --- a/x11perf.spec +++ b/x11perf.spec @@ -1,35 +1,31 @@ -%global forgeurl https://gitlab.freedesktop.org/xorg/app/x11perf -Version: 1.7.0 -%global archiveext tar.xz -%forgemeta - Name: x11perf -Release: %autorelease +Version: 1.6.1 +Release: 11%{?dist} Summary: X11 server performance test program License: SMLNJ AND HPND -URL: %{forgeurl} -Source0: %{forgesource} +URL: https://www.x.org +Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.bz2 -BuildRequires: automake -BuildRequires: gcc -BuildRequires: libtool -BuildRequires: make -BuildRequires: pkgconfig(fontconfig) +# We keep our scripts in $datadir, not $libdir, because ... history? +Patch01: x11perf-1.6.0-x11perf-datadir-cleanups.patch + +BuildRequires: automake libtool +BuildRequires: gcc make BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xext) -BuildRequires: pkgconfig(xft) -BuildRequires: pkgconfig(xmuu) -BuildRequires: pkgconfig(xorg-macros) >= 1.8 -BuildRequires: pkgconfig(xproto) BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(xft) +BuildRequires: pkgconfig(xmu) +BuildRequires: pkgconfig(xorg-macros) >= 1.8 + +Obsoletes: xorg-x11-apps < 7.7-31 %description The x11perf program runs one or more performance tests and reports how fast an X server can execute the tests. %prep -%forgeautosetup +%autosetup %build autoreconf -v --install @@ -39,9 +35,6 @@ autoreconf -v --install %install %make_install -%check -%make_build check - %files %license COPYING %{_bindir}/x11perf @@ -52,4 +45,35 @@ autoreconf -v --install %{_datadir}/X11/x11perfcomp %changelog -%autochangelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.6.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 1.6.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Sep 28 2023 Peter Hutterer - 1.6.1-8 +- SPDX migration + +* Sat Jul 22 2023 Fedora Release Engineering - 1.6.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Apr 08 2021 Peter Hutterer - 1.6.1-2 +- Fix Obsoletes line to actually obsolete the -30 xorg-x11-apps (#1947245) + +* Tue Mar 02 2021 Peter Hutterer 1.6.1-1 +- Split x11perf out from xorg-x11-apps into a separate package (#1933936)