- updated to 1.12

diff --git a/libwacom.spec b/libwacom.spec
index f5a1d73e4a24ae890c88e7e33522a2f6e91251b7..04e87f43803a29c2f9738fe2ce2fa3952443bc3a 100644 (file)
--- a/libwacom.spec
+++ b/libwacom.spec
@@ -1,13 +1,17 @@
+#
+# Conditional build:
+%bcond_without static_libs     # static library
+
 Summary:       Wacom model feature query library
 Summary(pl.UTF-8):     Biblioteka identyfikująca modele i możliwości tabletów Wacom
 Name:          libwacom
-Version:       1.9
+Version:       1.12
 Release:       1
 License:       MIT
 Group:         Libraries
 #Source0Download: https://github.com/linuxwacom/libwacom/releases
 Source0:       https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 67aec245e7c1ee7f585a85a2c27db9d8
+# Source0-md5: 5c2e8a1a985b2a31445f6925a45fdec4
 URL:           https://linuxwacom.github.io/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -15,9 +19,10 @@ BuildRequires:       doxygen
 BuildRequires: glib2-devel >= 1:2.36
 BuildRequires: gtk+2-devel >= 1:2.0
 BuildRequires: librsvg-devel >= 2.0
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
 BuildRequires: libxml2-devel >= 2.0
 BuildRequires: pkgconfig
+BuildRequires: python3 >= 1:3
 BuildRequires: sed >= 4.0
 BuildRequires: udev-glib-devel
 Requires:      glib2 >= 1:2.36
@@ -59,7 +64,7 @@ Statyczna biblioteka libwacom.
 %prep
 %setup -q
 
-%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' tools/show-stylus.py
+%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' tools/{libwacom-update-db,show-stylus}.py
 
 %build
 %{__libtoolize}
@@ -69,6 +74,7 @@ Statyczna biblioteka libwacom.
 %{__automake}
 %configure \
        --disable-silent-rules \
+       %{?with_static_libs:--enable-static} \
        --with-udev-dir=/lib/udev
 %{__make}
 
@@ -89,13 +95,16 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc COPYING NEWS README.md
+%attr(755,root,root) %{_bindir}/libwacom-list-devices
 %attr(755,root,root) %{_bindir}/libwacom-list-local-devices
 %attr(755,root,root) %{_bindir}/libwacom-show-stylus
+%attr(755,root,root) %{_bindir}/libwacom-update-db
 %attr(755,root,root) %{_libdir}/libwacom.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libwacom.so.2
 %{_datadir}/libwacom
 /lib/udev/hwdb.d/65-libwacom.hwdb
 /lib/udev/rules.d/65-libwacom.rules
+%{_mandir}/man1/libwacom-list-devices.1*
 %{_mandir}/man1/libwacom-list-local-devices.1*
 
 %files devel
@@ -104,6 +113,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libwacom-1.0
 %{_pkgconfigdir}/libwacom.pc
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libwacom.a
+%endif