diff --git a/.gitignore b/.gitignore index 8e3dd4b..3e2f7ef 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ /dnf-9e8fd6b.tar.xz /dnf-84ccd1a.tar.xz /dnf-a7e0aa1.tar.xz +/dnf-13dce34.tar.xz diff --git a/dnf.spec b/dnf.spec index 961e193..fd2b344 100644 --- a/dnf.spec +++ b/dnf.spec @@ -1,94 +1,100 @@ -%global gitrev a7e0aa1 -%global hawkey_version 0.5.2 +%global gitrev 13dce34 +%global hawkey_version 0.5.3 %global librepo_version 1.7.5 %global libcomps_version 0.1.6 %global rpm_version 4.12.0 %global confdir %{_sysconfdir}/dnf -Name: dnf -Version: 0.6.3 -Release: 3%{?dist} -Summary: Package manager forked from Yum, using libsolv as a dependency resolver -Group: System Environment/Base +%global pluginconfpath %{confdir}/plugins +%global py2pluginpath %{python_sitelib}/dnf-plugins +%global py3pluginpath %{python3_sitelib}/dnf-plugins + +Name: dnf +Version: 0.6.4 +Release: 1%{?dist} +Summary: Package manager forked from Yum, using libsolv as a dependency resolver # For a breakdown of the licensing, see PACKAGE-LICENSING -License: GPLv2+ and GPLv2 and GPL -URL: https://github.com/rpm-software-management/dnf -Source0: http://rpm-software-management.fedorapeople.org/dnf-%{gitrev}.tar.xz -BuildArch: noarch -BuildRequires: cmake -BuildRequires: pygpgme -BuildRequires: pyliblzma -BuildRequires: python2 -BuildRequires: python-bugzilla -BuildRequires: python-hawkey >= %{hawkey_version} -BuildRequires: python-iniparse -BuildRequires: python-libcomps >= %{libcomps_version} -BuildRequires: python-librepo >= %{librepo_version} +License: GPLv2+ and GPLv2 and GPL +URL: https://github.com/rpm-software-management/dnf +# The Source0 tarball can be generated using following commands: +# git clone http://github.com/rpm-software-management/dnf.git +# cd dnf/package +# ./archive +# tarball will be generated in $HOME/rpmbuild/sources/ +Source0: http://rpm-software-management.fedorapeople.org/dnf-%{gitrev}.tar.xz +BuildArch: noarch +BuildRequires: cmake +BuildRequires: pygpgme +BuildRequires: pyliblzma +BuildRequires: python2 +BuildRequires: python-bugzilla +BuildRequires: python-hawkey >= %{hawkey_version} +BuildRequires: python-iniparse +BuildRequires: python-libcomps >= %{libcomps_version} +BuildRequires: python-librepo >= %{librepo_version} BuildRequires: python-nose BuildRequires: python-sphinx BuildRequires: rpm-python >= %{rpm_version} BuildRequires: systemd BuildRequires: gettext -Requires: deltarpm -Requires: libreport-filesystem -Requires: pygpgme -Requires: pyliblzma -Requires: python-hawkey >= %{hawkey_version} -Requires: python-iniparse -Requires: python-libcomps >= %{libcomps_version} -Requires: python-librepo >= %{librepo_version} -Requires: rpm-plugin-systemd-inhibit -Requires: rpm-python >= %{rpm_version} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +Requires: deltarpm +Requires: libreport-filesystem +Requires: pygpgme +Requires: pyliblzma +Requires: python-hawkey >= %{hawkey_version} +Requires: python-iniparse +Requires: python-libcomps >= %{libcomps_version} +Requires: python-librepo >= %{librepo_version} +Requires: rpm-plugin-systemd-inhibit +Requires: rpm-python >= %{rpm_version} +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd %description Package manager forked from Yum, using libsolv as a dependency resolver. %package -n dnf-yum Conflicts: yum -Requires: dnf = %{version}-%{release} -Summary: As a Yum CLI compatibility layer, supplies /usr/bin/yum redirecting to DNF. +Requires: dnf = %{version}-%{release} +Summary: As a Yum CLI compatibility layer, supplies /usr/bin/yum redirecting to DNF. %description -n dnf-yum As a Yum CLI compatibility layer, supplies /usr/bin/yum redirecting to DNF. %package -n python3-dnf -Summary: Package manager forked from Yum, using libsolv as a dependency resolver -Group: System Environment/Base -BuildRequires: python3 -BuildRequires: python3-devel -BuildRequires: python3-hawkey >= %{hawkey_version} -BuildRequires: python3-iniparse -BuildRequires: python3-libcomps >= %{libcomps_version} -BuildRequires: python3-librepo >= %{librepo_version} -BuildRequires: python3-nose -BuildRequires: python3-pygpgme -BuildRequires: rpm-python3 >= %{rpm_version} -Requires: dnf = %{version}-%{release} -Requires: python3-hawkey >= %{hawkey_version} -Requires: python3-iniparse -Requires: python3-libcomps >= %{libcomps_version} -Requires: python3-librepo >= %{librepo_version} -Requires: python3-pygpgme -Requires: rpm-plugin-systemd-inhibit -Requires: rpm-python3 >= %{rpm_version} +Summary: Package manager forked from Yum, using libsolv as a dependency resolver +BuildRequires: python3 +BuildRequires: python3-devel +BuildRequires: python3-hawkey >= %{hawkey_version} +BuildRequires: python3-iniparse +BuildRequires: python3-libcomps >= %{libcomps_version} +BuildRequires: python3-librepo >= %{librepo_version} +BuildRequires: python3-nose +BuildRequires: python3-pygpgme +BuildRequires: rpm-python3 >= %{rpm_version} +Requires: dnf = %{version}-%{release} +Requires: python3-hawkey >= %{hawkey_version} +Requires: python3-iniparse +Requires: python3-libcomps >= %{libcomps_version} +Requires: python3-librepo >= %{librepo_version} +Requires: python3-pygpgme +Requires: rpm-plugin-systemd-inhibit +Requires: rpm-python3 >= %{rpm_version} %description -n python3-dnf Package manager forked from Yum, using libsolv as a dependency resolver. %package automatic -Summary: Alternative CLI to "dnf upgrade" suitable for automatic, regular execution. -Group: System Environment/Base -BuildRequires: python2 +Summary: Alternative CLI to "dnf upgrade" suitable for automatic, regular execution. +BuildRequires: python2 BuildRequires: python-nose BuildRequires: systemd -Requires: dnf = %{version}-%{release} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +Requires: dnf = %{version}-%{release} +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd %description automatic Alternative CLI to "dnf upgrade" suitable for automatic, regular execution. @@ -110,19 +116,15 @@ make %{?_smp_mflags} popd %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name} pushd py3 make install DESTDIR=$RPM_BUILD_ROOT popd -%global pluginconfpath %{confdir}/plugins -%global py2pluginpath %{python_sitelib}/dnf-plugins -%global py3pluginpath %{python3_sitelib}/dnf-plugins mkdir -p $RPM_BUILD_ROOT%{pluginconfpath} mkdir -p $RPM_BUILD_ROOT%{py2pluginpath} -mkdir -p $RPM_BUILD_ROOT%{py3pluginpath} +mkdir -p $RPM_BUILD_ROOT%{py3pluginpath}/__pycache__ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log touch $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}.log ln -sr $RPM_BUILD_ROOT%{_bindir}/dnf $RPM_BUILD_ROOT%{_bindir}/yum @@ -138,22 +140,23 @@ popd %{_bindir}/dnf %dir %{confdir} %dir %{pluginconfpath} -%config(noreplace) %{confdir}/dnf.conf %dir %{confdir}/protected.d +%config(noreplace) %{confdir}/dnf.conf %config(noreplace) %{confdir}/protected.d/dnf.conf %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %ghost %{_localstatedir}/log/%{name}.log -%ghost %{_localstatedir}/log/%{name}-rpm.log -%ghost %{_localstatedir}/log/%{name}-plugin.log +%ghost %{_localstatedir}/log/%{name}.rpm.log +%ghost %{_localstatedir}/log/%{name}.plugin.log %config %{_sysconfdir}/bash_completion.d/dnf-completion.bash %{_sysconfdir}/libreport/events.d/collect_dnf.conf %{_mandir}/man8/dnf.8.gz -%{_mandir}/man8/dnf.conf.8.gz +%{_mandir}/man5/dnf.conf.5.gz %{_unitdir}/dnf-makecache.service %{_unitdir}/dnf-makecache.timer +%{_tmpfilesdir}/dnf.conf %exclude %{python_sitelib}/dnf/automatic %{python_sitelib}/dnf/ -%{py2pluginpath} +%dir %{py2pluginpath} %files -n dnf-yum %doc AUTHORS README.rst COPYING PACKAGE-LICENSING @@ -164,7 +167,8 @@ popd %{_bindir}/dnf-3 %exclude %{python3_sitelib}/dnf/automatic %{python3_sitelib}/dnf/ -%{py3pluginpath} +%dir %{py3pluginpath} +%dir %{py3pluginpath}/__pycache__ %files automatic %doc AUTHORS COPYING PACKAGE-LICENSING @@ -194,8 +198,54 @@ popd %systemd_postun_with_restart dnf-automatic.timer %changelog -* Fri Dec 19 2014 Ralf Corsepius - 0.6.3-3 -- Own %%{configdir}/protected.d (RHBZ#1175098). + +* Wed Feb 4 2015 Jan Silhan - 0.6.4-1 +- Remove lock files during boot (RhBug:1154476) (Michal Luscon) +- doc: groups are ordered not categories (Jan Silhan) +- doc: added Package attributes to API (Jan Silhan) +- README: link to bug reporting guide (Jan Silhan) +- README: the official documentation is on readthedoc (Jan Silhan) +- i18n: unicode encoding does not throw error (RhBug:1155877) (Jan Silhan) +- conf: added minrate repo option (Related:RhBug:1175466) (Jan Silhan) +- conf: added timeout repo option (RhBug:1175466) (Jan Silhan) +- doc: api_queries: add 'file' filter description (RhBug:1186461) (Igor Gnatenko) +- doc: documenting enablegroups (Jan Silhan) +- log: printing metadata timestamp (RhBug:1170156) (Jan Silhan) +- base: setup default cachedir value (RhBug:1184943) (Michal Luscon) +- orders groups/environments by display_order tag (RhBug:1177002) (Jan Silhan) +- no need to call create_cmdline_repo (Jan Silhan) +- base: package-spec matches all packages which the name glob pattern fits (RhBug:1169165) (Michal Luscon) +- doc: move dnf.conf to appropriate man page section (RhBug:1167982) (Michal Luscon) +- tests: add test for blocking process lock (Michal Luscon) +- lock: fix several race conditions in process lock mechanism (Michal Luscon) +- base: use blocking process lock during download phase (RhBug:1157233) (Michal Luscon) +- Update the Source0 generation commands in dnf.spec.in file (Parag Nemade) +- Enhancement to dnf.spec.in file which follows current fedora packaging guidelines (Parag Nemade) +- doc: add some examples and documentation of the core use case (RhBug:1138096) (Radek Holy) +- bash-completion: enable downgrading packages for local files (RhBug:1181189) (Igor Gnatenko) +- group: prints plain package name when package not in any repo (RhBug:1181397) (Jan Silhan) +- spec: own __pycache__ for python 3 (Igor Gnatenko) +- changed hawkey.log dir to /var/log (RhBug:1175434) (Jan Silhan) +- bash-completion: handle sqlite errors (Igor Gnatenko) +- use LANG=C when invoking 'dnf help' and 'sed' with regular expressions (Jakub Dorňák) +- spec: own __pycache__ directory for py3 (Igor Gnatenko) +- doc: mentioning Install command accepts path to local rpm package (Jan Silhan) +- groups: in erase and install cmd non-existent group does not abort transaction (Jan Silhan) +- doc: running tests in README (Jan Silhan) +- api: transaction: added install_set and remove_set (RhBug:1162887) (Jan Silhan) +- cosmetic: fixed some typos in documentation (Jan Silhan) +- groups: environments described after @ sign works (RhBug:1156084) (Jan Silhan) +- own /etc/dnf/protected.d (RhBug:1175098) (Jan Silhan) +- i18n: computing width of char right (RhBug:1174136) (Jan Silhan) +- cosmetic: renamed _splitArg -> _split_arg (Jan Silhan) +- conf: removed include name conflict (RhBug:1055910) (Jan Silhan) +- output: removed unpredictible decision based on probability introduced in ab4d2c5 (Jan Silhan) +- output: history list is not limited to 20 records (RhBug:1155918) (Jan Silhan) +- doc: referenced forgotten bug fix to release notes (Jan Silhan) +- cosmetic: doc: removed duplicated word (Jan Silhan) +- doc: described unavailable package corner case with skip_if_unavailable option (RhBug:1119030) (Jan Silhan) +- log: replaced size with maxsize directive (RhBug:1177394) (Jan Silhan) +- spec: fixed %ghost log file names (Jan Silhan) * Mon Dec 8 2014 Jan Silhan - 0.6.3-2 - logging: reverted naming from a6dde81 @@ -786,3 +836,4 @@ popd - refactor: Move MockBase methods to BaseStubMixin. (Radek Holy) - refactor: Move repo-pkgs info to a standalone class instead of reusing the InfoCommand. (Radek Holy) - refactor: Move InfoCommand._print_packages to BaseCli.output_packages. (Radek Holy) + diff --git a/sources b/sources index 0e7e4b6..15b3180 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -82ff495e445ddc56e70dc91750a421ac dnf-a7e0aa1.tar.xz +8517fdc71d2d0a14165fc15d06f196b2 dnf-13dce34.tar.xz