diff --git a/.gitignore b/.gitignore index d2a2886..84478e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/xwininfo-*.tar.xz* -/gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg +/xwininfo-1.1.5.tar.bz2 diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index 9d974f6..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# See the documentation for more information: -# https://packit.dev/docs/configuration/ - -specfile_path: xwininfo.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 deleted file mode 100644 index 2b47d31..0000000 --- a/changelog +++ /dev/null @@ -1,28 +0,0 @@ -* Sat Jul 20 2024 Fedora Release Engineering - 1.1.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.1.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.1.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.1.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.1.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.1.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Apr 16 2021 Peter Hutterer - 1.1.5-2 -- Bump Obsoletes for xorg-x11-utils -- Use the make_build rpm macro - -* Tue Jan 19 2021 Adam Jackson - 1.1.5-1 -- Initial split packaging. - diff --git a/sources b/sources index f6e8b40..0dbe950 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (xwininfo-1.1.7.tar.xz) = 116e53bdd5c40b6162e98057fc1c7981a4c4fb894adeb31197984d5408489195f9eb621635036e17194f4e50c7eed9e3624d044cab14b975988200f6883b9a66 -SHA512 (xwininfo-1.1.7.tar.xz.sig) = 64ce28260f23ad7b7baedddb45b27aeb7b19b6e2c9683960ce5abecf0e0972969502da704f395cde0c82e61358e586170ff5dd719240284c5865501c470e1020 -SHA512 (gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg) = a2b4aef6f48a6d6bab50f72a23295c7be63a3e6880237f52b1983e7cfa8b2798b7e30883e4e3f09dd7b905f0eb2952ba8993f7ea9b0172266337822c9be951c0 +SHA512 (xwininfo-1.1.5.tar.bz2) = a3268bbeeeeafac94e589fdd47554a965910d40df7cc3d9c36c7c24fa4f5dd49615484d5916ccb41efca9cd4cf9d8981a4c60953b921220b3f4f57f9cce0e1a6 diff --git a/xwininfo.spec b/xwininfo.spec index f006135..92ff1f9 100644 --- a/xwininfo.spec +++ b/xwininfo.spec @@ -1,36 +1,33 @@ Summary: X window info utility Name: xwininfo -Version: 1.1.7 -Release: %autorelease +Version: 1.1.5 +Release: 2%{?dist} License: MIT -URL: https://www.x.org -Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.xz -Source1: https://xorg.freedesktop.org/archive/individual/app/%{name}-%{version}.tar.xz.sig -Source2: gpgkey-3AB285232C46AE43D8E192F4DAB0F78EA6E7E2D2.gpg +URL: http://www.x.org + +Source0: https://www.x.org/pub/individual/app/%{name}-%{version}.tar.bz2 BuildRequires: gcc -BuildRequires: gnupg2 -BuildRequires: meson +BuildRequires: make +BuildRequires: gettext-devel +BuildRequires: libtool + BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xcb) -BuildRequires: pkgconfig(xcb-shape) + +Obsoletes: xorg-x11-utils < 7.5-39 %description xwininfo prints information about an X11 window. %prep -%{gpgverify} --keyring=%{SOURCE2} --signature=%{SOURCE1} --data=%{SOURCE0} -%autosetup +%setup -q %build -%meson -%meson_build +%configure +%make_build %install -%meson_install - -%check -%meson_test +%make_install %files %license COPYING @@ -39,4 +36,10 @@ xwininfo prints information about an X11 window. %{_mandir}/man1/xwininfo.1* %changelog -%autochangelog +* Fri Apr 16 2021 Peter Hutterer - 1.1.5-2 +- Bump Obsoletes for xorg-x11-utils +- Use the make_build rpm macro + +* Tue Jan 19 2021 Adam Jackson - 1.1.5-1 +- Initial split packaging. +