- updated to 1.0.3, uses meson now

diff --git a/gsound.spec b/gsound.spec
index 55dc9811324742f6f3fa0297f34e01198e8af8ee..b5f30677d1c61ef9125280299169cfab5db90f87 100644 (file)
--- a/gsound.spec
+++ b/gsound.spec
@@ -1,22 +1,27 @@
 #
 # Conditional build:
+%bcond_without apidocs         # API documentation
 %bcond_without static_libs     # static library
 
 Summary:       GSound - library for playing system sounds
 Summary(pl.UTF-8):     GSound - biblioteka do odtwarzania dźwięków systemowych
 Name:          gsound
-Version:       1.0.2
-Release:       4
+Version:       1.0.3
+Release:       1
 License:       LGPL v2.1+
 Group:         Applications/System
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gsound/1.0/%{name}-%{version}.tar.xz
-# Source0-md5: c26fd21c21b9ef6533a202a73fab21db
+Source0:       https://download.gnome.org/sources/gsound/1.0/%{name}-%{version}.tar.xz
+# Source0-md5: 7338c295034432a6e782fd20b3d04b68
 URL:           https://wiki.gnome.org/Projects/GSound
 BuildRequires: glib2-devel >= 1:2.36.0
 BuildRequires: gobject-introspection-devel >= 1.2.9
-BuildRequires: gtk-doc >= 1.20
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.20}
 BuildRequires: libcanberra-devel
+BuildRequires: meson
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
+BuildRequires: rpm-build >= 4.6
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: tar >= 1:1.22
 BuildRequires: vala >= 2:0.17.2.12
 BuildRequires: vala-libcanberra
@@ -59,18 +64,6 @@ Static GSound library.
 %description static -l pl.UTF-8
 Statyczna biblioteka GSound.
 
-%package apidocs
-Summary:       API documentation for GSound library
-Summary(pl.UTF-8):     Dokumentacja API biblioteki GSound
-Group:         Documentation
-BuildArch:     noarch
-
-%description apidocs
-API documentation for GSound library.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API biblioteki GSound.
-
 %package -n vala-gsound
 Summary:       Vala API for GSound library
 Summary(pl.UTF-8):     API języka Vala do biblioteki GSound
@@ -86,25 +79,32 @@ Vala API for GSound library.
 %description -n vala-gsound -l pl.UTF-8
 API języka Vala do biblioteki GSound.
 
+%package apidocs
+Summary:       API documentation for GSound library
+Summary(pl.UTF-8):     Dokumentacja API biblioteki GSound
+Group:         Documentation
+BuildArch:     noarch
+
+%description apidocs
+API documentation for GSound library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki GSound.
+
 %prep
 %setup -q
 
 %build
-%configure \
-       --disable-silent-rules \
-       %{!?with_static_libs:--disable-static} \
-       --with-html-dir=%{_gtkdocdir}
+%meson build \
+       %{!?with_static_libs:--default-library=shared} \
+       %{?with_apidocs:-Dgtk_doc=true}
 
-%{__make}
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
-
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgsound.la
+%ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -114,11 +114,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README
+%doc README.md
 %attr(755,root,root) %{_bindir}/gsound-play
 %attr(755,root,root) %{_libdir}/libgsound.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgsound.so.0
 %{_libdir}/girepository-1.0/GSound-1.0.typelib
+%{_mandir}/man1/gsound-play.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -133,11 +134,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgsound.a
 %endif
 
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/gsound
-
 %files -n vala-gsound
 %defattr(644,root,root,755)
 %{_datadir}/vala/vapi/gsound.deps
 %{_datadir}/vala/vapi/gsound.vapi
+
+%if %{with apidocs}
+%files apidocs
+%defattr(644,root,root,755)
+%{_gtkdocdir}/gsound-%{version}
+%endif