diff --git a/.gitignore b/.gitignore index e85aaf1..477727f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,2 @@ libXrender-0.9.6.tar.bz2 /libXrender-0.9.7.tar.bz2 -/libXrender-20130524.tar.bz2 -/libXrender-0.9.8.tar.bz2 -/libXrender-0.9.9.tar.bz2 -/libXrender-0.9.10.tar.bz2 -/libXrender-0.9.11.tar.xz -/libXrender-0.9.12.tar.xz diff --git a/commitid b/commitid deleted file mode 100644 index 6d0884c..0000000 --- a/commitid +++ /dev/null @@ -1 +0,0 @@ -786f78fd8df6d165ccbc81f306fd9f22b5c1551c diff --git a/libXrender.spec b/libXrender.spec index eeec270..59b96d0 100644 --- a/libXrender.spec +++ b/libXrender.spec @@ -1,45 +1,31 @@ -%global tarball libXrender -#global gitdate 20130524 -%global gitversion 786f78fd8 - Summary: X.Org X11 libXrender runtime library Name: libXrender -Version: 0.9.12 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} -License: HPND-sell-variant +Version: 0.9.7 +Release: 1%{?dist} +License: MIT +Group: System Environment/Libraries URL: http://www.x.org -%if 0%{?gitdate} -Source0: %{tarball}-%{gitdate}.tar.bz2 -Source1: make-git-snapshot.sh -Source2: commitid -%else -Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz -%endif +Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 -Requires: libX11 >= 1.5.99.902 - -BuildRequires: make -BuildRequires: xorg-x11-util-macros -BuildRequires: autoconf automake libtool BuildRequires: pkgconfig -BuildRequires: libX11-devel >= 1.5.99.902 +BuildRequires: libX11-devel %description X.Org X11 libXrender runtime library %package devel Summary: X.Org X11 libXrender development package +Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel X.Org X11 libXrender development package %prep -%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%setup -q %build -autoreconf -v --install --force %configure --disable-static make %{?_smp_mflags} @@ -53,140 +39,26 @@ rm $RPM_BUILD_ROOT/%{_docdir}/*/libXrender.txt # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%ldconfig_post -%ldconfig_postun +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files -%doc AUTHORS COPYING +%defattr(-,root,root,-) +%doc AUTHORS COPYING ChangeLog %{_libdir}/libXrender.so.1 %{_libdir}/libXrender.so.1.3.0 %files devel +%defattr(-,root,root,-) %doc doc/libXrender.txt %{_includedir}/X11/extensions/Xrender.h %{_libdir}/libXrender.so %{_libdir}/pkgconfig/xrender.pc %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 0.9.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 0.9.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Dec 16 2024 José Expósito - 0.9.12-1 -- libXrender 0.9.12 - -* Thu Jul 18 2024 Fedora Release Engineering - 0.9.11-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 0.9.11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0.9.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Sep 06 2023 Benjamin Tissoires - 0.9.11-4 -- SPDX migration - -* Thu Jul 20 2023 Fedora Release Engineering - 0.9.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 0.9.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Nov 04 2022 Benjamin Tissoires 0.9.11-1 -- libXrender 0.9.11-1 - -* Thu Jul 21 2022 Fedora Release Engineering - 0.9.10-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 0.9.10-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0.9.10-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.9.10-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Nov 5 12:26:07 AEST 2020 Peter Hutterer - 0.9.10-13 -- Add BuildRequires for make - -* Tue Jul 28 2020 Fedora Release Engineering - 0.9.10-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 0.9.10-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 0.9.10-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 0.9.10-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 0.9.10-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jul 05 2018 Adam Jackson - 0.9.10-7 -- Drop useless %%defattr - -* Fri Jun 29 2018 Adam Jackson - 0.9.10-6 -- Use ldconfig scriptlet macros - -* Wed Feb 07 2018 Fedora Release Engineering - 0.9.10-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.9.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 0.9.10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 0.9.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Oct 05 2016 Benjamin Tissoires 0.9.10-1 -- libXrender 0.9.10 -- fixes CVE-2016-7949, CVE-2016-7950 - -* Thu Feb 04 2016 Fedora Release Engineering - 0.9.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0.9.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri May 01 2015 Adam Jackson 0.9.9-1 -- libXrender 0.9.9 - -* Sun Aug 17 2014 Fedora Release Engineering - 0.9.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.9.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 0.9.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Mon Jul 08 2013 Peter Hutterer 0.9.8-1 -- libXrender 0.9.8 - -* Mon May 27 2013 Peter Hutterer - 0.9.7-6.20130524git786f78fd8 -- Require libX11 1.6RC2 for _XEatDataWords - -* Fri May 24 2013 Peter Hutterer 0.9.7-5.20130524git786f78fd8 -- Update to git snapshot to fix CVEs listed below: -- CVE-2013-1987 - -* Thu Mar 07 2013 Peter Hutterer - 0.9.7-4 -- autoreconf for aarch64 - -* Thu Feb 14 2013 Fedora Release Engineering - 0.9.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 0.9.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - * Thu Mar 08 2012 Adam Jackson 0.9.7-1 - libXrender 0.9.7 diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh deleted file mode 100755 index 47fdab0..0000000 --- a/make-git-snapshot.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -DIRNAME=libXrender-$( date +%Y%m%d ) - -rm -rf $DIRNAME -git clone git://git.freedesktop.org/git/xorg/lib/libXrender $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 69158a4..50c42af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXrender-0.9.12.tar.xz) = 3d24a6877b500608e3e2a393532a99d4fd54fc343375d8fb51dfbb1b50cedf002c7722f771cf7776f93cb6e0421ca5966ce45435cb402d5f12a398f9ea743474 +ee62f4c7f0f16ced4da63308963ccad2 libXrender-0.9.7.tar.bz2