diff --git a/.gitignore b/.gitignore index 79e9ae5..a247d9a 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /glade-3.22.1.tar.xz /glade-3.22.2.tar.xz /glade-3.36.0.tar.xz +/glade-3.37.0.tar.xz diff --git a/glade.spec b/glade.spec index bbb7181..9a1ab8a 100644 --- a/glade.spec +++ b/glade.spec @@ -1,6 +1,6 @@ Name: glade -Version: 3.36.0 -Release: 5%{?dist} +Version: 3.37.0 +Release: 1%{?dist} Summary: User Interface Designer for GTK+ # - /usr/bin/glade is GPLv2+ @@ -9,16 +9,18 @@ Summary: User Interface Designer for GTK+ # GPLv2+ and LGPLv2+ code, so the resulting binaries are GPLv2+ License: GPLv2+ and LGPLv2+ URL: https://glade.gnome.org/ -Source0: https://download.gnome.org/sources/glade/3.36/glade-%{version}.tar.xz +Source0: https://download.gnome.org/sources/glade/3.37/glade-%{version}.tar.xz -BuildRequires: chrpath BuildRequires: desktop-file-utils BuildRequires: docbook-style-xsl +BuildRequires: gcc BuildRequires: gettext +BuildRequires: gjs-devel BuildRequires: gtk3-devel -BuildRequires: intltool +BuildRequires: gtk-doc BuildRequires: itstool BuildRequires: libxml2-devel +BuildRequires: meson BuildRequires: pygobject3-devel BuildRequires: python3-devel BuildRequires: webkit2gtk3-devel @@ -63,24 +65,17 @@ developing applications that use Glade widget library. %prep %setup -q +# Hack in Python 3.9 support +sed -i -e 's/python-3.8-embed/python-3.9-embed/g' meson.build + %build -export PYTHON=%{__python3} -%configure --disable-static - -# Omit unused direct shared library dependencies. -sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - -make %{?_smp_mflags} +%meson -Dgtk_doc=true +%meson_build %install -%make_install -find $RPM_BUILD_ROOT -type f -name "*.la" -delete - -# Remove rpaths. -chrpath --delete $RPM_BUILD_ROOT%{_bindir}/glade* -chrpath --delete $RPM_BUILD_ROOT%{_libdir}/glade/modules/*.so +%meson_install %find_lang glade --with-gnome @@ -109,6 +104,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Glade.de %{_libdir}/girepository-1.0/Gladeui-2.0.typelib %dir %{_libdir}/glade/ %dir %{_libdir}/glade/modules/ +%{_libdir}/glade/modules/libgladegjs.so %{_libdir}/glade/modules/libgladegtk.so %{_libdir}/glade/modules/libgladepython.so %{_libdir}/glade/modules/libgladewebkit2gtk.so @@ -119,12 +115,20 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Glade.de %{_includedir}/libgladeui-2.0/ %{_libdir}/libgladeui-2.so %{_libdir}/pkgconfig/gladeui-2.0.pc +%dir %{_datadir}/gettext +%dir %{_datadir}/gettext/its +%{_datadir}/gettext/its/glade-catalog.its +%{_datadir}/gettext/its/glade-catalog.loc %dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/Gladeui-2.0.gir %doc %{_datadir}/gtk-doc/ %changelog +* Mon Aug 17 2020 Kalev Lember - 3.37.0-1 +- Update to 3.37.0 +- Switch to the meson build system + * Sat Aug 01 2020 Fedora Release Engineering - 3.36.0-5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 4e3bc88..2aa49c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glade-3.36.0.tar.xz) = c984613ade26e3fe68a700a48cccadf5ac96eb716a6e90aad36f3de684faeb607d9aaf112d74a048cd33e222a02388ee6583ca915648486f0259cc805e16d243 +SHA512 (glade-3.37.0.tar.xz) = eafa7fef3132fd95f3a40d8200a11716e106052d029d3c3f05133138b50085a8f6548d93d2a37d2f60a575e6b629d500c02408979507fbd04334dd5181a46e85