diff --git a/SOURCES/0001-Adapt-to-removal-of-xf86GetOS.patch b/SOURCES/0001-Adapt-to-removal-of-xf86GetOS.patch new file mode 100644 index 0000000..7dc81b9 --- /dev/null +++ b/SOURCES/0001-Adapt-to-removal-of-xf86GetOS.patch @@ -0,0 +1,42 @@ +From 3c8f243b750a92d5837a449d344ff884dbd02b57 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Thu, 16 Feb 2017 09:21:21 -0500 +Subject: [PATCH xf86-input-mouse] Adapt to removal of xf86GetOS + +Signed-off-by: Adam Jackson +--- + src/mouse.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/src/mouse.c b/src/mouse.c +index dae98aa..40d97a9 100644 +--- a/src/mouse.c ++++ b/src/mouse.c +@@ -794,7 +794,6 @@ InitProtocols(void) + { + int classes; + int i; +- const char *osname = NULL; + + if (osInfo) + return TRUE; +@@ -821,11 +820,11 @@ InitProtocols(void) + mouseProtocols[i].id = PROT_UNSUP; + + /* NetBSD uses PROT_BM for "PS/2". */ +- xf86GetOS(&osname, NULL, NULL, NULL); +- if (osname && xf86NameCmp(osname, "netbsd") == 0) +- for (i = 0; mouseProtocols[i].name; i++) +- if (mouseProtocols[i].id == PROT_PS2) +- mouseProtocols[i].id = PROT_BM; ++#if defined(__NetBSD__) ++ for (i = 0; mouseProtocols[i].name; i++) ++ if (mouseProtocols[i].id == PROT_PS2) ++ mouseProtocols[i].id = PROT_BM; ++#endif + + return TRUE; + } +-- +2.17.1 + diff --git a/SPECS/xorg-x11-drv-mouse.spec b/SPECS/xorg-x11-drv-mouse.spec new file mode 100644 index 0000000..12654c4 --- /dev/null +++ b/SPECS/xorg-x11-drv-mouse.spec @@ -0,0 +1,316 @@ +%global tarball xf86-input-mouse +%global moduledir %(pkg-config xorg-server --variable=moduledir ) +%global driverdir %{moduledir}/input + +#global gitdate 20101125 + +Summary: Xorg X11 mouse input driver +Name: xorg-x11-drv-mouse +Version: 1.9.2 +Release: 2%{?gitdate:.%{gitdate}}%{?dist} +URL: http://www.x.org +License: MIT +Group: User Interface/X Hardware Support + +%if 0%{?gitdate} +Source0: %{tarball}-%{gitdate}.tar.bz2 +Source1: make-git-snapshot.sh +Source2: commitid +%else +Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 +%endif + +Patch001: 0001-Adapt-to-removal-of-xf86GetOS.patch + +ExcludeArch: s390 s390x + +BuildRequires: autoconf automake libtool +BuildRequires: xorg-x11-server-devel >= 1.10.99.902 +BuildRequires: xorg-x11-util-macros >= 1.3.0 + +Requires: Xorg %(xserver-sdk-abi-requires ansic) +Requires: Xorg %(xserver-sdk-abi-requires xinput) + +%description +X.Org X11 mouse input driver. + +%prep +%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} +%patch01 -p1 + +%build +autoreconf --force -v --install || exit 1 +%configure --disable-static --disable-silent-rules +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + +# FIXME: Remove all libtool archives (*.la) from modules directory. This +# should be fixed in upstream Makefile.am or whatever. +find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%{driverdir}/mouse_drv.so +%{_mandir}/man4/mousedrv.4* + +%package devel +Summary: Xorg X11 mouse input driver development package. +Group: Development/Libraries +Requires: pkgconfig +%description devel +X.Org X11 mouse input driver development files. + +%files devel +%defattr(-,root,root,-) +%doc COPYING +%dir %{_includedir}/xorg +%{_includedir}/xorg/xf86-mouse-properties.h +%{_libdir}/pkgconfig/xorg-mouse.pc + +%changelog +* Tue Jun 19 2018 Peter Hutterer 1.9.2-2 +- Avoid use of xf86GetOS (#1592607) + +* Fri Jan 27 2017 Peter Hutterer 1.9.2-1 +- xf86-input-mouse 1.9.2 (#1401648) + +* Mon Apr 20 2015 Peter Hutterer 1.9.1-1 +- xf86-input-mouse 1.9.1 (#1194879) + +* Wed Aug 20 2014 Adam Jackson 1.9.0-7 +- Build on PPC + +* Wed Jan 15 2014 Adam Jackson - 1.9.0-6 +- 1.15 ABI rebuild + +* Fri Dec 27 2013 Daniel Mach - 1.9.0-5 +- Mass rebuild 2013-12-27 + +* Wed Nov 06 2013 Adam Jackson - 1.9.0-4 +- 1.15RC1 ABI rebuild + +* Fri Oct 25 2013 Adam Jackson - 1.9.0-3 +- ABI rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Mar 27 2013 Peter Hutterer 1.9.0-1 +- mouse 1.9.0 + +* Thu Mar 07 2013 Peter Hutterer - 1.8.1-8 +- require xorg-x11-server-devel, not -sdk + +* Thu Mar 07 2013 Peter Hutterer - 1.8.1-7 +- ABI rebuild + +* Fri Feb 15 2013 Peter Hutterer - 1.8.1-6 +- ABI rebuild + +* Fri Feb 15 2013 Peter Hutterer - 1.8.1-5 +- ABI rebuild + +* Thu Jan 10 2013 Adam Jackson - 1.8.1-4 +- ABI rebuild + +* Wed Oct 31 2012 Peter Hutterer - 1.8.1-3 +- Fix {?dist} tag + +* Thu Aug 02 2012 Peter Hutterer 1.8.1-2 +- Force autoreconf to avoid libtool versioning errors + +* Tue Jul 31 2012 Peter Hutterer 1.8.1-1 +- mouse 1.8.1 + +* Mon Jul 30 2012 Peter Hutterer 1.8.0-1 +- mouse 1.8.0 + +* Sun Jul 22 2012 Fedora Release Engineering - 1.7.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Jul 18 2012 Dave Airlie - 1.7.2-3 +- ABI rebuild + +* Thu Apr 05 2012 Adam Jackson - 1.7.2-2 +- RHEL arch exclude updates + +* Fri Mar 16 2012 Adam Jackson 1.7.2-1 +- mouse 1.7.2 + +* Sat Feb 11 2012 Peter Hutterer - 1.7.1-8 +- ABI rebuild + +* Fri Feb 10 2012 Peter Hutterer - 1.7.1-7 +- ABI rebuild + +* Tue Jan 24 2012 Peter Hutterer - 1.7.1-6 +- ABI rebuild + +* Wed Jan 04 2012 Peter Hutterer - 1.7.1-5 +- Rebuild for server 1.12 + +* Mon Nov 14 2011 Adam Jackson - 1.7.1-4 +- ABI rebuild + +* Wed Nov 09 2011 ajax - 1.7.1-3 +- ABI rebuild + +* Thu Aug 18 2011 Adam Jackson - 1.7.1-2 +- Rebuild for xserver 1.11 ABI + +* Thu Jul 07 2011 Peter Hutterer +- Disable silent rules on build, build with _smp_mflags + +* Wed Jul 06 2011 Peter Hutterer 1.7.1-1 +- mouse 1.7.1 + +* Thu Mar 10 2011 Peter Hutterer 1.7.0-1 +- mouse 1.7.0 + +* Mon Feb 21 2011 Peter Hutterer 1.6.99.901-1 +- mouse 1.7RC1 + +* Tue Feb 08 2011 Fedora Release Engineering - 1.6.99-3.20101125 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Nov 25 2010 Peter Hutterer - 1.6.99-2.20101125 +- Rebuild for server 1.10 + +* Thu Nov 25 2010 Peter Hutterer 1.6.99-1.20101125 +- today's git snapshot +- add a few more flexible git hooks to the spec file +- add commitid file + +* Wed Oct 27 2010 Adam Jackson 1.6.0-2 +- Add ABI requires magic (#542742) + +* Thu Sep 09 2010 Peter Hutterer 1.6.0-1 +- mouse 1.6.0 + +* Mon Jul 05 2010 Peter Hutterer - 1.5.0-5 +- rebuild for X Server 1.9 + +* Thu Jan 21 2010 Peter Hutterer - 1.5.0-4 +- Rebuild for server 1.8 + +* Thu Jan 07 2010 Peter Hutterer 1.5.0-3 +- Use global instead of define as per Packaging Guidelines. + +* Fri Nov 20 2009 Peter Hutterer 1.5.0-2 +- BuildRequires xorg-x11-util-macros 1.3.0 + +* Tue Oct 06 2009 Peter Hutterer 1.5.0-1 +- mouse 1.5.0 + +* Thu Sep 10 2009 Peter Hutterer 1.4.99.1-2 +- Fix spec file, Release was busted. + +* Wed Sep 09 2009 Peter Hutterer 1.4.99.1-1 +- mouse 1.4.99.1 + +* Mon Jul 27 2009 Fedora Release Engineering - 1.4.99-3.20090619.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Jul 15 2009 Adam Jackson - 1.4.99-2.20090619.1 +- ABI bump + +* Fri Jun 19 2009 Peter Hutterer - 1.4.99-2.20090619 +- rebuild for server ABI 7 + +* Fri Jun 19 2009 Peter Hutterer - 1.4.99-1.20090619 +- Update to today's git master. + +* Thu Feb 26 2009 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jan 12 2009 Peter Hutterer 1.4.0-1 +- mouse 1.4.0 + +* Mon Dec 22 2008 Peter Hutterer 1.3.0-1.20081222 +- Today's git snapshot. + +* Thu Mar 20 2008 Adam Jackson 1.3.0-1 +- mouse 1.3.0 + +* Wed Feb 20 2008 Fedora Release Engineering - 1.2.3-4 +- Autorebuild for GCC 4.3 + +* Tue Nov 13 2007 Adam Jackson 1.2.3-3 +- Require xserver 1.4.99.1 + +* Fri Nov 09 2007 Adam Jackson 1.2.3-2 +- mouse-1.2.3-sleep-less.patch: Don't usleep(300000) at exit. + +* Wed Oct 17 2007 Adam Jackson 1.2.3-1 +- xf86-input-mouse 1.2.3 + +* Mon Sep 24 2007 Adam Jackson 1.2.2-1 +- xf86-input-mouse 1.2.2 + +* Wed Aug 22 2007 Adam Jackson - 1.2.1-4 +- Rebuild for PPC toolchain bug + +* Mon Jun 18 2007 Adam Jackson 1.2.1-3 +- Update Requires and BuildRequires. Disown the module directories. + +* Fri Feb 16 2007 Adam Jackson 1.2.1-2 +- ExclusiveArch -> ExcludeArch + +* Fri Dec 1 2006 Adam Jackson 1.2.1-1 +- Update to 1.2.1 + +* Wed Jul 12 2006 Jesse Keating - sh: line 0: fg: no job control +- rebuild + +* Thu Jun 15 2006 Adam Jackson 1.1.1-1 +- Update to 1.1.1 + +* Tue Jun 13 2006 Adam Jackson 1.1.0-3 +- Build on ppc64 + +* Wed May 17 2006 Kristian Høgsberg - 1.1.0-2 +- Add missing build requires (#192047). + +* Sun Apr 9 2006 Adam Jackson 1.1.0-1 +- Update to 1.1.0 from 7.1RC1. + +* Wed Mar 01 2006 Mike A. Harris 1.0.4-1 +- Updated to new upstream driver version mouse-1.0.4. + +* Fri Feb 10 2006 Jesse Keating 1.0.3.1-1.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating 1.0.3.1-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Wed Jan 18 2006 Mike A. Harris 1.0.3.1-1 +- Updated xorg-x11-drv-mouse to version 1.0.3.1 from X11R7.0 +- Rename temporary name of mouse manpage, to close (#178744) + +* Tue Dec 20 2005 Mike A. Harris 1.0.3-1 +- Updated xorg-x11-drv-mouse to version 1.0.3 from X11R7 RC4 +- Removed 'x' suffix from manpage dirs to match RC4 upstream. +- Worked around mouse manpage issue. + +* Mon Nov 21 2005 Mike A. Harris 1.0.1-2 +- Added "alpha sparc sparc64" to ExclusiveArch for AlphaCore, CentOS, + AuroraLinux distributions, to minimize patching for them. +- Added ">= 0.99.3" dependency on Xorg server and sdk, based on CVS log + message from Daniel Stone on Nov 21, 2005. + +* Wed Nov 16 2005 Mike A. Harris 1.0.1-1 +- Updated xorg-x11-drv-mouse to version 1.0.1 from X11R7 RC2 + +* Fri Nov 04 2005 Mike A. Harris 1.0.0.1-1 +- Updated xorg-x11-drv-mouse to version 1.0.0.1 from X11R7 RC1 +- Fix *.la file removal. + +* Fri Sep 02 2005 Mike A. Harris 1.0.0-0 +- Initial spec file for mouse input driver generated automatically + by my xorg-driverspecgen script.