diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index fde68d6..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -libXinerama-1.0.2.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..af9a0cc --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +libXinerama-1.1.tar.bz2 +/libXinerama-1.1.2.tar.bz2 +/libXinerama-20130524.tar.bz2 +/libXinerama-1.1.3.tar.bz2 +/libXinerama-1.1.4.tar.bz2 +/libXinerama-1.1.5.tar.xz diff --git a/Makefile b/Makefile deleted file mode 100644 index db54473..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: libXinerama -# $Id$ -NAME := libXinerama -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..3bbc3e5 --- /dev/null +++ b/commitid @@ -0,0 +1 @@ +99c644fc8488657bdd106717df7446d606f9ef22 diff --git a/libXinerama.spec b/libXinerama.spec index c7f8be3..d5cf024 100644 --- a/libXinerama.spec +++ b/libXinerama.spec @@ -1,46 +1,50 @@ +%global tarball libXinerama +#global gitdate 20130524 +%global gitversion 99c644fc8 + Summary: X.Org X11 libXinerama runtime library Name: libXinerama -Version: 1.0.2 -Release: 3%{?dist} -License: MIT/X11 -Group: System Environment/Libraries +Version: 1.1.5 +Release: 9%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +License: MIT AND MIT-open-group AND X11 URL: http://www.x.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: ftp://ftp.x.org/pub/X11R7.0-RC4/everything/%{name}-%{version}.tar.bz2 +%if 0%{?gitdate} +Source0: %{tarball}-%{gitdate}.tar.bz2 +Source1: make-git-snapshot.sh +Source2: commitid +%else +Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz +%endif +Requires: libX11 >= 1.5.99.902 + +BuildRequires: make +BuildRequires: xorg-x11-util-macros +BuildRequires: autoconf automake libtool BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel -BuildRequires: libX11-devel +BuildRequires: libX11-devel >= 1.5.99.902 BuildRequires: libXext-devel -BuildRequires: libXau-devel - -Obsoletes: XFree86-libs, xorg-x11-libs %description X.Org X11 libXinerama runtime library %package devel Summary: X.Org X11 libXinerama development package -Group: Development/Libraries -Requires(pre): xorg-x11-filesystem >= 0.99.2-3 Requires: %{name} = %{version}-%{release} -# needed by xinerama.pc -Requires: xorg-x11-proto-devel - -Obsoletes: XFree86-devel, xorg-x11-devel - %description devel X.Org X11 libXinerama development package %prep -%setup -q +%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %build +autoreconf -v --install --force %configure --disable-static -make +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -50,89 +54,111 @@ 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 AUTHORS COPYING README ChangeLog +%doc COPYING %{_libdir}/libXinerama.so.1 %{_libdir}/libXinerama.so.1.0.0 %files devel -%defattr(-,root,root,-) %{_libdir}/libXinerama.so %{_libdir}/pkgconfig/xinerama.pc %{_mandir}/man3/*.3* +%{_includedir}/X11/extensions/Xinerama.h +%{_includedir}/X11/extensions/panoramiXext.h %changelog -* Tue Aug 21 2007 Adam Jackson - 1.0.2-3 -- Rebuild for build id +* Thu Jul 24 2025 Fedora Release Engineering - 1.1.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Sat Apr 21 2007 Matthias Clasen 1.0.2-2 -- Don't install INSTALL +* Fri Jan 17 2025 Fedora Release Engineering - 1.1.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild -* Mon Mar 26 2007 Adam Jackson 1.0.2-1 -- libXinerama 1.0.2 +* Thu Jul 18 2024 Fedora Release Engineering - 1.1.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild -* Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control -- rebuild +* Thu Jan 25 2024 Fedora Release Engineering - 1.1.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Fri Jun 09 2006 Mike A. Harris 1.0.1-2 -- Replace "makeinstall" with "make install DESTDIR=..." -- Added "Requires: xorg-x11-proto-devel" to devel for xinerama.pc -- Remove package ownership of mandir/libdir/etc. +* Sun Jan 21 2024 Fedora Release Engineering - 1.1.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 -- bump again for double-long bug on ppc(64) +* Wed Sep 06 2023 Benjamin Tissoires - 1.1.5-4 +- SPDX migration -* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 -- rebuilt for new gcc4.1 snapshot and glibc changes +* Thu Jul 20 2023 Fedora Release Engineering - 1.1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild -* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 -- Updated libXinerama to version 1.0.1 from X11R7.0 +* Thu Jan 19 2023 Fedora Release Engineering - 1.1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Fri Dec 16 2005 Mike A. Harris 1.0.0-1 -- Updated libXinerama to version 1.0.0 from X11R7 RC4 +* Fri Nov 04 2022 Benjamin Tissoires 1.1.5-1 +- libXinerama 1.1.5-1 -* Tue Dec 13 2005 Mike A. Harris 0.99.2-1 -- Updated libXinerama to version 0.99.2 from X11R7 RC3 -- Added "Requires(pre): xorg-x11-filesystem >= 0.99.2-3", to ensure - that /usr/lib/X11 and /usr/include/X11 pre-exist. -- Removed 'x' suffix from manpage directories to match RC3 upstream. +* Thu Jul 21 2022 Fedora Release Engineering - 1.1.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild -* Tue Nov 15 2005 Mike A. Harris 0.99.1-3 -- Added "BuildRequires: libXau-devel", as twm fails without it, but does not - check for it with ./configure. Bug (fdo#5065) +* Thu Jan 20 2022 Fedora Release Engineering - 1.1.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Fri Nov 11 2005 Mike A. Harris 0.99.1-2 -- Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes' -- Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes' +* Thu Jul 22 2021 Fedora Release Engineering - 1.1.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Mon Oct 24 2005 Mike A. Harris 0.99.1-1 -- Updated libXinerama to version 0.99.1 from X11R7 RC1 +* Tue Jan 26 2021 Fedora Release Engineering - 1.1.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Thu Sep 29 2005 Mike A. Harris 0.99.0-3 -- Renamed package to remove xorg-x11 from the name due to unanimous decision - between developers. -- Use Fedora Extras style BuildRoot tag. -- Disable static library creation by default. -- Add missing defattr to devel subpackage -- Add missing documentation files to doc macro +* Thu Nov 5 12:14:23 AEST 2020 Peter Hutterer - 1.1.4-7 +- Add BuildRequires for make -* Tue Aug 23 2005 Mike A. Harris 0.99.0-2 -- Renamed package to prepend "xorg-x11" to the name for consistency with - the rest of the X11R7 packages. -- Added "Requires: %%{name} = %%{version}-%%{release}" dependency to devel - subpackage to ensure the devel package matches the installed shared libs. -- Added virtual "Provides: lib" and "Provides: lib-devel" to - allow applications to use implementation agnostic dependencies. -- Added post/postun scripts which call ldconfig. -- Added Conflicts with XFree86-libs and xorg-x11-libs to runtime package, - and Conflicts with XFree86-devel and xorg-x11-devel to devel package. +* Tue Jul 28 2020 Fedora Release Engineering - 1.1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild -* Mon Aug 22 2005 Mike A. Harris 0.99.0-1 -- Initial build. +* Wed Jan 29 2020 Fedora Release Engineering - 1.1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 1.1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 1.1.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1.1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jul 05 2018 Adam Jackson - 1.1.4-1 +- libXinerama 1.1.4 + +* Fri Jun 29 2018 Adam Jackson - 1.1.3-11 +- Use ldconfig scriptlet macros + +* 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 + +* Fri May 31 2013 Peter Hutterer 1.1.3-1 +- libXinerama 1.1.3 diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh new file mode 100755 index 0000000..296a8ab --- /dev/null +++ b/make-git-snapshot.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +DIRNAME=libXinerama-$( date +%Y%m%d ) + +rm -rf $DIRNAME +git clone git://git.freedesktop.org/git/xorg/lib/libXinerama $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 151fc0c..b5f7b49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f6fb08eafd3c2909d515f1a07bfca8fd libXinerama-1.0.2.tar.bz2 +SHA512 (libXinerama-1.1.5.tar.xz) = 735b5320de4782005b379e409bf2f976131c17d496b297d33a0e127ca1443034778586b6b25c077b2ad73a4ab34d440d7510475e0041f38202bb40f15fb08ff7