- added gtk4 library (as subpackages), release 2

diff --git a/libnma.spec b/libnma.spec
index 70e98c1fa045e6967dd9c8deefa513681939a063..5852972a74112ddb5054c29dc9b3a2de29d495ed 100644 (file)
--- a/libnma.spec
+++ b/libnma.spec
@@ -1,15 +1,15 @@
-# TODO: gtk4 variant (--with-libnma-gtk4; uses gtk4-builder-tool, which fails without $DISPLAY)
 #
 # Conditional build:
 %bcond_without apidocs         # gtk-doc documentation
 %bcond_without static_libs     # shared library
 %bcond_without vala            # Vala API
+%bcond_without gtk4            # Gtk4 variant
 #
 Summary:       NetworkManager UI utilities (libnm version)
 Summary(pl.UTF-8):     Narzędzia UI NetworkManagera (wersja libnm)
 Name:          libnma
 Version:       1.8.36
-Release:       1
+Release:       2
 License:       LGPL v2.1+
 Group:         X11/Libraries
 Source0:       https://download.gnome.org/sources/libnma/1.8/%{name}-%{version}.tar.xz
@@ -24,6 +24,7 @@ BuildRequires:        glib2-devel >= 1:2.38
 BuildRequires: gobject-introspection-devel >= 0.9.6
 BuildRequires: gtk+3-devel >= 3.10
 BuildRequires: gtk-doc >= 1.0
+%{?with_gtk4:BuildRequires:    gtk4-devel >= 4.6.2}
 BuildRequires: libtool >= 2:2.2.6
 BuildRequires: pkgconfig
 BuildRequires: rpm-build >= 4.6
@@ -34,6 +35,7 @@ BuildRequires:        vala >= 2:0.17.1.24
 BuildRequires: vala-NetworkManager
 %endif
 BuildRequires: xz
+Requires:      %{name}-data = %{version}-%{release}
 Requires:      NetworkManager-libs >= 2:1.7
 Requires:      gcr-ui >= 3.14
 Requires:      glib2 >= 1:2.38
@@ -55,6 +57,7 @@ Summary:      Header files for libnma library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libnma
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      %{name}-headers = %{version}-%{release}
 Requires:      NetworkManager-devel >= 2:1.7
 Requires:      glib2-devel >= 1:2.38
 Requires:      gtk+3-devel >= 3.10
@@ -79,6 +82,44 @@ Static libnma library.
 %description static -l pl.UTF-8
 Statyczna biblioteka libnma.
 
+%package -n vala-libnma
+Summary:       Vala API for libnma library
+Summary(pl.UTF-8):     API języka Vala do biblioteki libnma
+Group:         X11/Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      vala >= 2:0.17.1.24
+BuildArch:     noarch
+
+%description -n vala-libnma
+Vala API for libnma library.
+
+%description -n vala-libnma -l pl.UTF-8
+API języka Vala do biblioteki libnma.
+
+%package data
+Summary:       Common data for libnma libraries
+Summary(pl.UTF-8):     Wspólne dane bibliotek libnma
+Group:         X11/Libraries
+Conflicts:     libnma < 1.8.36-2
+
+%description data
+Common data for libnma libraries.
+
+%description data -l pl.UTF-8
+Wspólne dane bibliotek libnma.
+
+%package headers
+Summary:       Header files for libnma libraries
+Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek libnma
+Group:         X11/Development/Libraries
+Conflicts:     libnma-devel < 1.8.36-2
+
+%description headers
+Header files for libnma libraries.
+
+%description headers -l pl.UTF-8
+Pliki nagłówkowe bibliotek libnma.
+
 %package apidocs
 Summary:       API documentation for libnma library
 Summary(pl.UTF-8):     Dokumentacja API biblioteki libnma
@@ -92,19 +133,63 @@ API documentation for libnma library.
 %description apidocs -l pl.UTF-8
 Dokumentacja API biblioteki libnma.
 
