.gitignore

@@ -1,4 +1 @@
-/pyxdg-0.25.tar.gz
+SOURCES/pyxdg-0.25.tar.gz
-/pyxdg-0.26.tar.gz
-/pyxdg-0.27.tar.gz
-/pyxdg-test-example.tar.gz

.pyxdg.metadata

@@ -0,0 +1 @@
+1272ee62b8c3909ac4844a34a95f8b1fb3398af2 SOURCES/pyxdg-0.25.tar.gz

SPECS/pyxdg.spec

@@ -1,138 +1,115 @@
+%global with_python3 1
+
+%if 0%{?rhel} > 7
+# Disable python2 build by default
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
+
 Name:           pyxdg
-Version:        0.27
+Version:        0.25
-Release:        13%{?dist}
+Release:        16%{?dist}
 Summary:        Python library to access freedesktop.org standards
-License:        LGPL-2.0-only
+Group:          Development/Libraries
+License:        LGPLv2
 URL:            http://freedesktop.org/Software/pyxdg
-Source0:        %pypi_source
+Source0:        http://people.freedesktop.org/~takluyver/%{name}-%{version}.tar.gz
-# Upstream did not include the test/examples directory in the source tarball
+# https://bugs.freedesktop.org/show_bug.cgi?id=61817
-# This tarball is a copy of the directory from https://cgit.freedesktop.org/xdg/pyxdg/
+Patch0:		pyxdg-0.25-find-first-mimetype-match.patch
-Source1:        pyxdg-test-example.tar.gz
+# https://bugs.freedesktop.org/show_bug.cgi?id=73878
+Patch1:		pyxdg-0.25-CVE-2014-1624.patch
 BuildArch:      noarch
 # These are needed for the nose tests.
 BuildRequires:	hicolor-icon-theme
 BuildRequires:	shared-mime-info
 
 %description
-PyXDG is a python library to access freedesktop.org standards.
+PyXDG is a python library to access freedesktop.org standards 
 
+%if %{with python2}
+%package -n python2-pyxdg
+Summary:	Python2 library to access freedesktop.org standards
+%{?python_provide:%python_provide python2-pyxdg}
+BuildRequires:  python2-devel
+# These are needed for the nose tests.
+BuildRequires:	python2-nose
+%{?python_provide:%python_provide python2-pyxdg}
+Provides:       pyxdg = %{version}-%{release}
+Obsoletes:      pyxdg < 0.25-10
+
+%description -n python2-pyxdg
+PyXDG is a python library to access freedesktop.org standards. This
+package contains a Python 2 version of PyXDG.
+%endif # with python2
+
+%if 0%{?with_python3}
 %package -n python%{python3_pkgversion}-pyxdg
 Summary:	Python3 library to access freedesktop.org standards
+%{?python_provide:%python_provide python3-pyxdg}
 BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-setuptools
-%if %{with check}
 # These are needed for the nose tests.
 BuildRequires:	python%{python3_pkgversion}-nose
-%endif
 %{?python_provide:%python_provide python%{python3_pkgversion}-pyxdg}
 
 %description -n python%{python3_pkgversion}-pyxdg
 PyXDG is a python library to access freedesktop.org standards. This
 package contains a Python 3 version of PyXDG.
+%endif # with_python3
 
 %prep
-%setup -q -a 1
+%setup -q
+%patch0 -p1 -b .pngfix
+%patch1 -p1 -b .CVE-2014-1624
 
 %build
+%if %{with python2}
+%py2_build
+%endif # with python2
+
+%if 0%{?with_python3}
 %py3_build
+%endif # with_python3
 
 %install
+%if 0%{?with_python3}
 %py3_install
+%endif # with_python3
+
+%if %{with python2}
+%py2_install
+%endif # with python2
 
 %check
+%if %{with python2}
 # icon-test currently fails
 # https://bugs.freedesktop.org/show_bug.cgi?id=104846
