diff --git a/.gitignore b/.gitignore index 56d5874..4bde57a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,8 @@ libXres-1.0.4.tar.bz2 /libXres-1.0.5.tar.bz2 +/libXres-1.0.6.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/commitid b/commitid new file mode 100644 index 0000000..d752811 --- /dev/null +++ b/commitid @@ -0,0 +1 @@ +f468184963e53feda848853c4aefd0197b2cc116 diff --git a/libXres.spec b/libXres.spec index 0e630fc..1fd4063 100644 --- a/libXres.spec +++ b/libXres.spec @@ -1,15 +1,33 @@ +%global tarball libXres +#global gitdate 20130524 +#global gitversion f46818496 + Summary: X-Resource extension client library Name: libXres -Version: 1.0.5 -Release: 2%{?dist} -License: MIT -Group: System Environment/Libraries +Version: 1.2.2 +Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +License: X11 URL: http://www.x.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +%if 0%{?gitdate} +Source0: %{tarball}-%{gitdate}.tar.xz +Source1: make-git-snapshot.sh +Source2: commitid +%else +Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.xz +%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) +BuildRequires: pkgconfig(x11) >= 1.5.99.902 %description X-Resource is an extension that allows a client to query @@ -17,16 +35,16 @@ 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 X.Org X11 libXres development package %prep -%setup -q +%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %build +autoreconf -v --install --force %configure --disable-static make %{?_smp_mflags} @@ -38,27 +56,144 @@ make install DESTDIR=$RPM_BUILD_ROOT # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%clean -rm -rf $RPM_BUILD_ROOT - -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_post +%ldconfig_postun %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog +%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 -#%dir %{_mandir}/man3x %{_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 + +* Wed Oct 11 2017 Adam Jackson - 1.2.0-1 +- libXres 1.2.0 + +* Thu Aug 03 2017 Fedora Release Engineering - 1.0.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.0.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.0.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.0.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.0.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 1.0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.0.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 1.0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri May 31 2013 Peter Hutterer 1.0.7-1 +- libXres 1.0.7 + +* Mon May 27 2013 Peter Hutterer - 1.0.6-6.20130524gitf46818496 +- Require libX11 1.6RC2 for _XEatDataWords + +* Fri May 24 2013 Dave Airlie 1.0.6-5.20130524gitf46818496 +- update for CVE fixes (CVE-2013-1988) + +* Thu Mar 07 2013 Peter Hutterer - 1.0.6-4 +- autoreconf for aarch64 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 1.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Mar 08 2012 Adam Jackson 1.0.6-1 +- libXres 1.0.6 + +* Fri Jan 13 2012 Fedora Release Engineering - 1.0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 1.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh new file mode 100755 index 0000000..dd5ac16 --- /dev/null +++ b/make-git-snapshot.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +DIRNAME=libXres-$( date +%Y%m%d ) + +rm -rf $DIRNAME +git clone git://git.freedesktop.org/git/xorg/lib/libXRes $DIRNAME +cd $DIRNAME +if [ -z "$1" ]; then + git log | head -1 +else + git checkout $1 +fi +git log | head -1 | awk '{ print $2 }' > ../commitid +git repack -a -d +cd .. +tar jcf $DIRNAME.tar.bz2 $DIRNAME +rm -rf $DIRNAME diff --git a/sources b/sources index 641bb40..78899a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d08f0b6df3f96c051637d37009f4e55a libXres-1.0.5.tar.bz2 +SHA512 (libXres-1.2.2.tar.xz) = 897f2d426ea6f41169a5a52c356d1a1cb2ffb9144ae41b9fedd06455c3d81042930fe55be269ce4b8545ee65fcfe168101192a599053d810e8810f627c94f810