From 966b3a76c48b3c30866a926d37e06c8d61b25df0 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: May 26 2020 14:54:04 +0000
Subject: Unretire and update to 3.36.0 (#1839877)


---

diff --git a/.gitignore b/.gitignore
index 27db8d4..670c6d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ alacarte-0.13.1.tar.bz2
 /alacarte-3.9.91.tar.xz
 /alacarte-3.10.0.tar.xz
 /alacarte-3.11.91.tar.xz
+/alacarte-3.36.0.tar.xz
diff --git a/alacarte.spec b/alacarte.spec
index 2dcd988..ba2d3fc 100644
--- a/alacarte.spec
+++ b/alacarte.spec
@@ -1,30 +1,26 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
 Name:           alacarte
-Version:        3.11.91
-Release:        14%{?dist}
+Version:        3.36.0
+Release:        1%{?dist}
 Summary:        Menu editor for the GNOME desktop
 
 License:        LGPLv2+
-URL:            http://www.gnome.org
-#VCS: git:git://git.gnome.org/alacarte
-Source0:        http://download.gnome.org/sources/alacarte/3.11/%{name}-%{version}.tar.xz
+URL:            https://gitlab.gnome.org/GNOME/alacarte
+Source0:        https://download.gnome.org/sources/alacarte/3.36/%{name}-%{version}.tar.xz
 
 BuildArch:      noarch
 
-BuildRequires:  python2, python2-devel, gettext
+BuildRequires:  python3, python3-devel, gettext
 BuildRequires:  pygobject3-devel
-BuildRequires:  pkgconfig
-BuildRequires:  gnome-menus-devel >= 2.27.92
+BuildRequires:  gnome-menus-devel >= 3.5.3
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libxslt
 BuildRequires:  docbook-style-xsl
-Requires:       gnome-menus >= 3.2.0.1
+Requires:       gnome-menus >= 3.5.3
 Requires:       gtk3
-Requires:       python2-gobject
+Requires:       python3-gobject
 
 
 %description
@@ -34,30 +30,31 @@ should work with any desktop environment that uses this specification.
 
 
 %prep
-%setup -q
-
+%autosetup
 autoreconf -i -f
 
+
 %build
 %configure
-make %{?_smp_mflags}
+%make_build
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
+%make_install
 
 # desktop-file-install can't manipulate NotShowIn
 sed -i -e 's/NotShowIn=KDE;/OnlyShowIn=GNOME;/' \
-  $RPM_BUILD_ROOT%{_datadir}/applications/alacarte.desktop
+  %{buildroot}%{_datadir}/applications/alacarte.desktop
 desktop-file-validate \
-  $RPM_BUILD_ROOT%{_datadir}/applications/alacarte.desktop
+  %{buildroot}%{_datadir}/applications/alacarte.desktop
 
 %find_lang %{name}
 
 
 %files -f %{name}.lang
-%doc README AUTHORS COPYING
-%{python2_sitelib}/Alacarte
+%license COPYING
+%doc README AUTHORS
+%{python3_sitelib}/Alacarte
 %{_bindir}/alacarte
 %{_datadir}/applications/alacarte.desktop
 %{_datadir}/alacarte
@@ -71,6 +68,9 @@ desktop-file-validate \
 
 
 %changelog
+* Mon May 25 2020 Yaakov Selkowitz <yselkowi@redhat.com> - 3.36.0-1
+- Unretire and update to 3.36.0 (#1839877)
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.91-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 79ea4f8..a050f34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-03209a293a904cd3c47336ba0f3e8fc2  alacarte-3.11.91.tar.xz
+SHA512 (alacarte-3.36.0.tar.xz) = 7406fef4c59f94f26d52ad6b52ddd8a5183e9ceb50834aecd5e83f60d996ab4efd09ecbc9d3568d65fe1dd9290e446b5c5c5f6ad89c7e81b0ef304d2a10476b9