diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 46a01ac..f92a67b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,23 @@ /udiskie-1.7.4.tar.gz /udiskie-1.7.5.tar.gz /udiskie-1.7.7.tar.gz +/udiskie-2.0.2.tar.gz +/udiskie-2.0.3.tar.gz +/udiskie-2.0.4.tar.gz +/udiskie-2.1.0.tar.gz +/udiskie-2.1.1.tar.gz +/udiskie-2.2.0.tar.gz +/udiskie-2.3.0.tar.gz +/udiskie-2.3.2.tar.gz +/udiskie-2.3.3.tar.gz +/udiskie-2.4.0.tar.gz +/udiskie-2.4.1.tar.gz +/udiskie-2.4.2.tar.gz +/udiskie-2.5.0.tar.gz +/udiskie-2.5.1.tar.gz +/udiskie-2.5.2.tar.gz +/udiskie-2.5.3.tar.gz +/udiskie-2.5.8.tar.gz +/udiskie-2.6.1.tar.gz +/udiskie-2.6.2.tar.gz +/udiskie-2.7.0.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..91c60f1 --- /dev/null +++ b/changelog @@ -0,0 +1,140 @@ +* Fri Jul 23 2021 Fedora Release Engineering - 2.3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 2.3.3-2 +- Rebuilt for Python 3.10 + +* Wed Mar 17 2021 Jan Staněk - 2.3.3-1 +- Upgrade to version 2.3.3 + +* Thu Jan 28 2021 Jan Staněk - 2.3.2-1 +- Upgrade to version 2.3.2 + +* Wed Jan 27 2021 Fedora Release Engineering - 2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 22 2021 Jan Staněk - 2.3.0-1 +- Upgrade to version 2.3.0 + +* Wed Jul 29 2020 Fedora Release Engineering - 2.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 2.2.0-2 +- Rebuilt for Python 3.9 + +* Mon May 11 2020 Jan Staněk - 2.2.0-1 +- Upgrade to version 2.2.0 + +* Fri Apr 17 2020 Jan Staněk - 2.1.1-1 +- Upgrade to version 2.1.1 + +* Tue Feb 04 2020 Jan Staněk - 2.1.0-1 +- Upgrade to version 2.1.0 + +* Fri Jan 31 2020 Fedora Release Engineering - 2.0.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 22 2020 Jan Staněk - 2.0.4-2 +- Rebuilt with gating enabled. + +* Tue Jan 21 2020 Jan Staněk - 2.0.4-1 +- Upgrade to version 2.0.4 + +* Mon Jan 20 2020 Jan Staněk - 2.0.3-1 +- Upgrade to version 2.0.3 + +* Thu Jan 02 2020 Jan Staněk - 2.0.2-1 +- Upgrade to version 2.0.2 +- Modernize and clean spec file + +* Thu Oct 03 2019 Miro Hrončok - 1.7.7-4 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 1.7.7-3 +- Rebuilt for Python 3.8 + +* Sat Jul 27 2019 Fedora Release Engineering - 1.7.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Feb 18 2019 Jan Staněk - 1.7.7-1 +- Upgrade to version 1.7.7 + +* Sun Feb 03 2019 Fedora Release Engineering - 1.7.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 1.7.5-4 +- Drop explicit locale setting + See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot + +* Sat Jul 14 2018 Fedora Release Engineering - 1.7.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 1.7.5-2 +- Rebuilt for Python 3.7 + +* Thu May 24 2018 Jan Staněk - 1.7.5-1 +- Upgrade to 1.7.5 + +* Mon May 21 2018 Jan Staněk - 1.7.4-1 +- Upgrade to 1.7.4 + +* Fri Feb 09 2018 Fedora Release Engineering - 1.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 03 2018 Jan Staněk - 1.7.3-1 +- Upgrade to 1.7.3 +- Drop deprecated python2 subpackage + +* Wed Oct 11 2017 Jan Staněk - 1.7.1-2 +- Renamed Python 2 dependencies to python2-* +- Generated man page for new udiskie-info binary + +* Wed Oct 04 2017 Jan Staněk - 1.7.1-1 +- Upgrade to 1.7.1 + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.4.8-6 +- Python 2 binary package renamed to python2-udiskie + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Jul 27 2017 Fedora Release Engineering - 1.4.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.4.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 1.4.8-3 +- Rebuild for Python 3.6 + +* Tue Jul 19 2016 Fedora Release Engineering - 1.4.8-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Feb 10 2016 Jan Stanek - 1.4.8-1 +- Update to 1.4.8 + +* Wed Feb 03 2016 Jan Stanek - 1.4.7-1 +- Update to 1.4.7 + +* Wed Feb 03 2016 Jan Stanek - 1.4.1-2 +- Fix build failures on EPEL7 + +* Mon Dec 21 2015 Jan Stanek - 1.4.1-1 +- Update to 1.4.1 + +* Tue Nov 10 2015 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Fri Nov 06 2015 Jan Stanek - 1.3.2-1 +- Update to 1.3.2 + +* Thu Sep 24 2015 Jan Stanek - 1.3.1-1 +- Update to 1.3.1 +- Add libnotify as weak dependency + +* Thu Sep 03 2015 Jan Stanek - 1.3.0-1 +- Update to 1.3.0 + +* Tue Sep 01 2015 Jan Stanek - 1.2.1-1 +- Update to 1.2.1. + +* Thu Jun 04 2015 Jan Stanek - 1.2.0-1 +- Initial package diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..bb1d8ee --- /dev/null +++ b/gating.yaml @@ -0,0 +1,14 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_testing] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} +--- !Policy +product_versions: + - fedora-* +decision_contexts: [bodhi_update_push_stable] +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/sources b/sources index 656a337..6899682 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (udiskie-1.7.7.tar.gz) = ea192cc8a50c742e96d5163bb1378a7cd110599cfe731d676343766a1ce3ee1102ab43322c5f9666d6c6a232e310fd494e0f76ad33aeab1fd8225a3267f3193a +SHA512 (udiskie-2.7.0.tar.gz) = a92dd9a5f7adc7f01a1d79a12dc8e6653486fa444f78c17821b1e1f766bc551e3f9603b833af4e53545a69977dc15cc63d9e73de0dddb3593a0b406d5b780e51 diff --git a/test-plan.fmf b/test-plan.fmf new file mode 100644 index 0000000..b416d0a --- /dev/null +++ b/test-plan.fmf @@ -0,0 +1,13 @@ +--- +discover: + how: fmf +provision: + how: container + image: fedora:rawhide +prepare: + - name: install tested package + how: install + package: udiskie +execute: + how: tmt +... diff --git a/test/smoke/installed.fmf b/test/smoke/installed.fmf new file mode 100644 index 0000000..a2b016a --- /dev/null +++ b/test/smoke/installed.fmf @@ -0,0 +1,8 @@ +--- +summary: Assert that the package is installed and can be run from command line +contact: Jan Staněk +component: + - udiskie +test: udiskie --version +... +# vim:set filetype=yaml: diff --git a/udiskie.spec b/udiskie.spec index ff0c8b5..162e010 100644 --- a/udiskie.spec +++ b/udiskie.spec @@ -1,28 +1,25 @@ Name: udiskie -Version: 1.7.7 -Release: 1%{?dist} +Version: 2.7.0 +Release: %{autorelease} Summary: Removable disk auto-mounter +# SPDX License: MIT -URL: https://pypi.org/project/%{name} -Source0: %{pypi_source} +URL: https://github.com/coldfix/udiskie + +Source0: %{pypi_source udiskie} Source1: 50-udiskie.rules BuildArch: noarch -BuildRequires: asciidoc gettext -BuildRequires: python3-devel python3-setuptools +BuildRequires: python3-devel +BuildRequires: make asciidoc gettext -# Require the module for the correct python -Requires: python3-%{name} = %{version}-%{release} +Requires: python3-%{name} = %{version}-%{release} -# Require package implementing required functionality -Requires: polkit hicolor-icon-theme +Requires: hicolor-icon-theme +Requires: polkit -# Recommend tag not supported on EPEL -%if 0%{?!rhel} -# Recommended for full functionality -Recommends: libnotify -%endif # %%{?rhel} +Recommends: libnotify %description %{name} is a front-end for UDisks written in python. Its main purpose is @@ -31,154 +28,57 @@ optional mount notifications, a GTK tray icon and user level CLIs for manual mounting and unmounting operations. %package -n python3-%{name} -Summary: Python 3 module for udisks disk automounting -%global py3_requires udisks2 gtk3 python3-gobject python3-docopt python3-PyYAML -BuildRequires: %{py3_requires} -Requires: %{py3_requires} -%{?python_provide:%python_provide python3-%{name}} +Summary: %{summary} %description -n python3-%{name} %{name} is a front-end for UDisks written in python. This package provides the python 3 modules used by the %{name} binaries. %prep -%setup -q -find -name '*.txt' | xargs chmod -x -# Copy common doc files to the top dir -cp -prt.. doc CONTRIBUTORS COPYING README.rst +%autosetup -p1 -# Make test folder into a proper module, if it already isn't -[ -f test/__init__.py ] || touch test/__init__.py - -find . -name '*.py' | xargs sed -i 's|^#!python|#!%{__python3}|' +%generate_buildrequires +%pyproject_buildrequires %build -%py3_build - -# Build man page +%pyproject_wheel %make_build -C doc %install -%py3_install -find %{buildroot}%{python3_sitelib} -name '*.exe' -delete - -# Install polkit rules -install -p -D -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/polkit-1/rules.d/50-%{name}.rules - -# Install man page -install -d %{buildroot}%{_mandir}/man8 -install -p -m644 -t %{buildroot}%{_mandir}/man8 doc/%{name}.8 - -# Create man pages for other binaries +%pyproject_install +# Polkit rules +install -p -m644 -Dt ${RPM_BUILD_ROOT}%{_sysconfdir}/polkit-1/rules.d %{SOURCE1} +# Install man page and "links" for all binaries +install -p -m644 -Dt ${RPM_BUILD_ROOT}%{_mandir}/man8 doc/%{name}.8 for other in %{name}-mount %{name}-umount %{name}-info; do - echo ".so man8/%{name}.8" > %{buildroot}%{_mandir}/man8/"${other}.8" + printf '.so man8/%%s.8\n' %{name} > ${RPM_BUILD_ROOT}%{_mandir}/man8/"${other}.8" done -# Find all localization files +# Record installed files +%pyproject_save_files -l %{name} %find_lang %{name} %check -# Only run tests with satisfied dependencies -%{__python3} setup.py test --test-suite test.test_match +%{python3} -m unittest discover --verbose --start-directory test/ %files -f %{name}.lang -%{_mandir}/man8/%{name}*.8* -%doc CONTRIBUTORS README.rst +%doc README.rst %license COPYING -%config(noreplace) %{_sysconfdir}/polkit-1/rules.d/50-%{name}.rules %{_bindir}/%{name} +%{_bindir}/%{name}-info %{_bindir}/%{name}-mount %{_bindir}/%{name}-umount -%{_bindir}/%{name}-info -%{_datadir}/icons/hicolor/scalable/actions/%{name}* +%config(noreplace) %{_sysconfdir}/polkit-1/rules.d/50-%{name}.rules +%{_mandir}/man8/%{name}*.8* +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/_%{name}* +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/%{name}* -%files -n python3-%{name} -%doc CONTRIBUTORS README.rst -%license COPYING -%{python3_sitelib}/* - +%files -n python3-%{name} -f %{pyproject_files} +%doc README.rst %changelog -* Mon Feb 18 2019 Jan Staněk - 1.7.7-1 -- Upgrade to version 1.7.7 - -* Sun Feb 03 2019 Fedora Release Engineering - 1.7.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek - 1.7.5-4 -- Drop explicit locale setting - See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot - -* Sat Jul 14 2018 Fedora Release Engineering - 1.7.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 1.7.5-2 -- Rebuilt for Python 3.7 - -* Thu May 24 2018 Jan Staněk - 1.7.5-1 -- Upgrade to 1.7.5 - -* Mon May 21 2018 Jan Staněk - 1.7.4-1 -- Upgrade to 1.7.4 - -* Fri Feb 09 2018 Fedora Release Engineering - 1.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 03 2018 Jan Staněk - 1.7.3-1 -- Upgrade to 1.7.3 -- Drop deprecated python2 subpackage - -* Wed Oct 11 2017 Jan Staněk - 1.7.1-2 -- Renamed Python 2 dependencies to python2-* -- Generated man page for new udiskie-info binary - -* Wed Oct 04 2017 Jan Staněk - 1.7.1-1 -- Upgrade to 1.7.1 - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 1.4.8-6 -- Python 2 binary package renamed to python2-udiskie - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Thu Jul 27 2017 Fedora Release Engineering - 1.4.8-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.4.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 1.4.8-3 -- Rebuild for Python 3.6 - -* Tue Jul 19 2016 Fedora Release Engineering - 1.4.8-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Wed Feb 10 2016 Jan Stanek - 1.4.8-1 -- Update to 1.4.8 - -* Wed Feb 03 2016 Jan Stanek - 1.4.7-1 -- Update to 1.4.7 - -* Wed Feb 03 2016 Jan Stanek - 1.4.1-2 -- Fix build failures on EPEL7 - -* Mon Dec 21 2015 Jan Stanek - 1.4.1-1 -- Update to 1.4.1 - -* Tue Nov 10 2015 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Fri Nov 06 2015 Jan Stanek - 1.3.2-1 -- Update to 1.3.2 - -* Thu Sep 24 2015 Jan Stanek - 1.3.1-1 -- Update to 1.3.1 -- Add libnotify as weak dependency - -* Thu Sep 03 2015 Jan Stanek - 1.3.0-1 -- Update to 1.3.0 - -* Tue Sep 01 2015 Jan Stanek - 1.2.1-1 -- Update to 1.2.1. - -* Thu Jun 04 2015 Jan Stanek - 1.2.0-1 -- Initial package +%autochangelog