From df9853c5f804dd2c16630e23893390b1f42ebca41d6a7d77fa67df0f68dc4625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 16 May 2017 09:32:14 +0000 Subject: [PATCH] Accepting request 494573 from home:Guillaume_G:branches:hardware Update to tslib 1.9 OBS-URL: https://build.opensuse.org/request/show/494573 OBS-URL: https://build.opensuse.org/package/show/hardware/tslib?expand=0&rev=14 --- baselibs.conf | 4 ++++ tslib-1.1.tar.xz | 3 --- tslib-1.9.tar.xz | 3 +++ tslib.changes | 7 ++++++ tslib.spec | 31 ++++++++++++++------------ use-module-raw-input-for-ts-conf.patch | 9 -------- 6 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 baselibs.conf delete mode 100644 tslib-1.1.tar.xz create mode 100644 tslib-1.9.tar.xz delete mode 100644 use-module-raw-input-for-ts-conf.patch diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..8ef4fd1 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,4 @@ +libts0 +tslib-devel + requires -tslib- + requires "libts0- = " diff --git a/tslib-1.1.tar.xz b/tslib-1.1.tar.xz deleted file mode 100644 index 9c8386d..0000000 --- a/tslib-1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c -size 238184 diff --git a/tslib-1.9.tar.xz b/tslib-1.9.tar.xz new file mode 100644 index 0000000..9fb29ad --- /dev/null +++ b/tslib-1.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af4e40a4cf2aa7a81f1602de1613190a101760689709103cc3590132266ac7b8 +size 306716 diff --git a/tslib.changes b/tslib.changes index b6b54af..ab55354 100644 --- a/tslib.changes +++ b/tslib.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 11 09:10:02 UTC 2017 - guillaume@opensuse.org + +- Update to tslib 1.9 +- Remove upstreamed patch: use-module-raw-input-for-ts-conf.patch +- Fix library name + ------------------------------------------------------------------- Sun Mar 1 14:43:11 UTC 2015 - mpluskal@suse.com diff --git a/tslib.spec b/tslib.spec index de57fbe..5f65bc9 100644 --- a/tslib.spec +++ b/tslib.spec @@ -1,7 +1,7 @@ # # spec file for package tslib # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Guillaume GARDET # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: tslib -Version: 1.1 +Version: 1.9 Release: 0 Summary: Abstraction layer for touchscreen License: LGPL-2.0+ and GPL-2.0+ @@ -27,9 +27,9 @@ Url: https://github.com/kergoth/tslib.git #Git-Clone: git://github.com/kergoth/tslib Source0: https://github.com/kergoth/tslib/releases/download/%{version}/%{name}-%{version}.tar.xz Source2: baselibs.conf -Patch0: use-module-raw-input-for-ts-conf.patch BuildRequires: autoconf BuildRequires: automake +BuildRequires: fdupes BuildRequires: libtool BuildRequires: pkg-config BuildRequires: xz @@ -41,11 +41,11 @@ Tslib is an abstraction layer for touchscreen panel events. The idea of tslib is to have a core library and a set of plugins to manage the conversion and filtering as needed. -%package -n libts-1_0-0 +%package -n libts0 Summary: Abstraction layer for touchscreens Group: System/Libraries -%description -n libts-1_0-0 +%description -n libts0 Tslib is an abstraction layer for touchscreen panel events. The idea of tslib is to have a core library and a set of plugins to @@ -74,7 +74,6 @@ Devel package for tslib. Tslib is an abstraction layer for touchscreen panel eve %prep %setup -q -%patch0 ./autogen.sh %configure @@ -83,28 +82,26 @@ make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install %{?_smp_mflags} -rm %{buildroot}%{_libdir}/pkgconfig/tslib-1.0.pc -ln -s tslib.pc %{buildroot}%{_libdir}/pkgconfig/tslib-1.0.pc +%fdupes %{buildroot}/%_mandir -%post -n libts-1_0-0 -p /sbin/ldconfig +%post -n libts0 -p /sbin/ldconfig -%postun -n libts-1_0-0 -p /sbin/ldconfig +%postun -n libts0 -p /sbin/ldconfig %files devel %defattr(-,root,root) %dir %{_libdir}/ts %{_includedir}/tslib.h %{_libdir}/libts.la -%{_libdir}/pkgconfig/tslib-1.0.pc %{_libdir}/pkgconfig/tslib.pc %dir %{_libdir}/ts %{_libdir}/ts/*.la %{_libdir}/libts.so -%files -n libts-1_0-0 +%files -n libts0 %defattr(-,root,root) -%{_libdir}/libts-1.0.so.0 -%{_libdir}/libts-1.0.so.0.0.0 +%{_libdir}/libts.so.0 +%{_libdir}/libts.so.0.6.0 %files plugins %defattr(-,root,root) @@ -115,9 +112,15 @@ ln -s tslib.pc %{buildroot}%{_libdir}/pkgconfig/tslib-1.0.pc %defattr(-,root,root) %config %{_sysconfdir}/ts.conf %{_bindir}/ts_calibrate +%{_bindir}/ts_finddev %{_bindir}/ts_harvest %{_bindir}/ts_print +%{_bindir}/ts_print_mt %{_bindir}/ts_print_raw %{_bindir}/ts_test +%{_bindir}/ts_test_mt +%{_bindir}/ts_uinput +%{_bindir}/ts_verify +%_mandir/*/* %changelog diff --git a/use-module-raw-input-for-ts-conf.patch b/use-module-raw-input-for-ts-conf.patch deleted file mode 100644 index 1814d15..0000000 --- a/use-module-raw-input-for-ts-conf.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- etc/ts.conf.orig 2012-06-13 16:09:57.109544638 +0200 -+++ etc/ts.conf 2012-06-13 16:10:17.219073865 +0200 -@@ -1,5 +1,5 @@ - # Uncomment if you wish to use the linux input layer event interface --# module_raw input -+module_raw input - - # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d - # module_raw collie