- updated to 0.2.0

diff --git a/feedbackd.spec b/feedbackd.spec
index 009134f6cf9d173f7cc0bbed662c77dc34d81ff7..50e0a28c13ec8e30a5405cf169f83f44cbf41c70 100644 (file)
--- a/feedbackd.spec
+++ b/feedbackd.spec
@@ -5,24 +5,26 @@
 Summary:       Haptic/visual/audio feedback for GNOME
 Summary(pl.UTF-8):     Dotykowe/wizualne/dźwiękowe informacje zwrotne dla GNOME
 Name:          feedbackd
-Version:       0.0.0
-%define        subver  git20210426
-Release:       0.%{subver}.1
+Version:       0.2.0
+Release:       1
 # most of library is LGPL-2.1+, but lfb-event is GPL-3.0+, so whole library is GPL-3.0+; daemon is GPL-3.0+
 License:       GPL v3+
 Group:         Daemons
 #Source0Download: https://source.puri.sm/Librem5/feedbackd/-/tags
-Source0:       https://source.puri.sm/Librem5/feedbackd/-/archive/v%{version}+%{subver}/%{name}-v%{version}+%{subver}.tar.bz2
-# Source0-md5: 4d2e8f7ca74a9d782309bd6ae3c222fe
+Source0:       https://source.puri.sm/Librem5/feedbackd/-/archive/v%{version}/%{name}-v%{version}.tar.bz2
+# Source0-md5: f0763bd62f114759855be14376a3c720
+Source1:       https://gitlab.gnome.org/guidog/gmobile/-/archive/d483537aee4778b114ce5d50c4c8a9f8d58337ed/gmobile-d483537aee4778b114ce5d50c4c8a9f8d58337ed.tar.bz2
+# Source1-md5: 9269121e7d837892784157c8f59fd2e6
 URL:           https://source.puri.sm/Librem5/feedbackd
-BuildRequires: glib2-devel >= 1:2.50.0
+BuildRequires: gi-docgen >= 2021.1
+BuildRequires: glib2-devel >= 1:2.66
 BuildRequires: gobject-introspection-devel
 BuildRequires: gsound-devel
 %{?with_apidocs:BuildRequires: gtk-doc}
-BuildRequires: json-glib-devel
+BuildRequires: json-glib-devel >= 1.6.2
 BuildRequires: libgudev-devel >= 232
 BuildRequires: libxslt-progs
-BuildRequires: meson >= 0.49.0
+BuildRequires: meson >= 0.56.1
 BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
 BuildRequires: rpm-build >= 4.6
@@ -31,6 +33,7 @@ BuildRequires:        vala
 Requires(post,postun): glib2 >= 1:2.50.0
 Requires:      libfeedback = %{version}-%{release}
 Requires:      libgudev >= 232
+Requires:      json-glib >= 1.6.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,7 +52,7 @@ oraz wiązania GObject, ułatwiające używanie go z poziomu aplikacji.
 Summary:       GNOME Feedback library
 Summary(pl.UTF-8):     Biblioteka GNOME Feedback
 Group:         Libraries
-Requires:      glib2 >= 1:2.50.0
+Requires:      glib2 >= 1:2.66
 Suggests:      %{name} = %{version}-%{release}
 
 %description -n libfeedback
@@ -63,7 +66,7 @@ Summary:      Header files for Feedback library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Feedback
 Group:         Development/Libraries
 Requires:      libfeedback = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.50.0
+Requires:      glib2-devel >= 1:2.66
 
 %description -n libfeedback-devel
 Header files for Feedback library.
@@ -97,7 +100,9 @@ API documentation for Feedback library.
 Dokumentacja API biblioteki Feedback.
 
 %prep
-%setup -q -n %{name}-v%{version}+%{subver}
+%setup -q -n %{name}-v%{version}
+
+%{__tar} xf %{SOURCE1} -C subprojects/gmobile --strip-components=1
 
 %build
 %meson build \
@@ -111,6 +116,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %ninja_install -C build
 
+%if %{with apidocs}
+# FIXME: where to package gi-docgen generated docs?
+install -d $RPM_BUILD_ROOT%{_gtkdocdir}
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/libfeedback-0 $RPM_BUILD_ROOT%{_gtkdocdir}
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -127,13 +138,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.md
 %attr(755,root,root) %{_bindir}/fbcli
+%attr(755,root,root) %{_bindir}/fbd-theme-validate
 %attr(755,root,root) %{_libexecdir}/fbd-ledctrl
 %attr(755,root,root) %{_libexecdir}/feedbackd
 %{_datadir}/dbus-1/services/org.sigxcpu.Feedback.service
 %{_datadir}/feedbackd
 %{_datadir}/glib-2.0/schemas/org.sigxcpu.feedbackd.gschema.xml
 %{_mandir}/man1/fbcli.1*
-%{_mandir}/man1/feedbackd.1*
+%{_mandir}/man1/fbd-theme-validate.1*
+%{_mandir}/man8/feedbackd.8*
 
 %files -n libfeedback
 %defattr(644,root,root,755)
@@ -143,7 +156,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libfeedback-devel
 %defattr(644,root,root,755)
-%doc Event-naming-spec-0.0.0.md Feedback-theme-spec-0.0.0.md
 %attr(755,root,root) %{_libdir}/libfeedback-0.0.so
 %{_includedir}/libfeedback-0.0
 %{_datadir}/gir-1.0/Lfb-0.0.gir
@@ -157,5 +169,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files -n libfeedback-apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/libfeedback
+%{_gtkdocdir}/libfeedback-0
 %endif