diff --git a/.gitignore b/.gitignore index d8763f5..8ca2bd4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1 @@ libFS-1.0.0.tar.bz2 -/libFS-1.0.2.tar.bz2 -/libFS-1.0.3.tar.bz2 -/libFS-1.0.4.tar.bz2 -/libFS-20130524.tar.bz2 -/libFS-1.0.5.tar.bz2 -/libFS-1.0.6.tar.bz2 -/libFS-1.0.7.tar.bz2 -/libFS-1.0.8.tar.bz2 -/libFS-1.0.9.tar.xz diff --git a/commitid b/commitid deleted file mode 100644 index 91795d1..0000000 --- a/commitid +++ /dev/null @@ -1 +0,0 @@ -26dc23446c2e7818fdebfb46e101bac4883df07e diff --git a/libFS.spec b/libFS.spec index 2c3c8a1..6c05d2b 100644 --- a/libFS.spec +++ b/libFS.spec @@ -1,24 +1,13 @@ -%global tarball libFS -#global gitdate 20130524 -#global gitversion 26dc23446 - Summary: X.Org X11 libFS runtime library Name: libFS -Version: 1.0.9 -Release: 8%{?dist} +Version: 1.0.1 +Release: 5%{?dist} License: MIT +Group: System Environment/Libraries URL: http://www.x.org +Source0: ftp://ftp.x.org/pub/individual/lib/%{name}-%{version}.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if 0%{?gitdate} -Source0: %{tarball}-%{gitdate}.tar.bz2 -Source1: make-git-snapshot.sh -Source2: commitid -%else -Source0: https://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz -%endif - -BuildRequires: xorg-x11-util-macros -BuildRequires: autoconf automake libtool make BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-xtrans-devel >= 1.0.3-4 @@ -28,179 +17,57 @@ X.Org X11 libFS runtime library %package devel Summary: X.Org X11 libFS development package +Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Provides: %{name}-devel + %description devel X.Org X11 libFS 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 --disable-static +%configure \ +%if ! %{with_static} + --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 -# hack, we'll %%doc this on our own -rm -rf $RPM_BUILD_ROOT%{_docdir} +%clean +rm -rf $RPM_BUILD_ROOT -%ldconfig_post -%ldconfig_postun +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files -%doc COPYING README.md +%defattr(-,root,root,-) +%doc AUTHORS COPYING README ChangeLog %{_libdir}/libFS.so.6 %{_libdir}/libFS.so.6.0.0 %files devel -%doc doc/FSlib.txt +%defattr(-,root,root,-) %{_includedir}/X11/fonts/FSlib.h +%if %{with_static} +%{_libdir}/libFS.a +%endif %{_libdir}/libFS.so %{_libdir}/pkgconfig/libfs.pc %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 1.0.9-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 1.0.9-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 1.0.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Thu Jan 25 2024 Fedora Release Engineering - 1.0.9-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.0.9-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 1.0.9-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1.0.9-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Nov 04 2022 Benjamin Tissoires 1.0.9-1 -- libFS 1.0.9 - -* Thu Jul 21 2022 Fedora Release Engineering - 1.0.8-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 1.0.8-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 1.0.8-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.0.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Dec 01 2020 Peter Hutterer 1.0.8-4 -- Add make to BuildRequires - -* Tue Jul 28 2020 Fedora Release Engineering - 1.0.8-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Jan 29 2020 Fedora Release Engineering - 1.0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Sep 26 2019 Adam Jackson - 1.0.8-1 -- libFS 1.0.8 - -* Thu Jul 25 2019 Fedora Release Engineering - 1.0.7-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Mar 21 2019 Adam Jackson - 1.0.7-12 -- Rebuild for xtrans 1.4.0 - -* Fri Feb 01 2019 Fedora Release Engineering - 1.0.7-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 1.0.7-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jul 05 2018 Adam Jackson - 1.0.7-9 -- Drop useless %%defattr - -* Fri Jun 29 2018 Adam Jackson - 1.0.7-8 -- Use ldconfig scriptlets - -* Wed Feb 07 2018 Fedora Release Engineering - 1.0.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.0.7-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.0.7-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.0.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 1.0.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 1.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri May 01 2015 Adam Jackson 1.0.7-1 -- libFS 1.0.7 - -* Sun Aug 17 2014 Fedora Release Engineering - 1.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.0.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon Mar 17 2014 Peter Hutterer 1.0.6-1 -- libFS 1.0.6 - -* Sat Aug 03 2013 Fedora Release Engineering - 1.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri May 31 2013 Peter Hutterer 1.0.5-1 -- libFS 1.0.5 - -* Fri May 24 2013 Peter Hutterer 1.0.4-6.20130524git26dc23446 -- Update to git snapshot to fix CVEs listed below: -- CVE-2013-1996 - -* Thu Mar 07 2013 Peter Hutterer - 1.0.4-5 -- autoreconf needs xorg-x11-util-macros - -* Thu Mar 07 2013 Peter Hutterer - 1.0.4-4 -- autoreconf for aarch64 - -* Thu Feb 14 2013 Fedora Release Engineering - 1.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 1.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Mar 05 2012 Adam Jackson 1.0.4-1 -- libFS 1.0.4 - -* Fri Jan 13 2012 Fedora Release Engineering - 1.0.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.0.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Oct 28 2010 Adam Jackson 1.0.3-1 -- libFS 1.0.3 - -* Mon Aug 30 2010 Adam Jackson 1.0.2-1 -- libFS 1.0.2 -- merge review cleanups (#226005) - * Fri Jul 24 2009 Fedora Release Engineering - 1.0.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh deleted file mode 100755 index 9638069..0000000 --- a/make-git-snapshot.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -DIRNAME=libFS-$( date +%Y%m%d ) - -rm -rf $DIRNAME -git clone git://git.freedesktop.org/git/xorg/lib/libFS $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 ad5c440..3dc377c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libFS-1.0.9.tar.xz) = 7d012e62736c6d567931bad982eec221199d296f0fe41e1e7fde5575b8b928e9a8c644aa8746242bdfe72393635320b58774d9a519285765bd26d633588092b8 +81521249353fa33be7a4bb0062c2fbb9 libFS-1.0.1.tar.bz2