diff --git a/.gitignore b/.gitignore index 197546b..d7b37f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -libXi-20090825.tar.bz2 +/libXi-1.*.tar.xz diff --git a/commitid b/commitid index 6621481..0090725 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -2ce629c30745fc4027d2a95745bf21e8d8c7b893 +661c45ca17c434dbd342a46fd3fb813852ae0ca9 diff --git a/libXi.spec b/libXi.spec index 4577b5f..2b472ea 100644 --- a/libXi.spec +++ b/libXi.spec @@ -1,33 +1,37 @@ -%define tarball libXi -#define gitdate 20090825 +%global tarball libXi +#global gitdate 20130524 +%global gitversion 661c45ca1 Summary: X.Org X11 libXi runtime library Name: libXi -Version: 1.3 -Release: 2%{?dist} -License: MIT -Group: System Environment/Libraries +Version: 1.8.2 +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +License: MIT-open-group AND SMLNJ AND MIT 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 -#Source0: %{tarball}-%{gitdate}.tar.bz2 +%if 0%{?gitdate} +Source0: %{tarball}-%{gitdate}.tar.bz2 Source1: make-git-snapshot.sh +%else +Source0: https://www.x.org/pub/individual/lib/%{name}-%{version}.tar.xz +%endif +BuildRequires: make BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel -BuildRequires: pkgconfig(inputproto) >= 1.9.99.902 -BuildRequires: libX11-devel >= 1.2.99 -BuildRequires: libXext-devel +BuildRequires: pkgconfig(inputproto) >= 2.3.99.1 +BuildRequires: libX11-devel >= 1.5.99.902 +BuildRequires: libXext-devel libXfixes-devel BuildRequires: xmlto asciidoc >= 8.4.5 +Requires: libX11 >= 1.5.99.902 + %description X.Org X11 libXi runtime library %package devel Summary: X.Org X11 libXi development package -Group: Development/Libraries Requires: %{name} = %{version}-%{release} # required by xi.pc Requires: xorg-x11-proto-devel @@ -37,18 +41,12 @@ Requires: pkgconfig X.Org X11 libXi development package %prep -%setup -q -#setup -q -n %{tarball}-%{gitdate} - -# Disable static library creation by default. -%define with_static 0 +%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %build autoreconf -v --install || exit 1 -%configure \ -%if ! %{with_static} - --disable-static -%endif +%configure --disable-specs \ + --disable-static make %{?_smp_mflags} @@ -60,31 +58,252 @@ 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 COPYING %{_libdir}/libXi.so.6 %{_libdir}/libXi.so.6.1.0 %files devel -%defattr(-,root,root,-) -%if %{with_static} -%{_libdir}/libXi.a -%endif %{_includedir}/X11/extensions/XInput.h %{_includedir}/X11/extensions/XInput2.h %{_libdir}/libXi.so %{_libdir}/pkgconfig/xi.pc -#%dir %{_mandir}/man3x %{_mandir}/man3/*.3* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.8.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 1.8.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Sep 05 2024 Peter Hutterer - 1.8.2-1 +- libXi 1.8.2 + +* Thu Jul 18 2024 Fedora Release Engineering - 1.8.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.8.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 06 2023 Benjamin Tissoires - 1.8.1-3 +- SPDX migration + +* Thu Jul 20 2023 Fedora Release Engineering - 1.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu May 04 2023 Peter Hutterer - 1.8.1-1 +- libXi 1.8.1 + +* Thu Jan 19 2023 Fedora Release Engineering - 1.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Sep 16 2021 Peter Hutterer - 1.8-1 +- libXi 1.8 + +* Thu Jul 22 2021 Fedora Release Engineering - 1.7.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.7.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Nov 5 11:25:48 AEST 2020 Peter Hutterer - 1.7.10-5 +- Add BuildRequires for make + +* Tue Jul 28 2020 Fedora Release Engineering - 1.7.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 1.7.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.7.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jun 19 2019 Adam Jackson - 1.7.10-1 +- libXi 1.7.10 + +* Fri Feb 01 2019 Fedora Release Engineering - 1.7.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.7.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Jun 29 2018 Adam Jackson - 1.7.9-7 +- Use ldconfig scriptlet macros + +* Fri Feb 09 2018 Igor Gnatenko - 1.7.9-6 +- Escape macros in %%changelog + +* Wed Feb 07 2018 Fedora Release Engineering - 1.7.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.7.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.7.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.7.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 23 2017 Peter Hutterer 1.7.9-1 +- libXi 1.7.9 + +* Tue Oct 25 2016 Peter Hutterer 1.7.8-2 +- libXi 1.7.8 + +* Thu Oct 13 2016 Peter Hutterer 1.7.7-2 +- Fix crash when calling XListInputDevices on devices without classes + +* Wed Oct 05 2016 Benjamin Tissoires 1.7.7-1 +- libXi 1.7.7 +- fixes CVE-2016-7945, CVE-2016-7946 + +* Fri Mar 25 2016 Benjamin Tissoires +- Fix release string: %%{dist} -> %%{?dist} + +* Thu Feb 04 2016 Fedora Release Engineering - 1.7.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 28 2016 Peter Hutterer +- Remove unnecessary defattr + +* Tue Jan 05 2016 Peter Hutterer +- Drop the optional disable-static, it's been disabled for years now. + +* Tue Dec 22 2015 Peter Hutterer 1.7.6-1 +- libXi 1.7.6 +- drop unused mandir creation + +* Thu Sep 10 2015 Peter Hutterer 1.7.5-1 +- libXi 1.7.5 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.7.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 1.7.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Fri Jul 18 2014 Peter Hutterer 1.7.4-1 +- libXi 1.7.4 + +* Thu Jul 10 2014 Peter Hutterer 1.7.3-1 +- libXi 1.7.3 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.7.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 1.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Jul 03 2013 Peter Hutterer 1.7.2-1 +- libXi 1.7.2 + +* Thu Jun 27 2013 Peter Hutterer 1.7.1.901-1 +- libXi 1.7.1.901 + +* Mon May 27 2013 Peter Hutterer - 1.7.1-5.20130524git661c45ca1 +- Require libX11 1.6RC2 for _XEatDataWords + +* Fri May 24 2013 Peter Hutterer 1.7.1-4.20130524git661c45ca1 +- Udpate to git snapshot to fix CVEs listed below +- CVE-2013-1984 +- CVE-2013-1995 +- CVE-2013-1998 + +* Tue May 21 2013 Peter Hutterer 1.7.1-3 +- fix sequence number copy - the cookie already had (a potentially + different) sequence number copied (#965347) + +* Fri May 17 2013 Peter Hutterer 1.7.1-2 +- copy the sequence number into XI2 events + +* Fri Apr 05 2013 Peter Hutterer 1.7.1-1 +- libXi 1.7.1 + +* Thu Mar 07 2013 Peter Hutterer 1.7-1 +- libXi 1.7 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.6.99.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Jan 08 2013 Adam Jackson 1.6.99.1-1 +- libXi 1.6.99.1 + +* Thu Jul 19 2012 Fedora Release Engineering - 1.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu May 03 2012 Peter Hutterer 1.6.1-1 +- libXi 1.6.1 + +* Thu Mar 08 2012 Peter Hutterer 1.6.0-1 +- libXi 1.6 + +* Wed Feb 15 2012 Peter Hutterer 1.5.99.3-1 +- libXi 1.5.99.3 + +* Mon Feb 06 2012 Peter Hutterer 1.5.99.2-4 +- Add requires for libX11 to avoid mismatches when updating + +* Fri Jan 27 2012 Peter Hutterer 1.5.99.2-3 +- Bump libX11-devel requirement up to what configure actually wants + +* Fri Jan 13 2012 Fedora Release Engineering - 1.5.99.2-2.20111222gitae0187c87 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Dec 22 2011 Peter Hutterer 1.5.99.2-1.20111222.gitae0187c87 +- 1.5.99.2 from git + +* Wed Dec 21 2011 Peter Hutterer 1.5.0-1 +- libXi 1.5.0 + +* Wed Nov 09 2011 Peter Hutterer 1.4.99.1-1 +- Update to 1.4.99.1 (with XI 2.1 support) + +* Tue Oct 11 2011 Peter Hutterer 1.4.3-3 +- Fix 0001-Handle-unknown-device-classes.patch: missing prototype change for + copy_classes in XIQueryDevice caused parameter corruption (#744960) + +* Wed Aug 17 2011 Peter Hutterer 1.4.3-2 +- 0001-Handle-unknown-device-classes.patch: don't corrupt memory when a + server sends unknown device classes. + +* Tue Jun 07 2011 Peter Hutterer 1.4.3-1 +- libXi 1.4.3 + +* Mon Mar 21 2011 Adam Jackson 1.4.2-1 +- libXi 1.4.2 + +* Mon Feb 07 2011 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jan 26 2011 Peter Hutterer 1.4.1-1 +- libXi 1.4.1 + +* Wed Nov 03 2010 Peter Hutterer 1.4.0-1 +- libXi 1.4 +- disable spec building, don't think they're of much of much use to our + users. + +* Wed Aug 04 2010 Peter Hutterer 1.3.2-1 +- libXi 1.3.2 + libXi 1.3.1 had a bug in the configure script. + +* Mon Aug 02 2010 Peter Hutterer 1.3.1-1 +- libXi 1.3.1 + * Tue Feb 02 2010 Peter Hutterer 1.3-2 - Remove unnecessary libXau-devel BuildRequires. @@ -127,7 +346,7 @@ rm -rf $RPM_BUILD_ROOT - Update to today's git master * Thu Feb 26 2009 Peter Hutterer - 1.2.1-1 -- libXi 1.2.1 +- libXi 1.2.1 * Wed Feb 25 2009 Fedora Release Engineering - 1.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index ff5849f..4f3bb54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8df4ece9bd1efb02c28acb2b6f485e09 libXi-1.3.tar.bz2 +SHA512 (libXi-1.8.2.tar.xz) = 6348aae8f595217e26f348184dd594d83af800949f649bfd11b6aef7387faa5624ed18551fe2c3a38c8deab9d7473f72fd7e3e8472cff3ff30d4bb3fb2e6dc31