Compare commits

...

No commits in common. "c8" and "c9s" have entirely different histories.
c8 ... c9s

8 changed files with 97 additions and 76 deletions

5
.gitignore vendored
View File

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

View File

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

7
gating.yaml Normal file
View File

@ -0,0 +1,7 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
# - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}
- !PassingTestCaseRule {test_case_name: manual.sst_desktop.pyxdg.sanity}

View File

@ -0,0 +1,14 @@
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

View File

@ -1,115 +1,111 @@
%global with_python3 1
%if 0%{?rhel} > 7
# Disable python2 build by default
%bcond_with python2
%else
%bcond_without python2
%endif
Name: pyxdg Name: pyxdg
Version: 0.25 Version: 0.27
Release: 16%{?dist} Release: 3%{?dist}
Summary: Python library to access freedesktop.org standards Summary: Python library to access freedesktop.org standards
Group: Development/Libraries
License: LGPLv2 License: LGPLv2
URL: http://freedesktop.org/Software/pyxdg URL: http://freedesktop.org/Software/pyxdg
Source0: http://people.freedesktop.org/~takluyver/%{name}-%{version}.tar.gz Source0: %pypi_source
# https://bugs.freedesktop.org/show_bug.cgi?id=61817 # Upstream did not include the test/examples directory in the source tarball
Patch0: pyxdg-0.25-find-first-mimetype-match.patch # This tarball is a copy of the directory from https://cgit.freedesktop.org/xdg/pyxdg/
# https://bugs.freedesktop.org/show_bug.cgi?id=73878 Source1: pyxdg-test-example.tar.gz
Patch1: pyxdg-0.25-CVE-2014-1624.patch
BuildArch: noarch BuildArch: noarch
# These are needed for the nose tests. # These are needed for the nose tests.
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
BuildRequires: shared-mime-info BuildRequires: shared-mime-info
%description %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 %package -n python%{python3_pkgversion}-pyxdg
Summary: Python3 library to access freedesktop.org standards Summary: Python3 library to access freedesktop.org standards
%{?python_provide:%python_provide python3-pyxdg}
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-setuptools
%if %{with check}
# These are needed for the nose tests. # These are needed for the nose tests.
BuildRequires: python%{python3_pkgversion}-nose BuildRequires: python%{python3_pkgversion}-nose
%endif
%{?python_provide:%python_provide python%{python3_pkgversion}-pyxdg} %{?python_provide:%python_provide python%{python3_pkgversion}-pyxdg}
%description -n python%{python3_pkgversion}-pyxdg %description -n python%{python3_pkgversion}-pyxdg
PyXDG is a python library to access freedesktop.org standards. This PyXDG is a python library to access freedesktop.org standards. This
package contains a Python 3 version of PyXDG. package contains a Python 3 version of PyXDG.
%endif # with_python3
%prep %prep
%setup -q %setup -q -a 1
%patch0 -p1 -b .pngfix
%patch1 -p1 -b .CVE-2014-1624
%build %build
%if %{with python2}
%py2_build
%endif # with python2
%if 0%{?with_python3}
%py3_build %py3_build
%endif # with_python3
%install %install
%if 0%{?with_python3}
%py3_install %py3_install
%endif # with_python3
%if %{with python2}
%py2_install
%endif # with python2
%check %check
%if %{with python2}
# icon-test currently fails # icon-test currently fails
# https://bugs.freedesktop.org/show_bug.cgi?id=104846 # https://bugs.freedesktop.org/show_bug.cgi?id=104846
nosetests-%{python2_version} || :
%endif # with python2
%if 0%{?with_python3}
nosetests-%{python3_version} || : 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 %files -n python%{python3_pkgversion}-pyxdg
%license COPYING %license COPYING
%doc AUTHORS ChangeLog README TODO %doc AUTHORS ChangeLog README TODO
%{python3_sitelib}/xdg %{python3_sitelib}/xdg
%{python3_sitelib}/pyxdg-*.egg-info %{python3_sitelib}/pyxdg-*.egg-info
%endif #with_python3
%changelog %changelog
* Fri Jun 22 2018 Charalampos Stratakis <cstratak@redhat.com> - 0.25-16 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.27-3
- Conditionalize the python2 subpackage - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon May 24 2021 Tomas Popela <tpopela@redhat.com> - 0.27-2
- Backport a rawhide patch to fix the gating tests
* Fri May 14 2021 Kalev Lember <klember@redhat.com> - 0.27-1
- update to 0.27
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.26-13
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* 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 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.25-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

2
sources Normal file
View File

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