4 changed files with 41 additions and 77 deletions
--- a/.packit.yaml
+++ b/.packit.yaml
@ -1,19 +0,0 @@
-# See the documentation for more information:
-# https://packit.dev/docs/configuration/
-
-specfile_path: xset.spec
-
-copy_upstream_release_description: false
-
-jobs:
-  - job: pull_from_upstream
-    trigger: release
-    dist_git_branches:
-      - fedora-rawhide
-
-  - job: koji_build
-    trigger: commit
-    allowed_committers: ['packit','all_admins']
-    dist_git_branches:
-      - fedora-rawhide
-
--- a/42
+++ b/42
@ -1,42 +0,0 @@
-* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Sep 08 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.2.5-4
- SPDX migration
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Dec 06 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.2.5-1
- xset 1.2.5
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Thu Apr 08 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.2.4-2
- Fix Obsoletes line to actually obsolete the -39 server-utils (#1932754)
-
-* Wed Mar 03 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.2.4-1
- Split xset out from xorg-x11-server-utils into a separate package
-  (#1934394)
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (xset-1.2.6.tar.xz) = 5031166960eea0588b9ef643677d5aef44c83c6d6070234a68f247ea947b94818d94c6958d9abe05cfa99ceee98ad3c95443f5f0c54cf0d086407ffe816d19ca
+SHA512 (xset-1.2.5.tar.xz) = 12b53d7cd6b7ccf6515c03f68151490fce6b2629e99b8d85ac5d760f4ed93394a457213c3947533809fbbb04acd1ed260aeea1256099a10397660eef3088150d
--- a/xset.spec
+++ b/xset.spec
@ -1,35 +1,36 @@
 Name:       xset
-Version:    1.2.6
-Release:    %autorelease
+Version:    1.2.5
+Release:    3%{?dist}
 Summary:    User preference utility for X
-License:    MIT-open-group
+
+License:    MIT
 URL:        https://www.x.org
 Source0:    https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz

-BuildRequires:  gcc
-BuildRequires:  meson
+BuildRequires:  automake libtool
+BuildRequires:  gcc make
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xmuu)
-BuildRequires:  pkgconfig(xproto) >= 7.0.17
+BuildRequires:  pkgconfig(xmu)
+BuildRequires:  pkgconfig(xorg-macros) >= 1.8
+
+Obsoletes:  xorg-x11-server-utils < 7.7-40

 %description
 This program is used to set various user preference options of the X server,
-including bell volume, DPMS features, font paths and some settings related
+including bell volume, dpms features, font paths and some settings related
 to the pointer.

 %prep
 %autosetup

 %build
-%meson -Dxf86misc=disabled -Dfontcache=disabled
-%meson_build
+autoreconf -v --install
+%configure --disable-silent-rules
+%make_build

 %install
-%meson_install
-
-%check
-%meson_test
+%make_install

 %files
 %license COPYING
@ -37,4 +38,28 @@ to the pointer.
 %{_mandir}/man1/%{name}.1*

 %changelog
-%autochangelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Tue Dec 06 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.2.5-1
+- xset 1.2.5
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Apr 08 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.2.4-2
+- Fix Obsoletes line to actually obsolete the -39 server-utils (#1932754)
+
+* Wed Mar 03 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.2.4-1
+- Split xset out from xorg-x11-server-utils into a separate package
+  (#1934394)
+