dist-git conversion

#2781)

.gitignore

@@ -1 +1 @@
-/libXfixes-*.tar.*
+libXfixes-4.0.3.tar.bz2

commitid

@@ -1 +0,0 @@
-c480fe3271873ec7471b0cbd680f4dac18ca8904

libXfixes.spec

@@ -1,237 +1,84 @@
-%global tarball libXfixes
+Summary: X.Org X11 libXfixes runtime library
-#global gitdate 20130524
-%global gitversion c480fe327
-
-Summary: X Fixes library
 Name: libXfixes
-Version: 6.0.1
+Version: 4.0.3
-Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release: 2%{?dist}
-License: MIT AND HPND-sell-variant
+License: MIT/X11
+Group: System Environment/Libraries
 URL: http://www.x.org
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{?gitdate}
+Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2
-Source0:    %{tarball}-%{gitdate}.tar.xz
-Source1:    make-git-snapshot.sh
-Source2:    commitid
-%else
-Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz
-%endif
 
-Requires: libX11 >= 1.6
+BuildRequires: pkgconfig
+BuildRequires: libX11-devel
+BuildRequires: xorg-x11-proto-devel >= 7.0-7
 
-BuildRequires: make
+Obsoletes: XFree86-libs, xorg-x11-libs
-BuildRequires: xorg-x11-util-macros
-BuildRequires: autoconf automake libtool
-BuildRequires: pkgconfig(fixesproto) pkgconfig(xext)
-BuildRequires: libX11-devel >= 1.5.99.902
 
 %description
-X Fixes library.
+X.Org X11 libXfixes runtime library
 
 %package devel
-Summary: Development files for %{name}
+Summary: X.Org X11 libXfixes development package
+Group: Development/Libraries
+Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+
+# xfixes.pc Requires: xproto fixesproto >= 4.0
+Requires: xorg-x11-proto-devel >= 7.0-7
+
+Obsoletes: XFree86-devel, xorg-x11-devel
 
 %description devel
-libXfixes development package
+X.Org X11 libXfixes development package
 
 %prep
-%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%setup -q
+
+# Disable static library creation by default.
+%define with_static 0
 
 %build
-autoreconf -v --install --force
+%configure \
-%configure --disable-static
+%if ! %{with_static}
-make V=1 %{?_smp_mflags}
+	--disable-static
+%endif
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-%ldconfig_post
+%clean
-%ldconfig_postun
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS COPYING README.md
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING README ChangeLog
 %{_libdir}/libXfixes.so.3
 %{_libdir}/libXfixes.so.3.1.0
 
 %files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/X11
+%dir %{_includedir}/X11/extensions
 %{_includedir}/X11/extensions/Xfixes.h
+%if %{with_static}
+%{_libdir}/libXfixes.a
+%endif
 %{_libdir}/libXfixes.so
 %{_libdir}/pkgconfig/xfixes.pc
+#%dir %{_mandir}/man3x
 %{_mandir}/man3/Xfixes.3*
 
 %changelog
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Oct 05 2023 José Expósito <jexposit@redhat.com> - 6.0.1-1
-- libXfixes 6.0.1
-
-* Wed Sep 06 2023 Benjamin Tissoires <benjamin.tissoires@redhat.com> - 6.0.0-7
-- SPDX migration
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed May 12 2021 Peter Hutterer <peter.hutterer@redhat.com> 6.0.0-1
-- libXfixes 6.0
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-14
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Nov  5 11:24:36 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 5.0.3-13
-- Add BuildRequires for make
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jul 05 2018 Adam Jackson <ajax@redhat.com> - 5.0.3-7
-- Drop useless %%defattr
-
-* Fri Jun 29 2018 Adam Jackson <ajax@redhat.com> - 5.0.3-6
-- Use ldconfig scriptlet macros
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Wed Oct 05 2016 Benjamin Tissoires <benjamin.tissoires@redhat.com> 5.0.3-1
-- LibXfixes 5.0.3
-- fixes CVE-2016-7944
-
-* Fri May 27 2016 Benjamin Tissoires <benjamin.tissoires@redhat.com> 5.0.2-2
-- require libX11 1.6
-
-* Fri May 27 2016 Benjamin Tissoires <benjamin.tissoires@redhat.com> 5.0.2-1
-- libXfixes 5.0.2
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Fri May 31 2013 Peter Hutterer <peter.hutterer@redhat.com> 5.0.1-1
-- libXfixes 5.0.1
-
-* Mon May 27 2013 Peter Hutterer <peter.hutterer@redhat.com> - 5.0-7.20130524gitc480fe327
-- Require libX11 1.6RC2 for _XEatDataWords
-
-* Fri May 24 2013 Peter Hutterer <peter.hutterer@redhat.com> 5.0-6.20130524gitc480fe327
-- Update to latest git to fix the following CVEs:
-- CVE-2013-1983
-
-* Thu Mar 07 2013 Peter Hutterer <peter.hutterer@redhat.com> - 5.0-5
-- autoreconf for aarch64
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Mar 16 2011 Adam Jackson <ajax@redhat.com> 5.0-1
-- libXfixes 5.0
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Thu Jun 10 2010 Peter Hutterer <peter.hutterer@redhat.com> 4.0.5-1
-- libXfixes 4.0.5
-
-* Wed Oct 21 2009 Parag <paragn@fedoraproject.org> - 4.0.4-2
-- Merge-Review #226071
-- make is not verbose
-
-* Tue Oct 13 2009 Adam Jackson <ajax@redhat.com> 4.0.4-1
-- libXfixes 4.0.4
-
-* Thu Oct 08 2009 Parag <paragn@fedoraproject.org> - 4.0.3-9
-- Merge-Review #226071
-- Removed XFree86-libs, xorg-x11-libs, XFree86-devel, xorg-x11-devel as Obsoletes
-- Removed BR:pkgconfig
-- spec cleanups
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.3-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Jul 23 2009 Adam Jackson <ajax@redhat.com> 4.0.3-7
-- Un-require xorg-x11-filesystem
-
-* Thu Jul 23 2009 Adam Jackson <ajax@redhat.com> 4.0.3-6
-- Remove useless %%dir
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Jul 15 2008 Adam Jackson <ajax@redhat.com> 4.0.3-4
-- Fix license tag.
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 4.0.3-3
-- Autorebuild for GCC 4.3
-
 * Tue Aug 21 2007 Adam Jackson <ajax@redhat.com> - 4.0.3-2
 - Rebuild for build id
 

make-git-snapshot.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-DIRNAME=libXfixes-$( date +%Y%m%d )
-
-rm -rf $DIRNAME
-git clone git://git.freedesktop.org/git/xorg/lib/libXfixes $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

sources

@@ -1 +1 @@
-SHA512 (libXfixes-6.0.1.tar.xz) = b46deffb30cd73ec8a127390d99f2ba2f3ab78f334fdba227f1f461441644a0c169b0d13ffa47576fa458780e7a6db664ff8b93e9195fb217262efd8128f1ffe
+1990d19725a3c7f32290037f02d3737f  libXfixes-4.0.3.tar.bz2