diff --git a/.gitignore b/.gitignore index af9a0cc..af99d1c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ 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/commitid b/commitid deleted file mode 100644 index 3bbc3e5..0000000 --- a/commitid +++ /dev/null @@ -1 +0,0 @@ -99c644fc8488657bdd106717df7446d606f9ef22 diff --git a/libXinerama.spec b/libXinerama.spec index d5cf024..84955f5 100644 --- a/libXinerama.spec +++ b/libXinerama.spec @@ -1,30 +1,17 @@ -%global tarball libXinerama -#global gitdate 20130524 -%global gitversion 99c644fc8 - Summary: X.Org X11 libXinerama runtime library Name: libXinerama -Version: 1.1.5 -Release: 9%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} -License: MIT AND MIT-open-group AND X11 +Version: 1.1.1 +Release: 2%{?dist} +License: MIT +Group: System Environment/Libraries URL: http://www.x.org +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: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.xz -%endif +Source0: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2 -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 >= 1.5.99.902 +BuildRequires: libX11-devel BuildRequires: libXext-devel %description @@ -32,16 +19,17 @@ X.Org X11 libXinerama runtime library %package devel Summary: X.Org X11 libXinerama development package +Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: xorg-x11-proto-devel %description devel X.Org X11 libXinerama development package %prep -%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%setup -q %build -autoreconf -v --install --force %configure --disable-static make %{?_smp_mflags} @@ -54,15 +42,20 @@ make install DESTDIR=$RPM_BUILD_ROOT # We intentionally don't ship *.la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -%ldconfig_post -%ldconfig_postun +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files -%doc COPYING +%defattr(-,root,root,-) +%doc COPYING ChangeLog %{_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* @@ -70,95 +63,106 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_includedir}/X11/extensions/panoramiXext.h %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 1.1.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild +* Mon Feb 07 2011 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Fri Jan 17 2025 Fedora Release Engineering - 1.1.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild +* Thu Oct 28 2010 Adam Jackson 1.1.1-1 +- libXinerama 1.1.1 -* Thu Jul 18 2024 Fedora Release Engineering - 1.1.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild +* Thu Feb 04 2010 Peter Hutterer 1.1-2 +- Remove unnecessary BR on libXau-devel -* Thu Jan 25 2024 Fedora Release Engineering - 1.1.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Tue Oct 06 2009 Adam Jackson 1.1-1 +- libXinerama 1.1 -* Sun Jan 21 2024 Fedora Release Engineering - 1.1.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Fri Aug 28 2009 Peter Hutterer 1.0.99.1-1 +- libXinerama 1.0.99.1 -* Wed Sep 06 2023 Benjamin Tissoires - 1.1.5-4 -- SPDX migration +* Mon Aug 03 2009 Adam Jackson 1.0.3-6 +- Un-require xorg-x11-filesystem -* Thu Jul 20 2023 Fedora Release Engineering - 1.1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Thu Jan 19 2023 Fedora Release Engineering - 1.1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild +* Wed Feb 25 2009 Fedora Release Engineering - 1.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Fri Nov 04 2022 Benjamin Tissoires 1.1.5-1 -- libXinerama 1.1.5-1 +* Sat Feb 21 2009 Adam Jackson 1.0.3-3 +- Merge review cleanups. (#226075) -* Thu Jul 21 2022 Fedora Release Engineering - 1.1.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild +* Tue Jul 15 2008 Adam Jackson 1.0.3-2 +- Fix license tag. -* Thu Jan 20 2022 Fedora Release Engineering - 1.1.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Thu Mar 06 2008 Adam Jackson 1.0.3-1 +- libXinerama 1.0.3 -* Thu Jul 22 2021 Fedora Release Engineering - 1.1.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +* Tue Feb 19 2008 Fedora Release Engineering - 1.0.2-4 +- Autorebuild for GCC 4.3 -* Tue Jan 26 2021 Fedora Release Engineering - 1.1.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Tue Aug 21 2007 Adam Jackson - 1.0.2-3 +- Rebuild for build id -* Thu Nov 5 12:14:23 AEST 2020 Peter Hutterer - 1.1.4-7 -- Add BuildRequires for make +* Sat Apr 21 2007 Matthias Clasen 1.0.2-2 +- Don't install INSTALL -* Tue Jul 28 2020 Fedora Release Engineering - 1.1.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Mon Mar 26 2007 Adam Jackson 1.0.2-1 +- libXinerama 1.0.2 -* Wed Jan 29 2020 Fedora Release Engineering - 1.1.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control +- rebuild -* Thu Jul 25 2019 Fedora Release Engineering - 1.1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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. -* Fri Feb 01 2019 Fedora Release Engineering - 1.1.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Fri Feb 10 2006 Jesse Keating 1.0.1-1.2 +- bump again for double-long bug on ppc(64) -* Fri Jul 13 2018 Fedora Release Engineering - 1.1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +* Tue Feb 07 2006 Jesse Keating 1.0.1-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes -* Thu Jul 05 2018 Adam Jackson - 1.1.4-1 -- libXinerama 1.1.4 +* Wed Jan 18 2006 Mike A. Harris 1.0.1-1 +- Updated libXinerama to version 1.0.1 from X11R7.0 -* Fri Jun 29 2018 Adam Jackson - 1.1.3-11 -- Use ldconfig scriptlet macros +* Fri Dec 16 2005 Mike A. Harris 1.0.0-1 +- Updated libXinerama to version 1.0.0 from X11R7 RC4 -* Wed Feb 07 2018 Fedora Release Engineering - 1.1.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* 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 Aug 03 2017 Fedora Release Engineering - 1.1.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_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) -* Wed Jul 26 2017 Fedora Release Engineering - 1.1.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_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' -* Fri Feb 10 2017 Fedora Release Engineering - 1.1.3-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Mon Oct 24 2005 Mike A. Harris 0.99.1-1 +- Updated libXinerama to version 0.99.1 from X11R7 RC1 -* Thu Feb 04 2016 Fedora Release Engineering - 1.1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_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 -* Wed Jun 17 2015 Fedora Release Engineering - 1.1.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* 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. -* 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 +* Mon Aug 22 2005 Mike A. Harris 0.99.0-1 +- Initial build. diff --git a/make-git-snapshot.sh b/make-git-snapshot.sh deleted file mode 100755 index 296a8ab..0000000 --- a/make-git-snapshot.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/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 b5f7b49..fc189a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXinerama-1.1.5.tar.xz) = 735b5320de4782005b379e409bf2f976131c17d496b297d33a0e127ca1443034778586b6b25c077b2ad73a4ab34d440d7510475e0041f38202bb40f15fb08ff7 +ecd4839ad01f6f637c6fb5327207f89b libXinerama-1.1.1.tar.bz2