- based on gstreamer-validate.spec, updated to 1.18.5 (uses meson+hotdoc now)

diff --git a/gstreamer-validate.spec b/gstreamer-devtools.spec
similarity index 64%
rename from gstreamer-validate.spec
rename to gstreamer-devtools.spec
index 70b376a4f185537550ce18278bdab2f05b342feb..797fbc3a9ecbe9d420ca115ee6f5e136e0523868 100644 (file)
--- a/gstreamer-validate.spec
+++ b/gstreamer-devtools.spec
@@ -1,51 +1,83 @@
-%define                gst_ver         1.16.3
-%define                gstpb_ver       1.16.3
+#
+# Conditional build:
+%bcond_without apidocs # API documentation
+
+%define                gst_ver         1.18.5
+%define                gstpb_ver       1.18.5
 %define                gstrtsp_ver     %{gst_ver}
-Summary:       GstValidate - suite of tools to run GStreamer integration tests
-Summary(pl.UTF-8):     GstValidate - zestaw narzędzi do uruchamiania testów integracyjnych GStreamera
-Name:          gstreamer-validate
-Version:       1.16.3
+Summary:       GStreamer development and validation tools
+Summary(pl.UTF-8):     Narzędzia programistyczne i sprawdzające do GStreamera
+Name:          gstreamer-devtools
+Version:       1.18.5
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
-Source0:       https://gstreamer.freedesktop.org/src/gst-validate/gst-validate-%{version}.tar.xz
-# Source0-md5: 740a436f5b9bf17ea7de0e62c92ec264
+Source0:       https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-%{version}.tar.xz
+# Source0-md5: 12656dc06805c4de8e3ee48d80545785
 URL:           https://gstreamer.freedesktop.org/
-BuildRequires: autoconf >= 2.62
-BuildRequires: automake >= 1:1.11
 BuildRequires: cairo-devel
 BuildRequires: gettext-devel >= 0.17
-BuildRequires: glib2-devel >= 1:2.36.0
+BuildRequires: glib2-devel >= 1:2.44.0
 BuildRequires: gobject-introspection-devel >= 0.6.3
 BuildRequires: gstreamer-devel >= %{gst_ver}
 BuildRequires: gstreamer-plugins-base-devel >= %{gstpb_ver}
 BuildRequires: gstreamer-rtsp-server-devel >= %{gstrtsp_ver}
 BuildRequires: gtk+3-devel >= 3.0
-BuildRequires: gtk-doc >= 1.3
+%{?with_apidocs:BuildRequires: hotdoc}
 BuildRequires: json-glib-devel >= 1.0
-BuildRequires: libtool >= 2:2.2.6
+BuildRequires: meson >= 0.48
+BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: python3 >= 1:3.4
 BuildRequires: rpm-build >= 4.6
 BuildRequires: sed >= 4.0
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
-Requires:      glib2 >= 1:2.36.0
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+GStreamer development and validation tools including GstValidate, a
+testing framework aiming at providing GStreamer developers tools that
+check the GstElements they write behave the way they are supposed to.
+
+%description -l pl.UTF-8
+Narzędzia programistyczne i sprawdzające do GStreamera, w tym
+GstValidate, szkielet testowy, którego celem jest zapewnienie
+programistom narzędzi sprawdzających, czy obiekty GstElement zachowują
+się w pożądany sposób.
+
+%package apidocs
+Summary:       API documentation for GstValidate library
+Summary(pl.UTF-8):     Dokumentacja API biblioteki GstValidate
+Group:         Documentation
+Obsoletes:     gstreamer-validate-apidocs < 1.18
+BuildArch:     noarch
+
+%description apidocs
+API documentation for GstValidate library.
+
+%description apidocs -l pl.UTF-8
+Dokumentacja API biblioteki GstValidate.
+
+%package -n gstreamer-validate
+Summary:       GstValidate - suite of tools to run GStreamer integration tests
+Summary(pl.UTF-8):     GstValidate - zestaw narzędzi do uruchamiania testów integracyjnych GStreamera
+Group:         Libraries
+Requires:      glib2 >= 1:2.44.0
 Requires:      gstreamer >= %{gst_ver}
 Requires:      gstreamer-plugins-base >= %{gstpb_ver}
 Requires:      gstreamer-rtsp-server >= %{gstrtsp_ver}
 Requires:      json-glib >= 1.0
 Requires:      python3-modules >= 1:3.4
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%description
+%description -n gstreamer-validate
 The goal of GstValidate is to be able to detect when elements are not
 behaving as expected and report it to the user so he knows how things
 are supposed to work inside a GstPipeline. In the end, fixing issues
 found by the tool will ensure that all elements behave all together in
 the expected way.
 
-%description -l pl.UTF-8
+%description -n gstreamer-validate -l pl.UTF-8
 Celem GstValidate jest umożliwienie wykrycia sytuacji, kiedy elementy
 nie zachowują się w sposób oczekiwany i zgłaszanie tego faktu
 użytkownikowi tak, aby wiedział, jak powinny działać elementy wewnątrz
