From: Duna Oh Date: Mon, 7 Feb 2022 16:58:20 +0000 (+0900) Subject: packaging: Bump up to 1.11.0 X-Git-Tag: accepted/tizen/7.0/unified/20221110.062241^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2accd5638b478bff8d4c2f92f64db972464d5fe6;p=platform%2Fupstream%2Flibevdev.git packaging: Bump up to 1.11.0 --- diff --git a/meson.build b/meson.build index 531e8ab..fe300b7 100644 --- a/meson.build +++ b/meson.build @@ -94,6 +94,7 @@ pkgconfig.generate( subdirs: 'libevdev-1.0', ) +if get_option('tools-enable') man_config = configuration_data() man_config.set('PACKAGE_VERSION', meson.project_version()) manpage = configure_file(input: 'doc/libevdev.man.in', @@ -125,6 +126,7 @@ executable('libevdev-tweak-device', install: true) install_man('tools/libevdev-tweak-device.1', 'tools/touchpad-edge-detector.1') +endif # tests dep_check = dependency('check', version: '>= 0.9.9', diff --git a/meson_options.txt b/meson_options.txt index 033791d..9678ff4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -10,3 +10,7 @@ option('coverity', type: 'boolean', value: 'false', description: 'Enable coverity build fixes, see meson.build for details') +option('tools-enable', + type: 'boolean', + value: true, + description: 'Building tools') \ No newline at end of file diff --git a/packaging/libevdev.spec b/packaging/libevdev.spec index e96bc87..1f1729e 100644 --- a/packaging/libevdev.spec +++ b/packaging/libevdev.spec @@ -1,5 +1,5 @@ Name: libevdev -Version: 1.10.0 +Version: 1.11.0 Release: 0 License: MIT Summary: wrapper library for evdev input devices @@ -9,7 +9,7 @@ Source: %{name}-%{version}.tar.gz Source1001: %name.manifest BuildRequires: doxygen -BuildRequires: make +BuildRequires: meson BuildRequires: python %{!?TZ_SYS_RO_SHARE: %global TZ_SYS_RO_SHARE /usr/share} @@ -33,13 +33,21 @@ interface to the callers, thus avoiding erroneous ioctls, etc. %prep %setup -q cp %{SOURCE1001} . -%autogen %build -make %{?jobs:-j%jobs} V=1 +meson setup \ + -Ddocumentation=disabled \ + -Dtests=disabled \ + -Dtools-enable=false \ + --prefix /usr \ + --libdir %{_libdir} \ + --bindir %{_bindir} \ + builddir +ninja -C builddir all %install -%make_install +export DESTDIR=%{buildroot} +ninja -C builddir install #%fdupes %{buildroot} %post -p /sbin/ldconfig @@ -52,8 +60,11 @@ make %{?jobs:-j%jobs} V=1 %defattr(-,root,root) %license COPYING %{_libdir}/*.so.* -%{_datadir}/* +## disable tools ## +#%{_bindir}/libevdev +#/usr/libexec/libevdev/* +#%doc %{_mandir}/man?/* %files devel %manifest %{name}.manifest