diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 7d642d8..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -libXext-1.0.99.4.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f2a781c --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +libXext-1.1.2.tar.bz2 +/libXext-1.2.0.tar.bz2 +/libXext-1.3.0.tar.bz2 +/libXext-1.3.1.tar.bz2 +/libXext-20130524.tar.bz2 +/libXext-1.3.2.tar.bz2 +/libXext-1.3.3.tar.bz2 +/libXext-1.3.4.tar.bz2 +/libXext-1.3.5.tar.xz +/libXext-1.3.6.tar.xz diff --git a/Makefile b/Makefile deleted file mode 100644 index ebb1b00..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libXext -# $Id: Makefile,v 1.1 2005/08/26 21:23:41 mharris Exp $ -NAME := libXext -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/commitid b/commitid new file mode 100644 index 0000000..f6993ae --- /dev/null +++ b/commitid @@ -0,0 +1 @@ +dfe6e1f3b8ede3d0bab7a5fa57f73513a09ec649 diff --git a/import.log b/import.log deleted file mode 100644 index ca7dae1..0000000 --- a/import.log +++ /dev/null @@ -1 +0,0 @@ -libXext-1_0_99_1-1_fc11:HEAD:libXext-1.0.99.1-1.fc11.src.rpm:1229692354 diff --git a/libXext.spec b/libXext.spec index 1b2a1ce..2d03722 100644 --- a/libXext.spec +++ b/libXext.spec @@ -1,40 +1,48 @@ +%global tarball libXext +#global gitdate 20130524 +%global gitversion dfe6e1f3b + Summary: X.Org X11 libXext runtime library Name: libXext -Version: 1.0.99.4 -Release: 3%{?dist} -License: MIT -Group: System Environment/Libraries +Version: 1.3.6 +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +License: MIT-open-group AND X11 AND HPND AND HPND-sell-variant AND SMLNJ AND MIT AND ISC AND HPND-doc AND HPND-doc-sell 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.bz2 +Source1: make-git-snapshot.sh +Source2: commitid +%else +Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz +%endif +Requires: libX11 >= 1.5.99.902 + +BuildRequires: make +BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-proto-devel >= 7.4-23 -BuildRequires: libX11-devel +BuildRequires: libX11-devel >= 1.5.99.902 BuildRequires: libXau-devel BuildRequires: xorg-x11-util-macros BuildRequires: autoconf automake libtool pkgconfig +BuildRequires: xmlto %description X.Org X11 libXext runtime library %package devel Summary: X.Org X11 libXext development package -Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libX11-devel pkgconfig -# xorg-x11-proto-devel is needed by xext.pc -Requires: xorg-x11-proto-devel >= 7.0-1 - - %description devel X.Org X11 libXext development package %prep -%setup -q +%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %build +autoreconf -v --install --force %configure --disable-static make %{?_smp_mflags} @@ -46,20 +54,18 @@ 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 +# do this with %%doc below +rm -rf $RPM_BUILD_ROOT%{_docdir} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_post +%ldconfig_postun %files -%defattr(-,root,root,-) %doc AUTHORS COPYING %{_libdir}/libXext.so.6 %{_libdir}/libXext.so.6.4.0 %files devel -%defattr(-,root,root,-) %{_includedir}/X11/extensions/MITMisc.h %{_includedir}/X11/extensions/XEVI.h %{_includedir}/X11/extensions/XLbx.h @@ -71,9 +77,6 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/X11/extensions/Xge.h %{_includedir}/X11/extensions/dpms.h %{_includedir}/X11/extensions/extutil.h -%{_includedir}/X11/extensions/lbxbuf.h -%{_includedir}/X11/extensions/lbxbufstr.h -%{_includedir}/X11/extensions/lbximage.h %{_includedir}/X11/extensions/multibuf.h %{_includedir}/X11/extensions/security.h %{_includedir}/X11/extensions/shape.h @@ -85,6 +88,159 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man3/*.3* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.3.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 1.3.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 18 2024 Fedora Release Engineering - 1.3.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Feb 05 2024 José Expósito - 1.3.6-1 +- libXext 1.3.6-1 + +* Thu Jan 25 2024 Fedora Release Engineering - 1.3.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.3.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 02 2023 Benjamin Tissoires - 1.3.5-4 +- SPDX migration + +* Thu Jul 20 2023 Fedora Release Engineering - 1.3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Nov 04 2022 Benjamin Tissoires 1.3.5-1 +- libXext 1.3.5-1 + +* Thu Jul 21 2022 Fedora Release Engineering - 1.3.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.3.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.3.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.3.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Nov 5 11:24:29 AEST 2020 Peter Hutterer - 1.3.4-5 +- Add BuildRequires for make + +* Tue Jul 28 2020 Fedora Release Engineering - 1.3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 1.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Mar 19 2019 Peter Hutterer 1.3.4-1 +- libXext 1.3.4 + +* Fri Feb 01 2019 Fedora Release Engineering - 1.3.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.3.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 29 2018 Adam Jackson - 1.3.3-9 +- Use ldconfig scriptlet macros + +* Wed Feb 07 2018 Fedora Release Engineering - 1.3.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.3.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.3.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.3.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.3.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 28 2016 Peter Hutterer +- Remove unnecessary defattr + +* Wed Jun 17 2015 Fedora Release Engineering - 1.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 1.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jul 24 2014 Peter Hutterer 1.3.3-1 +- libXext 1.3.3 + +* Tue Jul 22 2014 Benjamin Tissoires 1.3.2-4 +- Xge: remove warning messages about missing Xge extension event translations (rhbz #1122011) + +* Sat Jun 07 2014 Fedora Release Engineering - 1.3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 1.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jun 03 2013 Peter Hutterer 1.3.2-1 +- libXext 1.3.2 + +* Mon May 27 2013 Peter Hutterer - 1.3.1-6.20130524gitdfe6e1f3b +- Really require libX11 1.6RC2 for _XEatDataWords + +* Mon May 27 2013 Peter Hutterer - 1.3.1-5.20130524gitdfe6e1f3b +- Require libX11 1.6RC2 for _XEatDataWords + +* Fri May 24 2013 Peter Hutterer 1.3.1-3.20130524gitdfe6e1f3b +- Update to git snapshot to fix CVEs listed below +- CVE-2013-1982 + +* Thu Mar 07 2013 Peter Hutterer - 1.3.1-4 +- autoreconf for aarch64 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Mar 08 2012 Adam Jackson 1.3.1-1 +- libXext 1.3.1 + +* Fri Jan 13 2012 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Nov 17 2011 Adam Jackson 1.3.0-1 +- libXext 1.3.0 + +* Mon Feb 07 2011 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Oct 28 2010 Adam Jackson 1.2.0-1 +- libXext 1.2.0 + +* Tue Aug 24 2010 Adam Tkac 1.1.2-2 +- rebuild to ensure F14 NVR is higher than F13 + +* Fri Jun 04 2010 Adam Jackson 1.1.2-1 +- libXext 1.1.2 + +* Sat Dec 12 2009 Robert Scheck 1.1-2 +- libXext-1.1-XAllocID.patch: call XAllocID with the display lock held. +- libXext-1.1-event_vec-smash.patch: don't smash the event processing vector + if the server has an older extension version than the client. + +* Tue Oct 06 2009 Adam Jackson 1.1-1 +- libXext 1.1 + * Fri Jul 24 2009 Fedora Release Engineering - 1.0.99.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh new file mode 100755 index 0000000..9399b57 --- /dev/null +++ b/make-git-snapshot.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +DIRNAME=libXext-$( date +%Y%m%d ) + +rm -rf $DIRNAME +git clone git://git.freedesktop.org/git/xorg/lib/libXext $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 7629e15..e8cfe81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24da44888b87c66edb326acec35b85aa libXext-1.0.99.4.tar.bz2 +SHA512 (libXext-1.3.6.tar.xz) = fd7693b5698cc4f5e80002a2cd4bd88e5d52c755c19a0417ee73029bd65f9d77b0969e765a1febc4d8fce1ba5dfb7278717f47be742e33d8fc5eb941e769792e