- updated to 3.0

- removed obsolete static-inline patch
- added -apidocs package

diff --git a/iio-sensor-proxy.spec b/iio-sensor-proxy.spec
index ee834a951095b2d635144597739e097e617413b8..5b3fd361f2b37e075cbde5b5765b3ad3142c6623 100644 (file)
--- a/iio-sensor-proxy.spec
+++ b/iio-sensor-proxy.spec
@@ -1,41 +1,65 @@
 Summary:       IIO accelerometer sensor to input device proxy
+Summary(pl.UTF-8):     Proxy czujnika przyspieszenia IIO do urządzenia wejściowego
 Name:          iio-sensor-proxy
-Version:       1.0
+Version:       3.0
 Release:       1
-License:       GPL v2
-Group:         Applications
-Source0:       https://github.com/hadess/iio-sensor-proxy/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 047659bebd9c071862b0b1fd0be093b5
-Patch0:                static-inline.patch
-URL:           https://github.com/hadess/iio-sensor-proxy
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: glib2-devel
-BuildRequires: gtk-doc
-BuildRequires: pkg-config
+License:       GPL v3
+Group:         Applications/System
+#Source0Download: https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/tags
+Source0:       https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/uploads/de965bcb444552d328255639b241ce73/%{name}-%{version}.tar.xz
+# Source0-md5: 77eb3efd950c8eaf4f89c0ce3b2b914c
+URL:           https://gitlab.freedesktop.org/hadess/iio-sensor-proxy
+BuildRequires: autoconf >= 2.59
+BuildRequires: automake >= 1:1.9
+BuildRequires: glib2-devel >= 1:2.56
+BuildRequires: gtk-doc >= 1.11
+BuildRequires: libgudev-devel >= 232
+BuildRequires: pkgconfig
 BuildRequires: rpmbuild(macros) >= 1.647
-BuildRequires: udev-glib-devel
+BuildRequires: tar >= 1:1.22
+BuildRequires: udev-devel
+BuildRequires: xz
 Requires(post,preun,postun):   systemd-units >= 38
+Requires:      glib2 >= 1:2.56
+Requires:      libgudev >= 232
 Requires:      systemd-units >= 0.38
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 IIO accelerometer sensor to input device proxy.
 
+%description -l pl.UTF-8
+Proxy czujnika przyspieszenia IIO do urządzenia wejściowego.
+
+%package apidocs
+Summary:       DBus API documentation for iio-sensor-proxy service
+Summary(pl.UTF-8):     Dokumentacja API DBus usługi iio-sensor-proxy
+Group:         Documentation
+%if "%{_rpmversion}" >= "4.6"
+BuildArch:     noarch
+%endif
+
+%description apidocs
+DBus API documentation for iio-sensor-proxy service.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API DBus usługi iio-sensor-proxy.
+
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__gtkdocize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
 %configure \
-       --with-udevrulesdir=/lib/udev/rules.d \
-       --with-systemdsystemunitdir=/lib/systemd/system
+       --disable-silent-rules \
+       --with-html-dir=%{_gtkdocdir} \
+       --with-systemdsystemunitdir=%{systemdunitdir} \
+       --with-udevrulesdir=/lib/udev/rules.d
 
-%{__make} V=1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -58,8 +82,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc NEWS README.md
-/etc/dbus-1/system.d/net.hadess.SensorProxy.conf
-%{systemdunitdir}/iio-sensor-proxy.service
-/lib/udev/rules.d/40-iio-sensor-proxy.rules
 %attr(755,root,root) %{_bindir}/monitor-sensor
 %attr(755,root,root) %{_sbindir}/iio-sensor-proxy
+/etc/dbus-1/system.d/net.hadess.SensorProxy.conf
+%{systemdunitdir}/iio-sensor-proxy.service
+/lib/udev/rules.d/80-iio-sensor-proxy.rules
+
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/iio-sensor-proxy

diff --git a/static-inline.patch b/static-inline.patch
deleted file mode 100644 (file)
index 620f9fa..0000000
--- a/static-inline.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- iio-sensor-proxy-1.0/src/drivers.h~        2015-05-22 16:16:20.000000000 +0200
-+++ iio-sensor-proxy-1.0/src/drivers.h 2015-05-24 15:35:07.618426157 +0200
-@@ -58,7 +58,7 @@
-       void     (*close)       (void);
- };
- 
--inline gboolean
-+static inline gboolean
- driver_discover (SensorDriver *driver,
-                GUdevDevice  *device)
- {
-@@ -69,7 +69,7 @@
-       return driver->discover (device);
- }
- 
--inline gboolean
-+static inline gboolean
- driver_open (SensorDriver       *driver,
-            GUdevDevice        *device,
-            ReadingsUpdateFunc  callback_func,
-@@ -83,7 +83,7 @@
-       return driver->open (device, callback_func, user_data);
- }
- 
--inline void
-+static inline void
- driver_set_polling (SensorDriver *driver,
-                   gboolean      state)
- {
-@@ -95,7 +95,7 @@
-       driver->set_polling (state);
- }
- 
--inline void
-+static inline void
- driver_close (SensorDriver *driver)
- {
-       g_return_if_fail (driver);