-nosetests-%{python3_version} || :
+nosetests-%{python2_version} || :
+%endif # with python2
 
+%if 0%{?with_python3}
+nosetests-%{python3_version} || :
+%endif # with_python3
+
+%if %{with python2}
+%files -n python2-pyxdg
+%license COPYING
+%doc AUTHORS ChangeLog README TODO
+%{python2_sitelib}/xdg
+%{python2_sitelib}/pyxdg-*.egg-info
+%endif # with python2
+
+%if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-pyxdg
 %license COPYING
 %doc AUTHORS ChangeLog README TODO
 %{python3_sitelib}/xdg
 %{python3_sitelib}/pyxdg-*.egg-info
+%endif #with_python3
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.27-13
+* Fri Jun 22 2018 Charalampos Stratakis <cstratak@redhat.com> - 0.25-16
-- Bump release for October 2024 mass rebuild:
+- Conditionalize the python2 subpackage
-  Resolves: RHEL-64018
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.27-12
-- Bump release for June 2024 mass rebuild
-
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.27-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.27-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.27-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 0.27-8
-- Rebuilt for Python 3.12
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.27-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.27-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.27-5
-- Rebuilt for Python 3.11
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.27-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.27-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.27-2
-- Rebuilt for Python 3.10
-
-* Tue Apr 13 2021 Tom Callaway <spot@fedoraproject.org> - 0.27-1
-- update to 0.27
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 0.26-10
-- Rebuilt for Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Nov 07 2019 Miro Hrončok <mhroncok@redhat.com> - 0.26-8
-- Subpackage python2-pyxdg has been removed
-  See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.26-7
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Sat Aug 17 2019 Miro Hrončok <mhroncok@redhat.com> - 0.26-6
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.26-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Nov 30 2018 Tom Callaway <spot@fedoraproject.org> - 0.26-3
-- fix incorrect use of Type attribute (bz 1654857)
-
-* Thu Nov  1 2018 Tom Callaway <spot@fedoraproject.org> - 0.26-2
-- fix OnlyShowIn (bz 1624651)
-
-* Mon Jul 23 2018 Tom Callaway <spot@fedoraproject.org> - 0.26-1
-- update to 0.26
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.25-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 0.25-16
-- Rebuilt for Python 3.7
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.25-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

pyxdg-0.26-getType-fix.patch

@@ -1,14 +0,0 @@
-diff -up pyxdg-0.26/xdg/Menu.py.getTypefix pyxdg-0.26/xdg/Menu.py
---- pyxdg-0.26/xdg/Menu.py.getTypefix	2018-11-01 11:37:50.561645188 -0400
-+++ pyxdg-0.26/xdg/Menu.py	2018-11-30 11:33:10.728729275 -0500
-@@ -994,8 +994,8 @@ class XMLMenuBuilder(object):
-                     menuentry = MenuEntry(directory, dir)
-                     if not menu.Directory:
-                         menu.Directory = menuentry
--                    elif menuentry.Type == MenuEntry.TYPE_SYSTEM:
--                        if menu.Directory.Type == MenuEntry.TYPE_USER:
-+                    elif menuentry.getType() == MenuEntry.TYPE_SYSTEM:
-+                        if menu.Directory.getType() == MenuEntry.TYPE_USER:
-                             menu.Directory.Original = menuentry
-             if menu.Directory:
-                 break

sources

@@ -1,2 +0,0 @@
-SHA512 (pyxdg-0.27.tar.gz) = acb24153a4e3e0d8333f1c965c024b15d44f623497b561fc0e9be60d4411441af1dc61f11dcfb22587a510451237a341440bf7ff77a6ab6446dceb83b3c380e2
-SHA512 (pyxdg-test-example.tar.gz) = be077b663b5b94c93655d8622db06d3582a81fc4180038e52b45144f9a6c173d4ff5bf450f9ef56b76652f845e0283c527122fdaa84e35f834523ae205c5ab59