diff --git a/.gitignore b/.gitignore index 4bde57a..de1429a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,3 @@ libXres-1.0.4.tar.bz2 /libXres-20130524.tar.bz2 /libXres-1.0.7.tar.bz2 /libXres-1.2.0.tar.bz2 -/libXres-1.2.1.tar.bz2 -/libXres-1.2.2.tar.xz diff --git a/libXres.spec b/libXres.spec index 1fd4063..45f24ea 100644 --- a/libXres.spec +++ b/libXres.spec @@ -4,26 +4,22 @@ Summary: X-Resource extension client library Name: libXres -Version: 1.2.2 -Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} -License: X11 +Version: 1.2.0 +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +License: MIT +Group: System Environment/Libraries URL: http://www.x.org %if 0%{?gitdate} -Source0: %{tarball}-%{gitdate}.tar.xz +Source0: %{tarball}-%{gitdate}.tar.bz2 Source1: make-git-snapshot.sh Source2: commitid %else -Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.xz +Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 %endif -# Fixes a bug which causes metacity 3.38.0+ to crash on startup: -# https://bugzilla.redhat.com/show_bug.cgi?id=1888993 -# https://gitlab.freedesktop.org/xorg/lib/libxres/-/issues/3 -# https://gitlab.freedesktop.org/xorg/lib/libxres/-/merge_requests/1 Requires: libX11 >= 1.5.99.902 -BuildRequires: make BuildRequires: xorg-x11-util-macros BuildRequires: autoconf automake libtool BuildRequires: pkgconfig(xext) @@ -35,6 +31,7 @@ the X server about its usage of various resources. %package devel Summary: Development files for %{name} +Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel @@ -56,90 +53,23 @@ make install DESTDIR=$RPM_BUILD_ROOT # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%ldconfig_post -%ldconfig_postun +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files +%defattr(-,root,root,-) %doc AUTHORS COPYING %{_libdir}/libXRes.so.1 %{_libdir}/libXRes.so.1.0.0 %files devel +%defattr(-,root,root,-) %{_includedir}/X11/extensions/XRes.h %{_libdir}/libXRes.so %{_libdir}/pkgconfig/xres.pc %{_mandir}/man3/*.3* %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 1.2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 1.2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 1.2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Oct 05 2023 José Expósito - 1.2.2-1 -- libXres 1.2.2 - -* Wed Sep 06 2023 Benjamin Tissoires - 1.2.1-6 -- SPDX Migration - -* Thu Jul 20 2023 Fedora Release Engineering - 1.2.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 1.2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Sep 21 2021 Benjamin Tissoires 1.2.1-1 -- libXres 1.2.1 - -* Thu Jul 22 2021 Fedora Release Engineering - 1.2.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.2.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Nov 5 12:16:29 AEST 2020 Peter Hutterer - 1.2.0-11 -- Add BuildRequires for make - -* Wed Oct 21 2020 Adam Williamson - 1.2.0-10 -- Backport upstream MR #1 to fix RHBZ #1888993 (metacity crash) - -* Tue Jul 28 2020 Fedora Release Engineering - 1.2.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 1.2.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.2.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 1.2.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jul 05 2018 Adam Jackson - 1.2.0-4 -- Drop useless %%defattr - -* Fri Jun 29 2018 Adam Jackson - 1.2.0-3 -- Use ldconfig scriptlet macros - * Wed Feb 07 2018 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 78899a3..84f8629 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXres-1.2.2.tar.xz) = 897f2d426ea6f41169a5a52c356d1a1cb2ffb9144ae41b9fedd06455c3d81042930fe55be269ce4b8545ee65fcfe168101192a599053d810e8810f627c94f810 +SHA512 (libXres-1.2.0.tar.bz2) = 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172