New release: 0.6.4-2

This commit is contained in:
Jan Silhan 2015-02-23 12:02:32 +01:00
parent 18047e8dcd
commit accb5298ae

165
dnf.spec
View File

@ -12,7 +12,7 @@
Name: dnf Name: dnf
Version: 0.6.4 Version: 0.6.4
Release: 1%{?snapshot}%{?dist} Release: 2%{?snapshot}%{?dist}
Summary: Package manager forked from Yum, using libsolv as a dependency resolver Summary: Package manager forked from Yum, using libsolv as a dependency resolver
# For a breakdown of the licensing, see PACKAGE-LICENSING # For a breakdown of the licensing, see PACKAGE-LICENSING
License: GPLv2+ and GPLv2 and GPL License: GPLv2+ and GPLv2 and GPL
@ -22,80 +22,92 @@ URL: https://github.com/rpm-software-management/dnf
# cd dnf/package # cd dnf/package
# ./archive # ./archive
# tarball will be generated in $HOME/rpmbuild/sources/ # tarball will be generated in $HOME/rpmbuild/sources/
Source0: http://rpm-software-management.fedorapeople.org/dnf-%{gitrev}.tar.xz Source0: http://rpm-software-management.fedorapeople.org/dnf-%{gitrev}.tar.xz
BuildArch: noarch BuildArch: noarch
BuildRequires: cmake 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 BuildRequires: gettext
Requires: deltarpm BuildRequires: python-bugzilla
Requires: libreport-filesystem BuildRequires: python-sphinx
Requires: pygpgme BuildRequires: systemd
Requires: pyliblzma %if 0%{?fedora} >= 22
Requires: python-hawkey >= %{hawkey_version} Requires: python3-dnf = %{version}-%{release}
Requires: python-iniparse %else
Requires: python-libcomps >= %{libcomps_version} Requires: python-dnf = %{version}-%{release}
Requires: python-librepo >= %{librepo_version} %endif
Requires: rpm-plugin-systemd-inhibit Requires(post): systemd
Requires: rpm-python >= %{rpm_version} Requires(preun): systemd
Requires(post): systemd Requires(postun): systemd
Requires(preun): systemd
Requires(postun): systemd
%description %description
Package manager forked from Yum, using libsolv as a dependency resolver. Package manager forked from Yum, using libsolv as a dependency resolver.
%package conf
Requires: libreport-filesystem
Summary: Configuration files for DNF.
%description conf
Configuration files for DNF.
%package -n dnf-yum %package -n dnf-yum
Conflicts: yum Conflicts: yum
Requires: dnf = %{version}-%{release} Requires: dnf = %{version}-%{release}
Summary: As a Yum CLI compatibility layer, supplies /usr/bin/yum redirecting to DNF. Summary: As a Yum CLI compatibility layer, supplies /usr/bin/yum redirecting to DNF.
%description -n dnf-yum %description -n dnf-yum
As a Yum CLI compatibility layer, supplies /usr/bin/yum redirecting to DNF. As a Yum CLI compatibility layer, supplies /usr/bin/yum redirecting to DNF.
%package -n python3-dnf %package -n python-dnf
Summary: Package manager forked from Yum, using libsolv as a dependency resolver Summary: Python 2 interface to DNF.
BuildRequires: python3 BuildRequires: pygpgme
BuildRequires: python3-devel BuildRequires: pyliblzma
BuildRequires: python3-hawkey >= %{hawkey_version} BuildRequires: python2
BuildRequires: python3-iniparse BuildRequires: python-hawkey >= %{hawkey_version}
BuildRequires: python3-libcomps >= %{libcomps_version} BuildRequires: python-iniparse
BuildRequires: python3-librepo >= %{librepo_version} BuildRequires: python-libcomps >= %{libcomps_version}
BuildRequires: python3-nose BuildRequires: python-librepo >= %{librepo_version}
BuildRequires: python3-pygpgme BuildRequires: python-nose
BuildRequires: rpm-python3 >= %{rpm_version} BuildRequires: rpm-python >= %{rpm_version}
Requires: dnf = %{version}-%{release} Requires: dnf-conf = %{version}-%{release}
Requires: python3-hawkey >= %{hawkey_version} Requires: deltarpm
Requires: python3-iniparse Requires: pygpgme
Requires: python3-libcomps >= %{libcomps_version} Requires: pyliblzma
Requires: python3-librepo >= %{librepo_version} Requires: python-hawkey >= %{hawkey_version}
Requires: python3-pygpgme Requires: python-iniparse
Requires: rpm-plugin-systemd-inhibit Requires: python-libcomps >= %{libcomps_version}
Requires: rpm-python3 >= %{rpm_version} Requires: python-librepo >= %{librepo_version}
Requires: rpm-plugin-systemd-inhibit
Requires: rpm-python >= %{rpm_version}
%description -n python-dnf
Python 2 interface to DNF.
%package -n python3-dnf
Summary: Python 3 interface to DNF.
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-conf = %{version}-%{release}
Requires: deltarpm
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}
Obsoletes: dnf <= 0.6.4-1
%description -n python3-dnf %description -n python3-dnf
Package manager forked from Yum, using libsolv as a dependency resolver. Python 3 interface to DNF.
%package automatic %package automatic
Summary: Alternative CLI to "dnf upgrade" suitable for automatic, regular execution. Summary: Alternative CLI to "dnf upgrade" suitable for automatic, regular execution.
BuildRequires: python2
BuildRequires: python-nose
BuildRequires: systemd BuildRequires: systemd
Requires: dnf = %{version}-%{release} Requires: dnf = %{version}-%{release}
Requires(post): systemd Requires(post): systemd
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd Requires(postun): systemd
%description automatic %description automatic
Alternative CLI to "dnf upgrade" suitable for automatic, regular execution. Alternative CLI to "dnf upgrade" suitable for automatic, regular execution.
@ -127,6 +139,11 @@ mkdir -p $RPM_BUILD_ROOT%{py2pluginpath}
mkdir -p $RPM_BUILD_ROOT%{py3pluginpath}/__pycache__ mkdir -p $RPM_BUILD_ROOT%{py3pluginpath}/__pycache__
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log
touch $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}.log touch $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}.log
%if 0%{?fedora} >= 22
ln -sr $RPM_BUILD_ROOT%{_bindir}/dnf-3 $RPM_BUILD_ROOT%{_bindir}/dnf
%else
ln -sr $RPM_BUILD_ROOT%{_bindir}/dnf-2 $RPM_BUILD_ROOT%{_bindir}/dnf
%endif
ln -sr $RPM_BUILD_ROOT%{_bindir}/dnf $RPM_BUILD_ROOT%{_bindir}/yum ln -sr $RPM_BUILD_ROOT%{_bindir}/dnf $RPM_BUILD_ROOT%{_bindir}/yum
%check %check
@ -138,30 +155,38 @@ popd
%files -f %{name}.lang %files -f %{name}.lang
%doc AUTHORS README.rst COPYING PACKAGE-LICENSING %doc AUTHORS README.rst COPYING PACKAGE-LICENSING
%{_bindir}/dnf %{_bindir}/dnf
%{_mandir}/man8/dnf.8.gz
%{_mandir}/man8/dnf.conf.8.gz
%config %{_sysconfdir}/bash_completion.d/dnf-completion.bash
%{_unitdir}/dnf-makecache.service
%{_unitdir}/dnf-makecache.timer
%files conf
%doc AUTHORS README.rst COPYING PACKAGE-LICENSING
%dir %{confdir} %dir %{confdir}
%dir %{pluginconfpath} %dir %{pluginconfpath}
%dir %{confdir}/protected.d %dir %{confdir}/protected.d
%config(noreplace) %{confdir}/dnf.conf %config(noreplace) %{confdir}/dnf.conf
%config(noreplace) %{confdir}/protected.d/dnf.conf %config(noreplace) %{confdir}/protected.d/dnf.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%ghost %{_localstatedir}/log/hawkey.log
%ghost %{_localstatedir}/log/%{name}.log %ghost %{_localstatedir}/log/%{name}.log
%ghost %{_localstatedir}/log/%{name}.rpm.log %ghost %{_localstatedir}/log/%{name}.rpm.log
%ghost %{_localstatedir}/log/%{name}.plugin.log %ghost %{_localstatedir}/log/%{name}.plugin.log
%config %{_sysconfdir}/bash_completion.d/dnf-completion.bash %config %{_sysconfdir}/bash_completion.d/dnf-completion.bash
%{_sysconfdir}/libreport/events.d/collect_dnf.conf %{_sysconfdir}/libreport/events.d/collect_dnf.conf
%{_mandir}/man8/dnf.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/
%dir %{py2pluginpath}
%files -n dnf-yum %files -n dnf-yum
%doc AUTHORS README.rst COPYING PACKAGE-LICENSING %doc AUTHORS README.rst COPYING PACKAGE-LICENSING
%{_bindir}/yum %{_bindir}/yum
%files -n python-dnf
%{_bindir}/dnf-2
%doc AUTHORS README.rst COPYING PACKAGE-LICENSING
%exclude %{python_sitelib}/dnf/automatic
%{python_sitelib}/dnf/
%dir %{py2pluginpath}
%files -n python3-dnf %files -n python3-dnf
%doc AUTHORS README.rst COPYING PACKAGE-LICENSING %doc AUTHORS README.rst COPYING PACKAGE-LICENSING
%{_bindir}/dnf-3 %{_bindir}/dnf-3
@ -199,6 +224,9 @@ popd
%changelog %changelog
* Wed Feb 23 2015 Jan Silhan <jsilhan@redhat.com> - 0.6.4-2
- dnf running on python3 by default for f22+
* Wed Feb 4 2015 Jan Silhan <jsilhan@redhat.com> - 0.6.4-1 * Wed Feb 4 2015 Jan Silhan <jsilhan@redhat.com> - 0.6.4-1
- Adapt to librepo-1.7.13, metalink and mirrorlist are not loaded anymore when the repo is local. (Radek Holy) - Adapt to librepo-1.7.13, metalink and mirrorlist are not loaded anymore when the repo is local. (Radek Holy)
- not raises value error when no metadata exist (Jan Silhan) - not raises value error when no metadata exist (Jan Silhan)
@ -838,3 +866,4 @@ popd
- refactor: Move MockBase methods to BaseStubMixin. (Radek Holy) - 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 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) - refactor: Move InfoCommand._print_packages to BaseCli.output_packages. (Radek Holy)