diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec index 671caa3..fc912f8 100644 --- a/xorg-x11-drv-synaptics.spec +++ b/xorg-x11-drv-synaptics.spec @@ -2,25 +2,17 @@ %global moduledir %(pkg-config xorg-server --variable=moduledir ) %global driverdir %{moduledir}/input -#global gitdate 20160929 -#global gitversion 48632211 Name: xorg-x11-drv-synaptics Summary: Xorg X11 Synaptics touchpad input driver Version: 1.9.1 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}} +Release: 4 URL: http://www.x.org License: MIT -%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 -Source3: 70-synaptics.conf -Source4: 70-touchpad-quirks.rules +Source1: 70-synaptics.conf +Source2: 70-touchpad-quirks.rules ExcludeArch: s390 s390x @@ -33,8 +25,6 @@ BuildRequires: libevdev-devel BuildRequires: systemd Requires: Xorg -#Requires: Xorg %(xserver-sdk-abi-requires ansic) -#Requires: Xorg %(xserver-sdk-abi-requires xinput) Requires: libevdev Requires: libXi libXtst @@ -52,40 +42,6 @@ Requires: pkgconfig %description legacy This is the Synaptics touchpad driver for the X.Org X server. The following touchpad models are supported: -* Synaptics -* appletouch (Post February 2005 and October 2005 Apple Aluminium Powerbooks) -* Elantech (EeePC) -* bcm5974 (Macbook Air (Jan 2008), Macbook Pro Penryn (Feb 2008), iPhone - (2007), iPod Touch (2008) - -Note that support for appletouch, elantech and bcm5974 requires the respective -kernel module. -A touchpad by default operates in compatibility mode by emulating a standard -mouse. However, by using a dedicated driver, more advanced features of the -touchpad become available. - -Features: - - * Movement with adjustable, non-linear acceleration and speed. - * Button events through short touching of the touchpad ("tapping"). - * Double-Button events through double short touching of the touchpad. - * Dragging through short touching and holding down the finger on the - touchpad. - * Middle and right button events on the upper and lower corner of the - touchpad. - * Vertical scrolling (button four and five events) through moving the - finger on the right side of the touchpad. - * The up/down button sends button four/five events. - * Horizontal scrolling (button six and seven events) through moving the - finger on the lower side of the touchpad. - * The multi-buttons send button four/five events, and six/seven events for - horizontal scrolling. - * Adjustable finger detection. - Multifinger taps: two finger for middle button and three finger for - right button events. (Needs hardware support. Not all models implement - this feature.) - * Run-time configuration using shared memory. This means you can change - parameter settings without restarting the X server. %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} @@ -95,10 +51,6 @@ if [ -z "$GIT_COMMITTER_NAME" ]; then git config user.email "x@fedoraproject.org" git config user.name "Fedora X Ninjas" fi -%if !0%{?gitdate} -git add . -git commit -a -q -m "%{version} baseline." -%endif # Apply all the patches. git am -p1 %{patches} < /dev/null @@ -119,10 +71,10 @@ find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- rm $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/70-synaptics.conf install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d -install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/70-synaptics.conf +install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/70-synaptics.conf install -d $RPM_BUILD_ROOT%{_udevrulesdir} -install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_udevrulesdir}/70-touchpad-quirks.rules +install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_udevrulesdir}/70-touchpad-quirks.rules %post udevadm control --reload-rules || : @@ -163,5 +115,8 @@ Development files for the Synaptics TouchPad for X.Org. %{_includedir}/xorg/synaptics-properties.h %changelog +* Wed May 25 2022 tanyulong - 1.9.1-4 +- Improve the project according to the requirements of compliance improvement + * Mon Nov 2 2020 douyan - 1.9.1-3 - package init