diff --git a/.gitignore b/.gitignore index b56d99c..7031f29 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,7 @@ /yad-0.36.2.tar.xz /yad-0.36.3.tar.xz /yad-0.37.0.tar.xz +/yad-0.38.1.tar.xz +/yad-0.38.2.tar.xz +/yad-0.39.0.tar.xz +/yad-0.40.0.tar.xz diff --git a/sources b/sources index 45de939..9966185 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a66cf4704c110d71bfcd6fcc227d5bd yad-0.37.0.tar.xz +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 3208552..e25128f 100644 --- a/yad.spec +++ b/yad.spec @@ -1,46 +1,51 @@ Name: yad -Version: 0.37.0 -Release: 1%{?dist} +Version: 9.3 +Release: 15%{?dist} Summary: Display graphical dialogs from shell scripts or command line Group: Applications/System -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later 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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: yad-7.3-size-request.patch -%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -BuildRequires: gtk3-devel >= 3.0.0 -%else -BuildRequires: gtk2-devel >= 2.20.1 -%endif +BuildRequires: make +BuildRequires: gtk3-devel >= 3.22.0 +BuildRequires: webkit2gtk4.1-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 + %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 +%patch -P1 -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. @@ -51,30 +56,124 @@ desktop-file-install --remove-key Encoding \ --dir=%{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}-icon-browser.desktop -%clean -rm -rf %{buildroot} %post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +update-desktop-database %{_datadir}/applications &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + %postun -if [ $1 -eq 0 ]; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +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 -%defattr(-,root,root,-) -%doc README ChangeLog 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 Jul 17 2026 Fedora Release Engineering - 9.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 9.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Jul 25 2025 Fedora Release Engineering - 9.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 9.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Mon Aug 26 2024 David King - 9.3-11 +- Rebuild against gspell + +* Thu Jul 25 2024 Miroslav Suchý - 9.3-10 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 9.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 9.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Aug 20 2023 Dmitry Butskoy - 9.3-7 +- build with webkit2gtk4.1 (#2232981) + +* Sat Jul 22 2023 Fedora Release Engineering - 9.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 9.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 9.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 9.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Apr 14 2021 Dmitry Butskoy - 9.3-1 +- Update to 9.3 + +* Sat Mar 6 2021 Dmitry Butskoy - 8.0-1 +- Update to 8.0 + +* Thu Jan 28 2021 Fedora Release Engineering - 7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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) + +* Sun Nov 19 2017 Oliver Haessler - 0.40.0-1 +- Update to 0.40.0 + +* Thu Aug 03 2017 Fedora Release Engineering - 0.39.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.39.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Apr 27 2017 Oliver Haessler - 0.39.0-1 +- Update to 0.39.0 + +* Sat Apr 08 2017 Oliver Haessler - 0.38.2-3 +- increment number, as bodhi has issues with the previous version, +so fixing it by updating the minor version + +* Sat Feb 11 2017 Fedora Release Engineering - 0.38.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Jan 23 2017 Oliver Haessler - 0.38.2-1 +- Update to 0.38.2 + +* Mon Jan 09 2017 Oliver Haessler - 0.38.1-1 +- Update to 0.38.1 + +* Sun Dec 11 2016 Oliver Haessler - 0.38.0-1 +- Update to 0.38.0 + * Tue Aug 23 2016 Oliver Haessler - 0.37.0-1 - Update to 0.37.0