diff --git a/sources b/sources index b5ad373..9966185 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (yad-0.40.0.tar.xz) = 103193b316b74cafe8ef3da982df66e3dae17a206bc1c6852eb321507bba93fc7b54c25e959d2dbbdddc267c72b639a8cd9f1f22c03c9bccce283b4c29b8af44 +SHA512 (yad-9.3.tar.xz) = e280123ac969beaaaf6d51eafdd3dc15b0214cc93e9e6389f9c775339d18bd0fb0d3f2cd168f886e5d87013f515721cc6f2b859d37aac59c0aa9255ff512be72 diff --git a/yad-7.3-size-request.patch b/yad-7.3-size-request.patch new file mode 100644 index 0000000..edd5142 --- /dev/null +++ b/yad-7.3-size-request.patch @@ -0,0 +1,17 @@ +diff -Nrup -U 4 yad-7.3/src/main.c yad-7.3-OK/src/main.c +--- yad-7.3/src/main.c 2020-11-01 01:11:21.039606281 +0300 ++++ yad-7.3-OK/src/main.c 2020-11-01 01:08:25.420968575 +0300 +@@ -536,8 +536,13 @@ create_dialog (void) + + /* parse geometry or move window, if given. must be after showing widget */ + if (!options.data.maximized && !options.data.fullscreen) + { ++ gint mw, nw; ++ ++ gtk_widget_get_preferred_width (dlg, &mw, &nw); ++ gtk_widget_set_size_request (dlg, nw, -1); ++ + parse_geometry (); + g_signal_connect (G_OBJECT (dlg), "realize", G_CALLBACK (realize_cb), NULL); + gtk_widget_show_all (dlg); + } diff --git a/yad.spec b/yad.spec index aaa439f..2e35249 100644 --- a/yad.spec +++ b/yad.spec @@ -1,49 +1,50 @@ Name: yad -Version: 0.40.0 -Release: 7%{?dist} +Version: 9.3 +Release: 1%{?dist} Summary: Display graphical dialogs from shell scripts or command line +Group: Applications/System License: GPLv3+ URL: http://sourceforge.net/projects/yad-dialog/ -Source0: http://downloads.sourceforge.net/%{name}-dialog/%{name}-%{version}.tar.xz +Source0: https://github.com/v1cont/yad/releases/download/v%{version}/yad-%{version}.tar.xz +Patch1: yad-7.3-size-request.patch -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -BuildRequires: gcc -BuildRequires: gtk3-devel >= 3.0.0 -%else -BuildRequires: gtk2-devel >= 2.20.1 -%endif +BuildRequires: make +BuildRequires: gtk3-devel >= 3.22.0 +BuildRequires: webkitgtk4-devel BuildRequires: desktop-file-utils BuildRequires: perl(XML::Parser) BuildRequires: intltool >= 0.40.0 BuildRequires: pkgconfig BuildRequires: gettext +BuildRequires: gtksourceview3-devel +BuildRequires: gspell-devel + +BuildRequires: gcc -%if 0%{?fedora} <= 26 || 0%{?rhel} >= 7 -BuildRequires: webkitgtk3-devel -%endif %description Yad (yet another dialog) is a fork of zenity with many improvements, such as custom buttons, additional dialogs, pop-up menu in notification icon and more. + %prep %setup -q +%patch1 -p1 + %build -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -%configure --enable-icon-browser --enable-html --with-gtk=gtk3 -%else -%configure --enable-icon-browser --enable-html --with-gtk=gtk2 -%endif +%configure make %{?_smp_mflags} + %install -rm -rf %{buildroot} make install DESTDIR=%{buildroot} +rm -f %{buildroot}%{_bindir}/pfd + %find_lang %{name} # Encoding key in group "Desktop Entry" is deprecated. @@ -54,30 +55,50 @@ desktop-file-install --remove-key Encoding \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}-icon-browser.desktop + +%post +update-desktop-database %{_datadir}/applications &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + + +%postun +update-desktop-database %{_datadir}/applications &>/dev/null || : +if [ $1 -eq 0 ] ; then + /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + + +%posttrans +/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + %files -f %{name}.lang -%doc README.md ChangeLog.old AUTHORS COPYING NEWS THANKS TODO -%{_bindir}/%{name} -%{_bindir}/%{name}-icon-browser -%{_datadir}/icons/hicolor/*/apps/%{name}.png -%{_datadir}/applications/%{name}-icon-browser.desktop +%doc README.md AUTHORS NEWS THANKS TODO +%license COPYING +%{_bindir}/* +%{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/applications/*.desktop +%{_datadir}/glib-2.0/schemas/* %{_datadir}/aclocal/%{name}.m4 -%{_mandir}/man1/%{name}.1.* +%{_mandir}/*/* + %changelog -* Fri Jan 31 2020 Fedora Release Engineering - 0.40.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Wed Apr 14 2021 Dmitry Butskoy - 9.3-1 +- Update to 9.3 -* Sat Jul 27 2019 Fedora Release Engineering - 0.40.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Sat Mar 6 2021 Dmitry Butskoy - 8.0-1 +- Update to 8.0 -* Sun Feb 03 2019 Fedora Release Engineering - 0.40.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild +* Thu Jan 28 2021 Fedora Release Engineering - 7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild -* Sat Jul 14 2018 Fedora Release Engineering - 0.40.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0.40.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +* Mon Oct 26 2020 Dmitry Butskoy - 7.3-1 +- Upgrade to 7.3 +- add some upstream patches * Sun Nov 19 2017 Oliver Haessler - 0.40.0-2 - added BuildRequires: webkitgtk43-devel for Fedora <=26 and EPEL (#1455282)