-%package -n vala-libnma
-Summary:       Vala API for libnma library
-Summary(pl.UTF-8):     API języka Vala do biblioteki libnma
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
+%package gtk4
+Summary:       NetworkManager UI utilities (libnm version) for GTK 4
+Summary(pl.UTF-8):     Narzędzia UI NetworkManagera (wersja libnm) dla GTK 4
+Group:         X11/Libraries
+Requires:      %{name}-data = %{version}-%{release}
+Requires:      NetworkManager-libs >= 2:1.7
+Requires:      gcr-ui >= 3.14
+Requires:      glib2 >= 1:2.38
+Requires:      gtk4 >= 4.6.2
+
+%description gtk4
+NetworkManager UI utilities (libnm version) for GTK 4.
+
+%description gtk4 -l pl.UTF-8
+Narzędzia UI NetworkManagera (wersja libnm) dla GTK 4.
+
+%package gtk4-devel
+Summary:       Header files for libnma library for GTK 4
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libnma dla GTK 4
+Group:         X11/Development/Libraries
+Requires:      %{name}-gtk4 = %{version}-%{release}
+Requires:      %{name}-headers = %{version}-%{release}
+Requires:      NetworkManager-devel >= 2:1.7
+Requires:      glib2-devel >= 1:2.38
+Requires:      gtk4-devel >= 4.6.2
+
+%description gtk4-devel
+Header files for libnma library for GTK 4.
+
+%description gtk4-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libnma dla GTK 4.
+
+%package gtk4-static
+Summary:       Static libnma library for GTK 4
+Summary(pl.UTF-8):     Statyczna biblioteka libnma dla GTK 4
+Group:         X11/Development/Libraries
+Requires:      %{name}-gtk4-devel = %{version}-%{release}
+
+%description gtk4-static
+Static libnma library for GTK 4.
+
+%description gtk4-static -l pl.UTF-8
+Statyczna biblioteka libnma dla GTK 4.
+
+%package -n vala-libnma-gtk4
+Summary:       Vala API for libnma library for GTK 4
+Summary(pl.UTF-8):     API języka Vala do biblioteki libnma dla GTK 4
+Group:         X11/Development/Libraries
+Requires:      %{name}-gtk4-devel = %{version}-%{release}
 Requires:      vala >= 2:0.17.1.24
 BuildArch:     noarch
 
-%description -n vala-libnma
-Vala API for libnma library.
+%description -n vala-libnma-gtk4
+Vala API for libnma library for GTK 4.
 
-%description -n vala-libnma -l pl.UTF-8
-API języka Vala do biblioteki libnma.
+%description -n vala-libnma-gtk4 -l pl.UTF-8
+API języka Vala do biblioteki libnma dla GTK 4.
 
 %prep
 %setup -q
@@ -121,7 +206,8 @@ API języka Vala do biblioteki libnma.
        --disable-silent-rules \
        %{!?with_static_libs:--disable-static} \
        %{__enable_disable vala} \
-       --with-html-dir=%{_gtkdocdir}
+       --with-html-dir=%{_gtkdocdir} \
+       %{?with_gtk4:--with-libnma-gtk4}
 
 %{__make}
 
@@ -132,7 +218,7 @@ rm -rf $RPM_BUILD_ROOT
        DESTDIR=$RPM_BUILD_ROOT
 
 # obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnma.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnma*.la
 
 %find_lang %{name}
 
@@ -142,18 +228,15 @@ rm -rf $RPM_BUILD_ROOT
 %post  -p /sbin/ldconfig
 %postun        -p /sbin/ldconfig
 
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
-%doc NEWS
 %attr(755,root,root) %{_libdir}/libnma.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnma.so.0
 %{_libdir}/girepository-1.0/NMA-1.0.typelib
-%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnma.so
-%{_includedir}/libnma
 %{_datadir}/gir-1.0/NMA-1.0.gir
 %{_pkgconfigdir}/libnma.pc
 
@@ -163,6 +246,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libnma.a
 %endif
 
+%files data -f %{name}.lang
+%defattr(644,root,root,755)
+%doc NEWS
+%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
+
+%files headers
+%defattr(644,root,root,755)
+%{_includedir}/libnma
+
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
@@ -175,3 +267,30 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/vala/vapi/libnma.deps
 %{_datadir}/vala/vapi/libnma.vapi
 %endif
+
+%if %{with gtk4}
+%files gtk4
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnma-gtk4.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnma-gtk4.so.0
+%{_libdir}/girepository-1.0/NMA4-1.0.typelib
+
+%files gtk4-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libnma-gtk4.so
+%{_datadir}/gir-1.0/NMA4-1.0.gir
+%{_pkgconfigdir}/libnma-gtk4.pc
+
+%if %{with static_libs}
+%files gtk4-static
+%defattr(644,root,root,755)
+%{_libdir}/libnma-gtk4.a
+%endif
+
+%if %{with vala}
+%files -n vala-libnma-gtk4
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/libnma-gtk4.deps
+%{_datadir}/vala/vapi/libnma-gtk4.vapi
+%endif
+%endif