@@ -53,76 +85,63 @@ GstPipeline. W efekcie, poprawienie problemów wykrytych przez to
 narzędzie zapewni, że wszystkie elementy razem będą się zachowywały w
 sposób zgodny z oczekiwaniami.
 
-%package devel
+%package -n gstreamer-validate-devel
 Summary:       Header files for GstValidate library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki GstValidate
 Group:         Development/Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.36.0
+Requires:      glib2-devel >= 1:2.44.0
 Requires:      gstreamer-devel >= %{gst_ver}
 Requires:      gstreamer-plugins-base-devel >= %{gstpb_ver}
+Requires:      gstreamer-validate = %{version}-%{release}
 
-%description devel
+%description -n gstreamer-validate-devel
 Header files for GstValidate library.
 
-%description devel -l pl.UTF-8
+%description -n gstreamer-validate-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki GstValidate.
 
-%package apidocs
-Summary:       API documentation for GstValidate library
-Summary(pl.UTF-8):     Dokumentacja API biblioteki GstValidate
-Group:         Documentation
-BuildArch:     noarch
-
-%description apidocs
-API documentation for GstValidate library.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API biblioteki GstValidate.
-
 %prep
-%setup -q -n gst-validate-%{version}
+%setup -q -n gst-devtools-%{version}
 
-%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' tools/gst-validate-launcher.in
+%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' validate/tools/gst-validate-launcher.in
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4 -I common/m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-# disable sphinx for now: docs/launcher/conf.py is missing
-%configure \
-       PYTHON=%{__python3} \
-       --enable-gtk-doc \
-       --disable-silent-rules \
-       --disable-sphinx-doc \
-       --disable-static \
-       --with-html-dir=%{_gtkdocdir}
-
-%{__make}
+%meson build \
+       --default-library=shared \
+       %{!?with_apidocs:-Ddoc=false}
+
+%ninja_build -C build
+
+%if %{with apidocs}
+cd build/docs
+LC_ALL=C.UTF-8 hotdoc run --conf-file gst-devtools-doc.json
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
-# modules loaded through glib
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgstvalidatetracer.la \
-       $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/validate/libgstvalidate*.la
+%if %{with apidocs}
+install -d $RPM_BUILD_ROOT%{_docdir}/gstreamer-%{gstmver}
+cp -pr build/docs/gst-devtools-doc $RPM_BUILD_ROOT%{_docdir}/gstreamer-%{gstmver}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p /sbin/ldconfig
-%postun        -p /sbin/ldconfig
+%post  -n gstreamer-validate -p /sbin/ldconfig
+%postun        -n gstreamer-validate -p /sbin/ldconfig
 
-%files
+%if %{with apidocs}
+%files apidocs
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%{_docdir}/gstreamer-%{gstmver}/gst-devtools-doc
+%endif
+
+%files -n gstreamer-validate
+%defattr(644,root,root,755)
+%doc ChangeLog NEWS RELEASE validate/README
 %attr(755,root,root) %{_bindir}/gst-validate-1.0
 %attr(755,root,root) %{_bindir}/gst-validate-images-check-1.0
 %attr(755,root,root) %{_bindir}/gst-validate-launcher
@@ -133,32 +152,21 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libgstvalidate-1.0.so.0
 %attr(755,root,root) %{_libdir}/libgstvalidate-default-overrides-1.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgstvalidate-default-overrides-1.0.so.0
-%attr(755,root,root) %{_libdir}/libgstvalidatevideo-1.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgstvalidatevideo-1.0.so.0
 %{_libdir}/girepository-1.0/GstValidate-1.0.typelib
 %attr(755,root,root) %{_libdir}/gstreamer-1.0/libgstvalidatetracer.so
 %dir %{_libdir}/gstreamer-1.0/validate
 %attr(755,root,root) %{_libdir}/gstreamer-1.0/validate/libgstvalidatefaultinjection.so
 %attr(755,root,root) %{_libdir}/gstreamer-1.0/validate/libgstvalidategapplication.so
 %attr(755,root,root) %{_libdir}/gstreamer-1.0/validate/libgstvalidategtk.so
-%attr(755,root,root) %{_libdir}/gstreamer-1.0/validate/libgstvalidateflow.so
 %attr(755,root,root) %{_libdir}/gstreamer-1.0/validate/libgstvalidatessim.so
 %{_libdir}/gst-validate-launcher
 %dir %{_datadir}/gstreamer-1.0
 %{_datadir}/gstreamer-1.0/validate
 
-%files devel
+%files -n gstreamer-validate-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgstvalidate-1.0.so
 %attr(755,root,root) %{_libdir}/libgstvalidate-default-overrides-1.0.so
-%attr(755,root,root) %{_libdir}/libgstvalidatevideo-1.0.so
 %{_includedir}/gstreamer-1.0/gst/validate
-%dir %{_includedir}/gstreamer-1.0/lib
-%{_includedir}/gstreamer-1.0/lib/validate
 %{_pkgconfigdir}/gst-validate-1.0.pc
 %{_datadir}/gir-1.0/GstValidate-1.0.gir
-
-%files apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/gst-validate-1.0
-%{_gtkdocdir}/gst-validate-plugins-1.0