diff --git a/libnma.spec b/libnma.spec index e4b43d4..0f53867 100644 --- a/libnma.spec +++ b/libnma.spec @@ -1,7 +1,7 @@ %define majver %(echo %version | cut -d. -f1-2) Name: libnma Version: 1.10.2 -Release: 1mamba +Release: 2mamba Summary: Network Manager Applet library Group: System/Libraries Vendor: openmamba @@ -12,35 +12,40 @@ Source: http://ftp.acc.umu.se/pub/GNOME/sources/libnma/%{majver}/libnma-% License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel -BuildRequires: libatk-devel -BuildRequires: libbrotli-devel -BuildRequires: libbzip2-devel BuildRequires: libcairo-devel -BuildRequires: libffi-devel -BuildRequires: libfreetype-devel -BuildRequires: libgcr-devel -BuildRequires: libgdk-pixbuf-devel +BuildRequires: libgcr3-devel BuildRequires: libglib-devel -BuildRequires: libgraphite2-devel +BuildRequires: libgtk-devel BuildRequires: libgtk3-devel -BuildRequires: libharfbuzz-devel BuildRequires: libnm-devel -BuildRequires: libp11-kit-devel -BuildRequires: libpango-devel -BuildRequires: libpcre-devel -BuildRequires: libpng-devel -BuildRequires: libz-devel ## AUTOBUILDREQ-END BuildRequires: libffi-devel >= 3.3 Obsoletes: libnm-gtk < 1.10.2 +Requires: %{name}-common = %{?epoch:%epoch:}%{version}-%{release} %description Network Manager Applet library. +%package common +Group: System/Libraries +Summary: Network Manager Applet library (common files) + +%description common +Network Manager Applet library (common files). + +%package gtk4 +Group: System/Libraries +Summary: Network Manager Applet library (GTK4) +Requires: %{name}-common = %{?epoch:%epoch:}%{version}-%{release} + +%description gtk4 +Network Manager Applet library (GTK4). + %package devel Group: Development/Libraries Summary: Development files for %{name} Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} +Requires: %{name}-gtk4 = %{?epoch:%epoch:}%{version}-%{release} Requires: pkg-config Obsoletes: libnm-gtk-devel < 1.10.2 @@ -62,49 +67,67 @@ This package includes the %{name} API documentation. %setup -q %build -%configure --enable-gtk-doc -%make +%meson \ + -Dlibnma_gtk4=true + +%meson_build %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall +%meson_install %find_lang %{name} || touch %{name}.lang %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%post -/sbin/ldconfig +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%post gtk4 -p /sbin/ldconfig +%postun gtk4 -p /sbin/ldconfig + +%post common if [ $1 -ge 1 ]; then glib-compile-schemas %{_datadir}/glib-2.0/schemas fi : -%postun -/sbin/ldconfig +%postun common if [ $1 -eq 0 ]; then glib-compile-schemas %{_datadir}/glib-2.0/schemas fi : -%files -f %{name}.lang +%files common -f %{name}.lang +%defattr(-,root,root) +%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml +%doc COPYING + +%files %defattr(-,root,root) %{_libdir}/libnma.so.* %{_libdir}/girepository-1.0/NMA-1.0.typelib -%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml -%doc COPYING + +%files gtk4 +%defattr(-,root,root) +%{_libdir}/libnma-gtk4.so.* +%{_libdir}/girepository-1.0/NMA4-1.0.typelib %files devel %defattr(-,root,root) %dir %{_includedir}/libnma %{_includedir}/libnma/nma*.h -%{_libdir}/libnma.a %{_libdir}/libnma.so -%{_libdir}/pkgconfig/libnma.pc +%{_libdir}/libnma-gtk4.so %{_datadir}/gir-1.0/NMA-1.0.gir +%{_datadir}/gir-1.0/NMA4-1.0.gir %{_datadir}/vala/vapi/libnma.deps %{_datadir}/vala/vapi/libnma.vapi +%{_datadir}/vala/vapi/libnma-gtk4.deps +%{_datadir}/vala/vapi/libnma-gtk4.vapi +%{_libdir}/pkgconfig/libnma.pc +%{_libdir}/pkgconfig/libnma-gtk4.pc %doc NEWS %files apidocs @@ -113,6 +136,9 @@ fi %{_datadir}/gtk-doc/html/libnma/* %changelog +* Thu Nov 03 2022 Silvan Calarco 1.10.2-2mamba +- rebuilt with gtk4 subpackage + * Sun Sep 11 2022 Automatic Build System 1.10.2-1mamba - automatic version update by autodist