diff --git a/.gitignore b/.gitignore index 57552e8..a4c59c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/zenity-3.8.0.tar.xz +SOURCES/zenity-3.22.0.tar.xz diff --git a/.zenity.metadata b/.zenity.metadata index b3fee1f..5f90d8c 100644 --- a/.zenity.metadata +++ b/.zenity.metadata @@ -1 +1 @@ -af083691820970ef1e79590df35ea5c59a7491f3 SOURCES/zenity-3.8.0.tar.xz +a1f53e73f53f7f7eccd4328a1c45309bb2d47be8 SOURCES/zenity-3.22.0.tar.xz diff --git a/SOURCES/list-expand.patch b/SOURCES/list-expand.patch deleted file mode 100644 index a70baaa..0000000 --- a/SOURCES/list-expand.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up zenity-3.8.0/src/zenity.ui.list-expand zenity-3.8.0/src/zenity.ui ---- zenity-3.8.0/src/zenity.ui.list-expand 2015-08-19 14:04:38.907058018 -0400 -+++ zenity-3.8.0/src/zenity.ui 2015-08-19 14:04:54.619268454 -0400 -@@ -1026,6 +1026,7 @@ - True - True - True -+ True - - - diff --git a/SPECS/zenity.spec b/SPECS/zenity.spec index 1e66e3b..14de113 100644 --- a/SPECS/zenity.spec +++ b/SPECS/zenity.spec @@ -1,17 +1,14 @@ Name: zenity -Version: 3.8.0 -Release: 5%{?dist} +Version: 3.22.0 +Release: 1%{?dist} Summary: Display dialog boxes from shell scripts -Group: Applications/System -License: LGPLv2+ -URL: http://directory.fsf.org/zenity.html -Source: http://download.gnome.org/sources/%{name}/3.8/%{name}-%{version}.tar.xz -# upstream fix -Patch0: list-expand.patch +License: LGPLv2+ +URL: https://wiki.gnome.org/Projects/Zenity +Source: https://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz -BuildRequires: gtk3-devel >= 3.0.0 -BuildRequires: libnotify-devel >= 0.4.1 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0 +BuildRequires: pkgconfig(libnotify) >= 0.6.1 BuildRequires: which BuildRequires: gettext BuildRequires: intltool @@ -24,15 +21,15 @@ from the same family as dialog, Xdialog, and cdialog. %prep %setup -q -%patch0 -p1 + %build %configure --disable-webkitgtk -make %{?_smp_mflags} +make V=1 %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install # we don't want a perl dependency just for this rm $RPM_BUILD_ROOT%{_bindir}/gdialog @@ -41,13 +38,18 @@ rm $RPM_BUILD_ROOT%{_bindir}/gdialog %files -f zenity.lang -%doc COPYING AUTHORS NEWS THANKS README +%license COPYING +%doc AUTHORS NEWS THANKS README %{_bindir}/zenity %{_datadir}/zenity -%{_mandir}/man1/zenity.1.gz +%{_mandir}/man1/zenity.1* %changelog +* Thu Sep 22 2016 Kalev Lember - 3.22.0-1 +- Update to 3.22.0 +- Resolves: #1387068 + * Wed Aug 19 2015 Matthias Clasen - 3.8.0-5 - Fix non-expanding lists Resolves: #1251137