diff --git a/.gitignore b/.gitignore index c54c4eb..8b6012a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1 @@ -libXt-1.0.7.tar.bz2 -/libXt-1.0.9.tar.bz2 -/libXt-1.1.0.tar.bz2 -/libXt-1.1.1.tar.bz2 -/libXt-1.1.2.tar.bz2 -/libXt-1.1.3.tar.bz2 -/libXt-20130524.tar.bz2 -/libXt-1.1.4.tar.bz2 -/libXt-1.1.5.tar.bz2 -/libXt-20190424.tar.bz2 -/libXt-1.2.0.tar.bz2 -/libXt-1.2.1.tar.bz2 -/libXt-1.3.0.tar.xz -/libXt-1.3.1.tar.xz +libXt-1.0.6.tar.bz2 diff --git a/commitid b/commitid deleted file mode 100644 index 6bff993..0000000 --- a/commitid +++ /dev/null @@ -1 +0,0 @@ -ba4ec937680ee72f2fcd463752766340a4b3729d diff --git a/libXt-1.0.2-libsm-fix.patch b/libXt-1.0.2-libsm-fix.patch new file mode 100644 index 0000000..309aea8 --- /dev/null +++ b/libXt-1.0.2-libsm-fix.patch @@ -0,0 +1,11 @@ +--- libXt-1.0.2/xt.pc.in.libsm-fix 2006-06-28 14:56:37.000000000 -0400 ++++ libXt-1.0.2/xt.pc.in 2006-06-28 14:56:51.000000000 -0400 +@@ -7,7 +7,7 @@ + Name: Xt + Description: X Toolkit Library + Version: @VERSION@ +-Requires: xproto x11 sm ++Requires: xproto x11 + Requires.private: x11 sm + Cflags: -I${includedir} + Libs: -L${libdir} -lXt diff --git a/libXt.spec b/libXt.spec index f81988c..f340366 100644 --- a/libXt.spec +++ b/libXt.spec @@ -1,51 +1,41 @@ -%global tarball libXt -#global gitdate 20190424 -#global gitversion ba4ec9376 - Summary: X.Org X11 libXt runtime library Name: libXt -Version: 1.3.1 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} -License: MIT AND HPND-sell-variant AND SMLNJ AND MIT-open-group AND X11 -URL: https://www.x.org +Version: 1.0.7 +Release: 1%{?dist} +License: MIT +Group: System Environment/Libraries +URL: http://www.x.org +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if 0%{?gitdate} -Source0: %{tarball}-%{gitdate}.tar.xz -Source1: make-git-snapshot.sh -Source2: commitid -%else -Source0: https://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%{?_isa} >= 1.6 +Patch0: libXt-1.0.2-libsm-fix.patch -BuildRequires: make -BuildRequires: xorg-x11-util-macros -BuildRequires: autoconf automake libtool BuildRequires: pkgconfig(xproto) pkgconfig(x11) pkgconfig(sm) -BUildRequires: libX11-devel >= 1.6 %description X.Org X11 libXt runtime library %package devel Summary: X.Org X11 libXt development package -Requires: %{name}%{?_isa} = %{version}-%{release} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} %description devel X.Org X11 libXt development package %prep -%autosetup -p1 -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%setup -q + +%patch0 -p1 -b .libsm-fix %build -autoreconf -v --install --force # FIXME: Work around pointer aliasing warnings from compiler for now export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --disable-static \ --with-xfile-search-path="%{_sysconfdir}/X11/%%L/%%T/%%N%%C%%S:%{_sysconfdir}/X11/%%l/%%T/\%%N%%C%%S:%{_sysconfdir}/X11/%%T/%%N%%C%%S:%{_sysconfdir}/X11/%%L/%%T/%%N%%S:%{_sysconfdir}/X\11/%%l/%%T/%%N%%S:%{_sysconfdir}/X11/%%T/%%N%%S:%{_datadir}/X11/%%L/%%T/%%N%%C%%S:%{_datadir}/X1\1/%%l/%%T/%%N%%C%%S:%{_datadir}/X11/%%T/%%N%%C%%S:%{_datadir}/X11/%%L/%%T/%%N%%S:%{_datadir}/X11/%%\l/%%T/%%N%%S:%{_datadir}/X11/%%T/%%N%%S" -V=1 make %{?_smp_mflags} +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -54,22 +44,22 @@ make install DESTDIR=$RPM_BUILD_ROOT mkdir -p -m 0755 $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -# adding to installed docs in order to avoid using %%doc magic -cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING +%clean +rm -rf $RPM_BUILD_ROOT -%ldconfig_post -%ldconfig_postun +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files +%defattr(-,root,root,-) +%doc COPYING ChangeLog %{_libdir}/libXt.so.6 %{_libdir}/libXt.so.6.0.0 %dir %{_datadir}/X11/app-defaults -# not using %%doc because of side-effect (#1001246) -%dir %{_docdir}/%{name} -%{_docdir}/%{name}/COPYING %files devel -%{_docdir}/%{name}/*.xml +%defattr(-,root,root,-) +%{_bindir}/makestrs %{_includedir}/X11/CallbackI.h %{_includedir}/X11/Composite.h %{_includedir}/X11/CompositeP.h @@ -105,165 +95,10 @@ cp -p COPYING ${RPM_BUILD_ROOT}%{_datadir}/doc/%{name}/COPYING %{_includedir}/X11/Xtos.h %{_libdir}/libXt.so %{_libdir}/pkgconfig/xt.pc +%{_mandir}/man1/makestrs.1* %{_mandir}/man3/*.3* %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 1.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 1.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Nov 18 2024 José Expósito - 1.3.1-1 -- libXt 1.3.1 - -* Thu Jul 18 2024 Fedora Release Engineering - 1.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.3.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.3.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Oct 05 2023 José Expósito - 1.3.0-1 -- libXt 1.3.0 - -* 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 -- libXt 1.2.1 - -* Thu Jul 22 2021 Fedora Release Engineering - 1.2.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.2.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Nov 5 12:26:39 AEST 2020 Peter Hutterer - 1.2.0-3 -- Add BuildRequires for make - -* Tue Jul 28 2020 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Feb 06 2020 Adam Jackson - 1.2.0-1 -- libXt 1.2.0 -- Work around a gcc10 issue - -* Wed Jan 29 2020 Fedora Release Engineering - 1.1.5-13.20190424gitba4ec9376 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 1.1.5-12.20190424gitba4ec9376 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Apr 24 2019 Benjamin Tissoires 1.1.5-11.20190424gitba4ec9376 -- Update to git snapshot to fix some covscan issues - -* Fri Feb 01 2019 Fedora Release Engineering - 1.1.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.1.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jun 29 2018 Adam Jackson - 1.1.5-8 -- Use ldconfig scriptlet macros - -* Wed Feb 07 2018 Fedora Release Engineering - 1.1.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.1.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.1.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.1.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 1.1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri May 01 2015 Adam Jackson 1.1.5-1 -- libXt 1.1.5 - -* Sun Aug 17 2014 Fedora Release Engineering - 1.1.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.1.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Dec 13 2013 Michael Schwendt - 1.1.4-8 -- Fix duplicate documentation (#1001246) by not using %%doc -- Turn on verbose build output via V=1 make -- Remove %%defattr -- Use %%?_isa in explicit package deps - -* Wed Oct 02 2013 Adam Jackson 1.1.4-7 -- Exclude docs from main package - -* Sat Aug 03 2013 Fedora Release Engineering - 1.1.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri May 31 2013 Peter Hutterer 1.1.4-5 -- libXt 1.1.4 - -* Mon May 27 2013 Peter Hutterer - 1.1.3-5.20130524git1f4802b74 -- Require libX11 1.6RC2 for _XEatDataWords - -* Fri May 24 2013 Peter Hutterer 1.1.3-4.20130524git1f4802b74 -- Update to git snapshot to fix CVEs listed below: -- CVE-2013-2002 -- CVE-2013-2005 - -* Thu Mar 07 2013 Peter Hutterer - 1.1.3-3 -- autoreconf for aarch64 - -* Thu Feb 14 2013 Fedora Release Engineering - 1.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 26 2012 Adam Jackson 1.1.3-1 -- libXt 1.1.3 - -* Thu Jul 19 2012 Fedora Release Engineering - 1.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Mar 15 2012 Adam Jackson 1.1.2-2 -- libXt-1.1.2-git.patch: Bugfix from git. - -* Thu Mar 08 2012 Adam Jackson 1.1.2-1 -- libXt 1.1.2 - -* Fri Jan 13 2012 Fedora Release Engineering - 1.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Mar 10 2011 Adam Jackson 1.1.1-1 -- libXt 1.1.1 - -* Mon Mar 07 2011 Adam Jackson 1.1.0-1 -- libXt 1.1.0 - -* Mon Feb 07 2011 Fedora Release Engineering - 1.0.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Nov 08 2010 Adam Jackson 1.0.9-1 -- libXt 1.0.9 - * Tue Oct 13 2009 Adam Jackson 1.0.7-1 - libXt 1.0.7 diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh deleted file mode 100755 index 71d7f95..0000000 --- a/make-git-snapshot.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -DIRNAME=libXt-$( date +%Y%m%d ) - -rm -rf $DIRNAME -git clone git://git.freedesktop.org/git/xorg/lib/libXt $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 ca43748..5337837 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXt-1.3.1.tar.xz) = c220292f60b0f53134cf9364831a32bbaa9fa6bbb3a7143e917920957b7a48c616e946042747089f29ea9d8a18ecd64de620bcaf56d82462e7107de906f5db38 +96f3c93434a93186d178b60d4a262496 libXt-1.0.7.tar.bz2