Bug 1189329 - xorg-x11-drv-synaptics-1.8.1-2.fc21 patch for new Lenovo touchpads is incorrect
Summary: xorg-x11-drv-synaptics-1.8.1-2.fc21 patch for new Lenovo touchpads is incorrect
Keywords:
Status: CLOSED ERRATA
Alias: None
Product: Fedora
Classification: Fedora
Component: xorg-x11-drv-synaptics
Version: 21
Hardware: Unspecified
OS: Unspecified
unspecified
unspecified
Target Milestone: ---
Assignee: Peter Hutterer
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2015-02-05 01:58 UTC by Aron Parsons
Modified: 2015-02-08 08:56 UTC (History)
3 users (show)

Fixed In Version: xorg-x11-drv-synaptics-1.8.1-3.fc21
Clone Of:
Environment:
Last Closed: 2015-02-08 08:56:35 UTC
Type: Bug
Embargoed:


Attachments (Terms of Use)
spec file patch (1.66 KB, patch)
2015-02-05 01:58 UTC, Aron Parsons
no flags Details | Diff
50-synaptics.conf (2.76 KB, text/plain)
2015-02-05 02:00 UTC, Aron Parsons
no flags Details
spec file patch (1.77 KB, patch)
2015-02-05 02:06 UTC, Aron Parsons
no flags Details | Diff

Description Aron Parsons 2015-02-05 01:58:07 UTC
Description of problem:
xorg-x11-drv-synaptics-1.8.1-2.fc21 added a patch for the new Lenovo touchpads.  However, the spec file is not laying down a couple of the files correctly.  The xorg.conf.d file is replaced wholesale by the spec file, so the upstream additions didn't make it.  And the new udev rules is incorrectly in the -devel subpackage.

Version-Release number of selected component (if applicable):
xorg-x11-drv-synaptics-1.8.1-2.fc21

How reproducible:
always

Actual results:
$ rpm -ql xorg-x11-drv-synaptics | grep udev
/usr/lib/udev/rules.d/70-touchpad-quirks.rules

$ grep has_trackpoint /usr/share/X11/xorg.conf.d/50-synaptics.conf

Expected results:
$ rpm -ql xorg-x11-drv-synaptics | grep udev
/usr/lib/udev/rules.d/70-touchpad-quirks.rules
/usr/lib/udev/rules.d/71-synaptics.rules

$ grep has_trackpoint /usr/share/X11/xorg.conf.d/50-synaptics.conf
        Identifier "Lenovo *50 and Carbon 3rd trackpoint buttons"
        MatchTag "has_trackpoint_buttons"


Additional info:
patch for the spec file is attached as well as the updated 50-synaptics.conf file.  I also modified the spec file to use the %{_udevrulesdir} macro, which is provied by the macros from systemd.  This adds systemd as a build dependency.

Comment 1 Aron Parsons 2015-02-05 01:58:52 UTC
Created attachment 988350 [details]
spec file patch

Comment 2 Aron Parsons 2015-02-05 02:00:04 UTC
Created attachment 988351 [details]
50-synaptics.conf

not sure why we replace the file wholesale versus using upstream (didn't diff or look into it), so here is an updated file that contains the necessary additions.

Comment 3 Aron Parsons 2015-02-05 02:06:26 UTC
Created attachment 988352 [details]
spec file patch

add %post/%postun scriptlets to reload the udev rules since we drop some in place

Comment 4 Peter Hutterer 2015-02-05 02:16:59 UTC
how embarrassing. must've picked up my local rules during testing, sorry about that.

I don't think the BuildRequires: systemd is correct though. That is needed for post/postun so shouldn't this be a Requires then? in which case we can just leave it out, we don't have systems without systemd.

Comment 5 Aron Parsons 2015-02-05 02:38:57 UTC
(In reply to Peter Hutterer from comment #4)
> how embarrassing. must've picked up my local rules during testing, sorry
> about that.
> 
> I don't think the BuildRequires: systemd is correct though. That is needed
> for post/postun so shouldn't this be a Requires then? in which case we can
> just leave it out, we don't have systems without systemd.

systemd provides the RPM macro _udevrulesdir. It wasn't pulled in the mock build environment. I'm fairly sure the koji package group does not actually include systemd either. You can verify by doing a scratch build without that requires statement.

Comment 6 Peter Hutterer 2015-02-05 03:19:18 UTC
right, that makes sense. Thanks for the patch, applied and pushed. Rawhide is here:
http://koji.fedoraproject.org/koji/taskinfo?taskID=8825638

Fedora 21 build:
http://koji.fedoraproject.org/koji/taskinfo?taskID=8825705

Comment 7 Fedora Update System 2015-02-05 03:34:12 UTC
xorg-x11-drv-synaptics-1.8.1-3.fc21 has been submitted as an update for Fedora 21.
https://admin.fedoraproject.org/updates/xorg-x11-drv-synaptics-1.8.1-3.fc21

Comment 8 Fedora Update System 2015-02-06 04:04:24 UTC
Package xorg-x11-drv-synaptics-1.8.1-3.fc21:
* should fix your issue,
* was pushed to the Fedora 21 testing repository,
* should be available at your local mirror within two days.
Update it with:
# su -c 'yum update --enablerepo=updates-testing xorg-x11-drv-synaptics-1.8.1-3.fc21'
as soon as you are able to.
Please go to the following url:
https://admin.fedoraproject.org/updates/FEDORA-2015-1769/xorg-x11-drv-synaptics-1.8.1-3.fc21
then log in and leave karma (feedback).

Comment 9 Fedora Update System 2015-02-08 08:56:35 UTC
xorg-x11-drv-synaptics-1.8.1-3.fc21 has been pushed to the Fedora 21 stable repository.  If problems still persist, please make note of it in this bug report.


Note You need to log in before you can comment on or make changes to this bug.