From e6d95227c2563b3f2b6d1add7ec902597d39cda98b595fd94a04d09fefad5f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 2 Mar 2015 09:31:47 +0000 Subject: [PATCH] Accepting request 288331 from home:pluskalm:branches:hardware - Cleanup spec file with spec-cleaner - Use url for source OBS-URL: https://build.opensuse.org/request/show/288331 OBS-URL: https://build.opensuse.org/package/show/hardware/tslib?expand=0&rev=12 --- tslib-1.1.tar.gz | 3 --- tslib-1.1.tar.xz | 3 +++ tslib.changes | 6 ++++++ tslib.spec | 24 +++++++++++++----------- 4 files changed, 22 insertions(+), 14 deletions(-) delete mode 100644 tslib-1.1.tar.gz create mode 100644 tslib-1.1.tar.xz diff --git a/tslib-1.1.tar.gz b/tslib-1.1.tar.gz deleted file mode 100644 index 7bae27c..0000000 --- a/tslib-1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:121750e9ae0f05ce840ab8dbefdae1297258f0a69dd1967f55c40ac6e87d5ee9 -size 323936 diff --git a/tslib-1.1.tar.xz b/tslib-1.1.tar.xz new file mode 100644 index 0000000..9c8386d --- /dev/null +++ b/tslib-1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c +size 238184 diff --git a/tslib.changes b/tslib.changes index 86442e2..b6b54af 100644 --- a/tslib.changes +++ b/tslib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 1 14:43:11 UTC 2015 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner +- Use url for source + ------------------------------------------------------------------- Wed Mar 12 14:27:36 UTC 2014 - guillaume@opensuse.org diff --git a/tslib.spec b/tslib.spec index 985263b..de57fbe 100644 --- a/tslib.spec +++ b/tslib.spec @@ -1,7 +1,7 @@ # # spec file for package tslib # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Guillaume GARDET # # All modifications and additions to the file contributed by third parties @@ -25,13 +25,15 @@ License: LGPL-2.0+ and GPL-2.0+ Group: Hardware/Other Url: https://github.com/kergoth/tslib.git #Git-Clone: git://github.com/kergoth/tslib -Source: %{name}-%{version}.tar.gz +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 -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf +BuildRequires: automake BuildRequires: libtool BuildRequires: pkg-config +BuildRequires: xz +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Tslib is an abstraction layer for touchscreen panel events. @@ -64,23 +66,23 @@ This subpackage contains the hardware driver plugins for tslib. %package devel Summary: Development files for tslib, a touchscreen panel event layer Group: Development/Libraries/C and C++ -Requires: %name = %version -Requires: %name-plugins = %version +Requires: %{name} = %{version} +Requires: %{name}-plugins = %{version} %description devel Devel package for tslib. Tslib is an abstraction layer for touchscreen panel events. %prep %setup -q -%patch0 -p0 +%patch0 ./autogen.sh %configure %build -make +make %{?_smp_mflags} %install -make install DESTDIR="%buildroot" +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 @@ -91,11 +93,11 @@ ln -s tslib.pc %{buildroot}%{_libdir}/pkgconfig/tslib-1.0.pc %files devel %defattr(-,root,root) %dir %{_libdir}/ts -%_includedir/tslib.h +%{_includedir}/tslib.h %{_libdir}/libts.la %{_libdir}/pkgconfig/tslib-1.0.pc %{_libdir}/pkgconfig/tslib.pc -%dir %_libdir/ts +%dir %{_libdir}/ts %{_libdir}/ts/*.la %{_libdir}/libts.so @@ -111,7 +113,7 @@ ln -s tslib.pc %{buildroot}%{_libdir}/pkgconfig/tslib-1.0.pc %files %defattr(-,root,root) -%config /etc/ts.conf +%config %{_sysconfdir}/ts.conf %{_bindir}/ts_calibrate %{_bindir}/ts_harvest %{_bindir}/ts_print