diff --git a/.gitignore b/.gitignore index b0d3d2f..72c89a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/xrdb-*.tar.bz2 +/xrdb-*.tar.xz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..5674172 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,19 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: xrdb.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 + diff --git a/changelog b/changelog new file mode 100644 index 0000000..1d4ea21 --- /dev/null +++ b/changelog @@ -0,0 +1,53 @@ +* Tue Jan 20 2026 Fedora Release Engineering - 1.2.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 1.2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 1.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 1.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Sep 28 2023 Peter Hutterer - 1.2.2-2 +- SPDX migration + +* Thu Aug 10 2023 Peter Hutterer - 1.2.2-1 +- xrdb 1.2.2 + +* Sat Jul 22 2023 Fedora Release Engineering - 1.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Aug 10 2021 Peter Hutterer - 1.2.1-2 +- xrdb 1.2.1 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu May 06 2021 Peter Hutterer 1.2.0-1 +- xrdb 1.2.0 + +* Thu May 06 2021 Peter Hutterer 1.1.1-3 +- Restore Recommends: cpp lost in the package split + xorg-x11-server-utils used mcpp but that one is unmaintained and broken in + some cases, let's use the standard cpp instead. + +* Thu Apr 08 2021 Peter Hutterer - 1.1.1-2 +- Fix Obsoletes line to actually obsolete the -39 server-utils (#1932754) + +* Wed Mar 03 2021 Peter Hutterer 1.1.1-1 +- Split xrdb out from xorg-x11-server-utils into a separate package + (#1934392) diff --git a/sources b/sources index f565b2f..12084f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xrdb-1.2.0.tar.bz2) = 14e1cdfb2152fb28f1f4641b177ab236648d7e967a95b952bf4cfce8d3e1ef085e85385354e3381aaf644462e8888a1847f755ab4016ecb4cb4a715b001dd2ef +SHA512 (xrdb-1.2.3.tar.xz) = 4dbbfd38afc9c795de3671a37e377247dc598b9c1352f6f07158fb716437f0465fb5db4eee22d74ebee93dff4a3ef1c1e4268f333cea0d8f02d1fa10104ac748 diff --git a/xrdb.spec b/xrdb.spec index b3eb582..b02b585 100644 --- a/xrdb.spec +++ b/xrdb.spec @@ -1,21 +1,21 @@ Name: xrdb -Version: 1.2.0 -Release: 1%{?dist} +Version: 1.2.3 +Release: %autorelease Summary: X server resource database utility -License: MIT +License: HPND-DEC AND MIT-open-group URL: https://www.x.org -Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.bz2 +Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz -BuildRequires: automake libtool -BuildRequires: gcc make +BuildRequires: cpp +BuildRequires: gcc +BuildRequires: meson BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xmu) +BuildRequires: pkgconfig(xmuu) BuildRequires: pkgconfig(xorg-macros) >= 1.8 +BuildRequires: pkgconfig(xproto) >= 7.0.25 +Recommends: cpp -Recommends: cpp - -Obsoletes: xorg-x11-server-utils < 7.7-40 %description xrdb is used to get or set the contents of the RESOURCE_MANAGER property on @@ -26,12 +26,14 @@ root window of any or all screens, or everything combined. %autosetup %build -autoreconf -v --install -%configure --disable-silent-rules -%make_build +%meson -Dcpp=%{_bindir}/cpp +%meson_build %install -%make_install +%meson_install + +%check +%meson_test %files %license COPYING @@ -39,18 +41,4 @@ autoreconf -v --install %{_mandir}/man1/%{name}.1* %changelog -* Thu May 06 2021 Peter Hutterer 1.2.0-1 -- xrdb 1.2.0 - -* Thu May 06 2021 Peter Hutterer 1.1.1-3 -- Restore Recommends: cpp lost in the package split - xorg-x11-server-utils used mcpp but that one is unmaintained and broken in - some cases, let's use the standard cpp instead. - -* Thu Apr 08 2021 Peter Hutterer - 1.1.1-2 -- Fix Obsoletes line to actually obsolete the -39 server-utils (#1932754) - -* Wed Mar 03 2021 Peter Hutterer 1.1.1-1 -- Split xrdb out from xorg-x11-server-utils into a separate package - (#1934392) - +%autochangelog