diff --git a/.gitignore b/.gitignore index ee618f2..d6382c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,8 @@ libXtst-1.0.99.2.tar.bz2 +/libXtst-1.2.0.tar.bz2 +/libXtst-1.2.1.tar.bz2 +/libXtst-20130524.tar.bz2 +/libXtst-1.2.2.tar.bz2 +/libXtst-1.2.3.tar.bz2 +/libXtst-1.2.4.tar.xz +/libXtst-1.2.5.tar.xz diff --git a/commitid b/commitid new file mode 100644 index 0000000..5888402 --- /dev/null +++ b/commitid @@ -0,0 +1 @@ +e7e04b7be3f018ad636aba3a36bfc1cd80b9906d diff --git a/libXtst.spec b/libXtst.spec index 6205027..d859f1f 100644 --- a/libXtst.spec +++ b/libXtst.spec @@ -1,16 +1,28 @@ +%global tarball libXtst +#global gitdate 20130524 +%global gitversion e7e04b7be + Summary: X.Org X11 libXtst runtime library Name: libXtst -Version: 1.0.99.2 -Release: 3%{?dist} -License: MIT -Group: System Environment/Libraries +Version: 1.2.5 +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +License: MIT-open-group AND HPND-sell-variant AND X11 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: xorg-x11-util-macros +BuildRequires: autoconf automake libtool make BuildRequires: xorg-x11-proto-devel -BuildRequires: libX11-devel +BuildRequires: libX11-devel >= 1.5.99.902 BuildRequires: libXext-devel BuildRequires: libXi-devel BuildRequires: xmlto @@ -20,25 +32,19 @@ X.Org X11 libXtst runtime library %package devel Summary: X.Org X11 libXtst development package -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: libXi-devel +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: libXi-devel%{?_isa} %description devel X.Org X11 libXtst development package %prep -%setup -q - -# Disable static library creation by default. -%define with_static 0 +%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %build +autoreconf -v --install --force -%configure \ -%if ! %{with_static} - --disable-static -%endif +%configure --disable-static make %{?_smp_mflags} %install @@ -49,134 +55,120 @@ 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 +rm -rf $RPM_BUILD_ROOT%{_docdir} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_post +%ldconfig_postun %files -%defattr(-,root,root,-) -%doc COPYING ChangeLog +%doc COPYING %{_libdir}/libXtst.so.6 %{_libdir}/libXtst.so.6.1.0 %files devel -%defattr(-,root,root,-) %{_includedir}/X11/extensions/XTest.h %{_includedir}/X11/extensions/record.h -%if %{with_static} -%{_libdir}/libXtst.a -%endif %{_libdir}/libXtst.so %{_libdir}/pkgconfig/xtst.pc %{_mandir}/man3/XTest*.3* %changelog -* Mon Aug 31 2009 Caolán McNamara 1.0.99.2-3 -- Resolves: rhbz#513753 libXtst-devel requires libXi-devel for - included headers +* Thu Jul 24 2025 Fedora Release Engineering - 1.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Tue Aug 25 2009 Peter Hutterer 1.0.99.2-2 -- libXtst provides record.h now +* Fri Jan 17 2025 Fedora Release Engineering - 1.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild -* Tue Aug 25 2009 Peter Hutterer 1.0.99.2-1 -- libXtst 1.0.99.2 +* Fri Aug 02 2024 José Expósito 1.2.5-1 +- libXtst 1.2.5 -* Fri Jul 24 2009 Fedora Release Engineering - 1.0.99.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Thu Jul 18 2024 Fedora Release Engineering - 1.2.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild -* Thu Jul 23 2009 Adam Jackson 1.0.99.1-2 -- Un-require xorg-x11-filesystem +* Thu Jan 25 2024 Fedora Release Engineering - 1.2.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Wed Jul 22 2009 Adam Jackson 1.0.99.1-1 -- libXtst 1.0.99.1 +* Sun Jan 21 2024 Fedora Release Engineering - 1.2.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Wed Feb 25 2009 Fedora Release Engineering - 1.0.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Mon Oct 02 2023 Benjamin Tissoires - 1.2.4-4 +- SPDX migration -* Sun Dec 7 2008 Mamoru Tasaka - 1.0.3-4 -- Rebuild for pkgconfig provides +* Thu Jul 20 2023 Fedora Release Engineering - 1.2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild -* Tue Feb 19 2008 Fedora Release Engineering - 1.0.3-3 -- Autorebuild for GCC 4.3 +* Thu Jan 19 2023 Fedora Release Engineering - 1.2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Tue Jan 15 2008 parag - 1.0.3-2 -- Merge-Review #226091 -- Removed XFree86-libs, xorg-x11-libs XFree86-devel, xorg-x11-devel as Obsoletes -- Removed BR:pkgconfig -- Removed zero-length README AUTHORS file +* Fri Nov 04 2022 Benjamin Tissoires 1.2.4-1 +- libXtst 1.2.4-1 -* Mon Sep 24 2007 Adam Jackson 1.0.3-1 -- libXtst 1.0.3 +* Thu Jul 21 2022 Fedora Release Engineering - 1.2.3-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild -* Wed Aug 22 2007 Adam Jackson - 1.0.2-2 -- Rebuild for PPC toolchain bug +* Thu Jan 20 2022 Fedora Release Engineering - 1.2.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Sat Jun 23 2007 Adam Jackson 1.0.2-1. -- libXtst 1.0.2 +* Thu Jul 22 2021 Fedora Release Engineering - 1.2.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Sat Apr 21 2007 Matthias Clasen - 1.0.1-4 -- Don't install INSTALL +* Tue Jan 26 2021 Fedora Release Engineering - 1.2.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Wed Jul 12 2006 Jesse Keating - 1.0.1-3.1 -- rebuild +* Tue Jan 05 2021 Peter Hutterer 1.2.3-13 +- Add make to BuildRequires -* Fri Jun 09 2006 Mike A. Harris 1.0.1-3 -- Added "Requires: xorg-x11-proto-devel" to devel package for xtst.pc +* Tue Jul 28 2020 Fedora Release Engineering - 1.2.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Mon Jun 05 2006 Mike A. Harris 1.0.1-2 -- Added "BuildRequires: pkgconfig" for (#193504) -- Replace "makeinstall" with "make install DESTDIR=..." -- Remove package ownership of mandir/libdir/etc. +* Wed Jan 29 2020 Fedora Release Engineering - 1.2.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild -* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 -- bump again for double-long bug on ppc(64) +* Thu Jul 25 2019 Fedora Release Engineering - 1.2.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild -* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 -- rebuilt for new gcc4.1 snapshot and glibc changes +* Fri Feb 01 2019 Fedora Release Engineering - 1.2.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild -* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 -- Updated libXtst to version 1.0.1 from X11R7.0 +* Fri Jul 13 2018 Fedora Release Engineering - 1.2.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Fri Dec 16 2005 Mike A. Harris 1.0.0-1 -- Updated libXtst to version 1.0.0 from X11R7 RC4 +* Thu Jul 05 2018 Adam Jackson - 1.2.3-7 +- Drop useless %%defattr -* Tue Dec 13 2005 Mike A. Harris 0.99.3-1 -- Updated libXtst to version 0.99.3 from X11R7 RC3 -- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-3", to ensure - that /usr/lib/X11 and /usr/include/X11 pre-exist. -- Removed 'x' suffix from manpage directories to match RC3 upstream. +* Fri Jun 29 2018 Adam Jackson - 1.2.3-6 +- Use ldconfig scriptlet macros -* Fri Dec 09 2005 Jesse Keating -- rebuilt +* Wed Feb 07 2018 Fedora Release Engineering - 1.2.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild -* Fri Nov 11 2005 Mike A. Harris 0.99.2-1 -- Updated libXtst to version 0.99.2 from X11R7 RC2 -- Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes' -- Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes' +* Thu Aug 03 2017 Fedora Release Engineering - 1.2.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild -* Mon Oct 24 2005 Mike A. Harris 0.99.1-1 -- Updated libXtst to version 0.99.1 from X11R7 RC1 +* Wed Jul 26 2017 Fedora Release Engineering - 1.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild -* Thu Sep 29 2005 Mike A. Harris 0.99.0-3 -- Renamed package to remove xorg-x11 from the name due to unanimous decision - between developers. -- Use Fedora Extras style BuildRoot tag. -- Disable static library creation by default. -- Add missing defattr to devel subpackage -- Add missing documentation files to doc macro +* Fri Feb 10 2017 Fedora Release Engineering - 1.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild -* Tue Aug 23 2005 Mike A. Harris 0.99.0-2 -- Renamed package to prepend "xorg-x11" to the name for consistency with - the rest of the X11R7 packages. -- Added "Requires: %%{name} = %%{version}-%%{release}" dependency to devel - subpackage to ensure the devel package matches the installed shared libs. -- Added virtual "Provides: lib" and "Provides: lib-devel" to - allow applications to use implementation agnostic dependencies. -- Added post/postun scripts which call ldconfig. -- Added Conflicts with XFree86-libs and xorg-x11-libs to runtime package, - and Conflicts with XFree86-devel and xorg-x11-devel to devel package. +* Wed Oct 05 2016 Benjamin Tissoires 1.2.3-1%{?gitdate:.git}%{?dist} +- libXtst 1.2.3 +- fixes CVE-2016-7951, CVE-2016-7952 -* Mon Aug 22 2005 Mike A. Harris 0.99.0-1 -- Initial build. +* Thu Feb 04 2016 Fedora Release Engineering - 1.2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 1.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.2.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 1.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri May 31 2013 Peter Hutterer 1.2.2-1 +- libXtst 1.2.2 diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh new file mode 100755 index 0000000..0bcb05a --- /dev/null +++ b/make-git-snapshot.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +DIRNAME=libXtst-$( date +%Y%m%d ) + +rm -rf $DIRNAME +git clone git://git.freedesktop.org/git/xorg/lib/libXtst $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 8849f37..ffe6abc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b5edc35ca9b9ba4133a3fa34cb1b00f8 libXtst-1.0.99.2.tar.bz2 +SHA512 (libXtst-1.2.5.tar.xz) = 848fa580d7abccd48c9ca3440f92e299839ada0912ed60d38d4d4f5bf37431cd02d7059265ab4e524c3e2cb9c368b9b90b863d1ed97d74979ef8811fc5e635a9