Use f23 instead of master

Merge remote-tracking branch 'origin/f23' into epel7

Conflicts:
	.gitignore
	libinput.spec
	sources
This commit is contained in:
Ding-Yi Chen 2016-02-22 11:36:37 +10:00
commit cbce4e6752
3 changed files with 8 additions and 10 deletions

3
.gitignore vendored
View file

@ -32,4 +32,5 @@
/libinput-1.1.5.tar.xz
/libinput-1.1.6.tar.xz
/libinput-1.1.7.tar.xz
/libinput-1.1.902.tar.xz
/libinput-1.1.8.tar.xz

View file

@ -4,8 +4,8 @@
%global gitversion 58abea394
Name: libinput
Version: 1.1.902
Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
Version: 1.1.8
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
Summary: Input device library
License: MIT
@ -25,7 +25,7 @@ BuildRequires: git
BuildRequires: autoconf automake libtool pkgconfig
BuildRequires: libevdev-devel
BuildRequires: libudev-devel
BuildRequires: mtdev-devel libwacom-devel
BuildRequires: mtdev-devel
BuildRequires: pkgconfig(udev)
%description
@ -97,11 +97,8 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%changelog
* Mon Feb 15 2016 Peter Hutterer <peter.hutterer@redhat.com> 1.1.902-2
- Add libwacom-devel to BuildRequires
* Mon Feb 15 2016 Peter Hutterer <peter.hutterer@redhat.com> 1.1.902-1
- libinput 1.2rc2
* Thu Feb 18 2016 Peter Hutterer <peter.hutterer@redhat.com> 1.1.8-1
- libinput 1.1.8
* Wed Feb 10 2016 Peter Hutterer <peter.hutterer@redhat.com> 1.1.7-1
- libinput 1.1.7

View file

@ -1 +1 @@
555c800e0bcadfb85f1ec7ea8d182133 libinput-1.1.902.tar.xz
3dda3e6dd7d0e865896dfe67f4fa0346 libinput-1.1.8.tar.xz