diff --git a/.gitignore b/.gitignore index 0408ada..07538ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,3 @@ libXxf86vm-1.1.0.tar.bz2 /libXxf86vm-1.1.1.tar.bz2 /libXxf86vm-1.1.2.tar.bz2 -/libXxf86vm-20130524.tar.bz2 -/libXxf86vm-1.1.3.tar.bz2 -/libXxf86vm-1.1.4.tar.bz2 -/libXxf86vm-1.1.5.tar.xz -/libXxf86vm-1.1.6.tar.xz diff --git a/commitid b/commitid deleted file mode 100644 index 78ea717..0000000 --- a/commitid +++ /dev/null @@ -1 +0,0 @@ -4c4123441e40da97acd10f58911193ad3dcef5cd diff --git a/libXxf86vm.spec b/libXxf86vm.spec index 8a111fa..2b06c41 100644 --- a/libXxf86vm.spec +++ b/libXxf86vm.spec @@ -1,45 +1,29 @@ -%global tarball libXxf86vm -#global gitdate 20130524 -%global gitversion 4c4123441 - Summary: X.Org X11 libXxf86vm runtime library Name: libXxf86vm -Version: 1.1.6 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} -License: X11-distribute-modifications-variant +Version: 1.1.2 +Release: 1%{?dist} +License: MIT +Group: System Environment/Libraries URL: http://www.x.org +Source0: ftp://ftp.x.org/pub/individual/lib/%{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(xext) pkgconfig(xf86vidmodeproto) -BuildRequires: libX11-devel >= 1.5.99.902 %description X.Org X11 libXxf86vm runtime library %package devel Summary: X.Org X11 libXxf86vm development package +Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel X.Org X11 libXxf86vm development package %prep -%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%setup -q %build -autoreconf -v --install --force %configure --disable-static make %{?_smp_mflags} @@ -48,117 +32,132 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -%ldconfig_post -%ldconfig_postun +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files -%doc README.md COPYING +%defattr(-,root,root,-) +%doc README COPYING ChangeLog %{_libdir}/libXxf86vm.so.1 %{_libdir}/libXxf86vm.so.1.0.0 %files devel +%defattr(-,root,root,-) %{_libdir}/libXxf86vm.so %{_libdir}/pkgconfig/xxf86vm.pc %{_mandir}/man3/*.3* %{_includedir}/X11/extensions/xf86vmode.h %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 1.1.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild +* Thu Mar 08 2012 Adam Jackson 1.1.2-1 +- libXxf86vm 1.1.2 -* Fri Jan 17 2025 Fedora Release Engineering - 1.1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild +* Fri Jan 13 2012 Fedora Release Engineering - 1.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Mon Dec 16 2024 José Expósito - 1.1.6-1 -- libXxf86vm 1.1.6 +* Mon Feb 07 2011 Fedora Release Engineering - 1.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Thu Jul 18 2024 Fedora Release Engineering - 1.1.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild +* Mon Nov 08 2010 Adam Jackson 1.1.1-1 +- libXxf86vm 1.1.1 -* Thu Jan 25 2024 Fedora Release Engineering - 1.1.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Wed Sep 29 2010 jkeating - 1.1.0-3 +- Rebuilt for gcc bug 634757 -* Sun Jan 21 2024 Fedora Release Engineering - 1.1.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Mon Sep 13 2010 Parag Nemade 1.1.0-2 +- Merge-review cleanup (#226096) -* Wed Sep 06 2023 Benjamin Tissoires - 1.1.5-4 -- SPDX Migration +* Wed Oct 07 2009 Adam Jackson 1.1.0-1 +- libXxf86vm 1.1.0 -* Thu Jul 20 2023 Fedora Release Engineering - 1.1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild +* Fri Aug 28 2009 Peter Hutterer 1.0.99.1-1 +- libXxf86vm 1.0.99.1 -* Thu Jan 19 2023 Fedora Release Engineering - 1.1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild +* Fri Jul 24 2009 Fedora Release Engineering - 1.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Fri Nov 04 2022 Benjamin Tissoires 1.1.5-1 -- libXxf86vm 1.1.5-1 +* Thu Jul 23 2009 Adam Jackson 1.0.2-3 +- Un-require xorg-x11-filesystem -* Thu Jul 21 2022 Fedora Release Engineering - 1.1.4-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild +* Wed Feb 25 2009 Fedora Release Engineering - 1.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Thu Jan 20 2022 Fedora Release Engineering - 1.1.4-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Thu Sep 04 2008 Adam Jackson 1.0.2-1 +- libXxf86vm 1.0.2 -* Thu Jul 22 2021 Fedora Release Engineering - 1.1.4-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +* Tue Jul 15 2008 Adam Jackson 1.0.1-6 +- Fix license tag. -* Tue Jan 26 2021 Fedora Release Engineering - 1.1.4-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Tue Feb 19 2008 Fedora Release Engineering - 1.0.1-5 +- Autorebuild for GCC 4.3 -* Thu Nov 5 12:30:58 AEST 2020 Peter Hutterer - 1.1.4-15 -- Add BuildRequires for make +* Tue Aug 21 2007 Adam Jackson - 1.0.1-4 +- Rebuild for build id -* Tue Jul 28 2020 Fedora Release Engineering - 1.1.4-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild +* Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control +- rebuild -* Wed Jan 29 2020 Fedora Release Engineering - 1.1.4-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Fri Jun 09 2006 Mike A. Harris 1.0.1-3 +- Added "Requires: xorg-x11-proto-devel" +- Remove package ownership of mandir/libdir/etc. -* Thu Jul 25 2019 Fedora Release Engineering - 1.1.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Mon Jun 05 2006 Mike A. Harris 1.0.1-2 +- Added "BuildRequires: pkgconfig" for (#193509) +- Use "make install DESTDIR=..." instead of makeinstall macro, to fix (#192731) -* Fri Feb 01 2019 Fedora Release Engineering - 1.1.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Thu Apr 27 2006 Adam Jackson 1.0.1-1 +- Update to 1.0.1 -* Fri Jul 13 2018 Fedora Release Engineering - 1.1.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +* Fri Feb 10 2006 Jesse Keating 1.0.0-2.2 +- bump again for double-long bug on ppc(64) -* Thu Jul 05 2018 Adam Jackson - 1.1.4-9 -- Drop useless %%defattr +* Tue Feb 07 2006 Jesse Keating 1.0.0-2.1 +- rebuilt for new gcc4.1 snapshot and glibc changes -* Fri Jun 29 2018 Adam Jackson - 1.1.4-8 -- Use ldconfig scriptlet macros +* Mon Jan 23 2006 Mike A. Harris 1.0.0-2 +- Bumped and rebuilt -* Wed Feb 07 2018 Fedora Release Engineering - 1.1.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Fri Dec 16 2005 Mike A. Harris 1.0.0-1 +- Updated libXxf86vm to version 1.0.0 from X11R7 RC4 -* Thu Aug 03 2017 Fedora Release Engineering - 1.1.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild +* Tue Dec 13 2005 Mike A. Harris 0.99.2-1 +- Updated libXxf86vm 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. -* Wed Jul 26 2017 Fedora Release Engineering - 1.1.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild +* Fri Dec 09 2005 Jesse Keating +- rebuilt -* Fri Feb 10 2017 Fedora Release Engineering - 1.1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild +* Fri Nov 11 2005 Mike A. Harris 0.99.1-3 +- Changed 'Conflicts: XFree86-devel, xorg-x11-devel' to 'Obsoletes' +- Changed 'Conflicts: XFree86-libs, xorg-x11-libs' to 'Obsoletes' -* Thu Feb 04 2016 Fedora Release Engineering - 1.1.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild +* Tue Nov 01 2005 Mike A. Harris 0.99.1-2 +- Bump release and rebuild to satiate beehive wonkiness. -* Wed Jun 17 2015 Fedora Release Engineering - 1.1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +* Mon Oct 24 2005 Mike A. Harris 0.99.1-1 +- Updated libXxf86vm to version 0.99.1 from X11R7 RC1 +- Updated file manifest to find manpages in "man3x" -* Fri Mar 06 2015 Benjamin Tissoires 1.1.4-1 -- libXxf86vm 1.1.4 +* 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 -* Sun Aug 17 2014 Fedora Release Engineering - 1.1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_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. -* 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 -- libXxf86vm 1.1.3 - Initial build. +* 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 51f6e54..0000000 --- a/make-git-snapshot.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -DIRNAME=libXxf86vm-$( date +%Y%m%d ) - -rm -rf $DIRNAME -git clone git://git.freedesktop.org/git/xorg/lib/libXxf86vm $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 1c7625c..976c87c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libXxf86vm-1.1.6.tar.xz) = 7fb3ac4302eea43b70d5106f6c7a113e28e2807da22d2bb7f040e0c4afd322cad4b7f258a5bd6da3940b6b6b39065e1acb218a6dc0ba06b9dd86ea3849231266 +ffd93bcedd8b2b5aeabf184e7b91f326 libXxf86vm-1.1.2.tar.bz2