diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 8ca2bd4..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -libFS-1.0.0.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d8763f5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +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/Makefile b/Makefile deleted file mode 100644 index 18fa1d1..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libFS -# $Id: Makefile,v 1.1 2005/08/26 21:13:10 mharris Exp $ -NAME := libFS -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/commitid b/commitid new file mode 100644 index 0000000..91795d1 --- /dev/null +++ b/commitid @@ -0,0 +1 @@ +26dc23446c2e7818fdebfb46e101bac4883df07e diff --git a/libFS.spec b/libFS.spec index 2ba8157..2c3c8a1 100644 --- a/libFS.spec +++ b/libFS.spec @@ -1,82 +1,224 @@ +%global tarball libFS +#global gitdate 20130524 +#global gitversion 26dc23446 + Summary: X.Org X11 libFS runtime library Name: libFS -Version: 1.0.0 -Release: 6%{?dist} -License: MIT/X11 -Group: System Environment/Libraries +Version: 1.0.9 +Release: 8%{?dist} +License: MIT 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 -Obsoletes: XFree86-libs, xorg-x11-libs - %description X.Org X11 libFS runtime library %package devel Summary: X.Org X11 libFS development package -Group: Development/Libraries -Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Requires: %{name} = %{version}-%{release} -# NOTE: Required by libfs.pc -Requires: xorg-x11-proto-devel - -Provides: %{name}-devel -Obsoletes: XFree86-devel, xorg-x11-devel - %description devel X.Org X11 libFS development package %prep -%setup -q - -# Disable static library creation by default. -%define with_static 0 +%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %build -%configure \ -%if ! %{with_static} - --disable-static -%endif +autoreconf -v --install --force +%configure --disable-static make %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%clean -rm -rf $RPM_BUILD_ROOT +# hack, we'll %%doc this on our own +rm -rf $RPM_BUILD_ROOT%{_docdir} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_post +%ldconfig_postun %files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README ChangeLog +%doc COPYING README.md %{_libdir}/libFS.so.6 %{_libdir}/libFS.so.6.0.0 %files devel -%defattr(-,root,root,-) -%dir %{_includedir}/X11 -%dir %{_includedir}/X11/fonts +%doc doc/FSlib.txt %{_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 + +* Thu Jul 23 2009 Adam Jackson 1.0.1-4 +- Un-require xorg-x11-filesystem + +* Wed Feb 25 2009 Fedora Release Engineering - 1.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Jul 15 2008 Adam Jackson 1.0.1-2 +- Fix license tag. + +* Tue Jun 10 2008 Adam Jackson 1.0.1-1 +- libFS 1.0.1 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.0.0-7 +- Autorebuild for GCC 4.3 + * Thu Sep 20 2007 Adam Jackson 1.0.0-6 - Update xtrans dep and rebuild. diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh new file mode 100755 index 0000000..9638069 --- /dev/null +++ b/make-git-snapshot.sh @@ -0,0 +1,17 @@ +#!/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 b53a3a3..ad5c440 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dfd5de47e232db0891410bec8ee6707b libFS-1.0.0.tar.bz2 +SHA512 (libFS-1.0.9.tar.xz) = 7d012e62736c6d567931bad982eec221199d296f0fe41e1e7fde5575b8b928e9a8c644aa8746242bdfe72393635320b58774d9a519285765bd26d633588092b8