diff --git a/.gitignore b/.gitignore index e9518b4..f61adb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,7 @@ libdmx-1.1.0.tar.bz2 /libdmx-1.1.1.tar.bz2 +/libdmx-1.1.2.tar.bz2 +/libdmx-20130524.tar.bz2 +/libdmx-1.1.3.tar.bz2 +/libdmx-1.1.4.tar.bz2 +/libdmx-1.1.5.tar.xz diff --git a/commitid b/commitid new file mode 100644 index 0000000..ca093e6 --- /dev/null +++ b/commitid @@ -0,0 +1 @@ +5074d9d64192bd04519a438062b7d5bf216d06ee diff --git a/libdmx.spec b/libdmx.spec index b4921bc..ae4759c 100644 --- a/libdmx.spec +++ b/libdmx.spec @@ -1,31 +1,45 @@ +%global tarball libdmx +#global gitdate 20130524 +%global gitversion 5074d9d64 + Summary: X.Org X11 DMX runtime library Name: libdmx -Version: 1.1.1 -Release: 2%{?dist} +Version: 1.1.5 +Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +# SPDX License: MIT -Group: System Environment/Libraries 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 +%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 + +Requires: libX11 >= 1.6.0 BuildRequires: pkgconfig(xext) +BuildRequires: autoconf automake libtool make +BuildRequires: xorg-x11-util-macros +BuildRequires: libX11-devel >= 1.6.0 %description The X.Org X11 DMX (Distributed Multihead X) runtime library. %package devel Summary: X.Org X11 DMX development files -Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The X.Org X11 DMX (Distributed Multihead X) development files. %prep -%setup -q +%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %build +autoreconf -v --install --force %configure --disable-static make %{?_smp_mflags} @@ -37,26 +51,133 @@ 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 ChangeLog +%doc COPYING %{_libdir}/libdmx.so.1 %{_libdir}/libdmx.so.1.0.0 %files devel -%defattr(-,root,root,-) %{_libdir}/libdmx.so %{_libdir}/pkgconfig/dmx.pc %{_mandir}/man3/*.3* %{_includedir}/X11/extensions/dmxext.h %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.1.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 17 2025 Fedora Release Engineering - 1.1.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 18 2024 Fedora Release Engineering - 1.1.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 1.1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Oct 05 2023 José Expósito - 1.1.5-1 +- libdmx 1.1.5 + +* Thu Jul 20 2023 Fedora Release Engineering - 1.1.4-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1.1.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1.1.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 1.1.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 1.1.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.1.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Dec 01 2020 Peter Hutterer 1.1.4-9 +- Add make to BuildRequires + +* Tue Jul 28 2020 Fedora Release Engineering - 1.1.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 1.1.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jul 05 2018 Adam Jackson - 1.1.4-3 +- Drop useless %%defattr + +* Fri Jun 29 2018 Adam Jackson - 1.1.4-2 +- Use ldconfig scriptlet macros + +* Mon May 14 2018 Adam Jackson - 1.1.4-1 +- libdmx 1.1.4 + +* Wed Feb 07 2018 Fedora Release Engineering - 1.1.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.1.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.1.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.1.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1.1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sun Aug 17 2014 Fedora Release Engineering - 1.1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sat Aug 03 2013 Fedora Release Engineering - 1.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu May 30 2013 Peter Hutterer 1.1.3-1 +- libdmx 1.1.3 + +* Mon May 27 2013 Peter Hutterer - 1.1.2-5.20130524git5074d9d64 +- Require libX11 1.6RC2 for _XEatDataWords + +* Fri May 24 2013 Peter Hutterer 1.1.2-4.20130524git5074d9d64 +- Update to git snapshot for CVEs listed below: +- CVE-2013-1992 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 1.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Mar 08 2012 Adam Jackson 1.1.2-1 +- libdmx 1.1.2 + +* Fri Jan 13 2012 Fedora Release Engineering - 1.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 1.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh new file mode 100755 index 0000000..2d578b5 --- /dev/null +++ b/make-git-snapshot.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +DIRNAME=libdmx-$( date +%Y%m%d ) + +rm -rf $DIRNAME +git clone git://git.freedesktop.org/git/xorg/lib/libdmx $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 0ea849c..5ba0cab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75fd328fab3bd4a55cccaa6d5dfff749 libdmx-1.1.1.tar.bz2 +SHA512 (libdmx-1.1.5.tar.xz) = 55df45a06bddbf19e0253362853e2f979d736ba1f1fdec5d392c0f6c0dc72684e7b8df0f0a99ac96ce9d9d59bc6c25146086b18c054b4dbe6be9aa3166f23464