rpms/dnf
7
0
Fork 0
Code Issues Pull Requests Releases Activity

rebase to dnf-2-modularity-4 release

Browse Source
This commit is contained in:
Martin Hatina 2018-04-17 16:11:00 +02:00
parent 4402960e50
commit 0111d57b73
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -108,3 +108,4 @@
/dnf-2.7.5-modularity-2.tar /dnf-2.7.5-modularity-2.tar
/dnf-2.7.5-modularity-2.tar.gz /dnf-2.7.5-modularity-2.tar.gz
/dnf-2.7.5-modularity-3.tar.gz /dnf-2.7.5-modularity-3.tar.gz
/dnf-2.7.5-modularity-4.tar.gz

20
dnf.spec
View File

@ -28,12 +28,12 @@
Name: dnf Name: dnf
Version: 2.7.5 Version: 2.7.5
Release: 10%{?dist} Release: 11%{?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
URL: https://github.com/rpm-software-management/dnf URL: https://github.com/rpm-software-management/dnf
Source0: %{url}/archive/%{version}/%{name}-%{version}-modularity-3.tar.gz Source0: %{url}/archive/%{version}/%{name}-%{version}-modularity-4.tar.gz
Patch0: 0001-Allow-to-set-cacheonly-from-commands-and-conf-RhBug-.patch Patch0: 0001-Allow-to-set-cacheonly-from-commands-and-conf-RhBug-.patch
Patch1: 0002-Remove-redundant-conf-option-cacheonly.patch Patch1: 0002-Remove-redundant-conf-option-cacheonly.patch
Patch2: 0003-Remove-unnecessary-code-for-set-cacheonly.patch Patch2: 0003-Remove-unnecessary-code-for-set-cacheonly.patch
@ -147,8 +147,8 @@ BuildRequires: python2-rpm >= %{rpm_version}
Requires: python2-rpm >= %{rpm_version} Requires: python2-rpm >= %{rpm_version}
Recommends: rpm-plugin-systemd-inhibit Recommends: rpm-plugin-systemd-inhibit
%endif %endif
BuildRequires: libmodulemd BuildRequires: libmodulemd >= 1.3.0
Requires: libmodulemd Requires: libmodulemd >= 1.3.0
BuildRequires: python2-gobject-base BuildRequires: python2-gobject-base
Requires: python2-gobject-base Requires: python2-gobject-base
BuildRequires: python2-smartcols >= 0.3.0 BuildRequires: python2-smartcols >= 0.3.0
@ -187,8 +187,8 @@ Requires: rpm-plugin-systemd-inhibit
%else %else
Recommends: rpm-plugin-systemd-inhibit Recommends: rpm-plugin-systemd-inhibit
%endif %endif
BuildRequires: libmodulemd BuildRequires: libmodulemd >= 1.3.0
Requires: libmodulemd Requires: libmodulemd >= 1.3.0
BuildRequires: python3-gobject-base BuildRequires: python3-gobject-base
Requires: python3-gobject-base Requires: python3-gobject-base
BuildRequires: python3-smartcols >= 0.3.0 BuildRequires: python3-smartcols >= 0.3.0
@ -212,7 +212,7 @@ Requires: %{name} = %{version}-%{release}
Alternative CLI to "dnf upgrade" suitable for automatic, regular execution. Alternative CLI to "dnf upgrade" suitable for automatic, regular execution.
%prep %prep
%autosetup -p1 -n %{name}-%{version}-modularity-3 %autosetup -p1 -n %{name}-%{version}-modularity-4
mkdir build mkdir build
%if %{with python3} %if %{with python3}
mkdir build-py3 mkdir build-py3
@ -245,6 +245,7 @@ popd
mkdir -p %{buildroot}%{pluginconfpath}/ mkdir -p %{buildroot}%{pluginconfpath}/
mkdir -p %{buildroot}%{py2pluginpath}/ mkdir -p %{buildroot}%{py2pluginpath}/
mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules.d mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules.d
mkdir -p %{buildroot}%{_sysconfdir}/%{name}/modules.defaults.d
%if %{with python3} %if %{with python3}
mkdir -p %{buildroot}%{py3pluginpath}/__pycache__/ mkdir -p %{buildroot}%{py3pluginpath}/__pycache__/
%endif %endif
@ -360,6 +361,7 @@ popd
%{python2_sitelib}/%{name}/ %{python2_sitelib}/%{name}/
%dir %{py2pluginpath} %dir %{py2pluginpath}
%dir %{_sysconfdir}/%{name}/modules.d %dir %{_sysconfdir}/%{name}/modules.d
%dir %{_sysconfdir}/%{name}/modules.defaults.d
%if %{with python3} %if %{with python3}
%files -n python3-%{name} %files -n python3-%{name}
@ -369,6 +371,7 @@ popd
%dir %{py3pluginpath} %dir %{py3pluginpath}
%dir %{py3pluginpath}/__pycache__ %dir %{py3pluginpath}/__pycache__
%dir %{_sysconfdir}/%{name}/modules.d %dir %{_sysconfdir}/%{name}/modules.d
%dir %{_sysconfdir}/%{name}/modules.defaults.d
%endif %endif
%files automatic %files automatic
@ -392,6 +395,9 @@ popd
%endif %endif
%changelog %changelog
* Tue Apr 17 2018 Martin Hatina <mhatina@redhat.com> - 2.7.5-11
- Rebase to dnf from dnf-2-modularity-4 release.
* Mon Mar 26 2018 Martin Hatina <mhatina@redhat.com> - 2.7.5-10 * Mon Mar 26 2018 Martin Hatina <mhatina@redhat.com> - 2.7.5-10
- Require libmodulemd. - Require libmodulemd.

2
sources
View File

@ -1 +1 @@
SHA512 (dnf-2.7.5-modularity-3.tar.gz) = db031348c108b083cca8159ae8610eca6fc8c7eac2f0375118b50b5cc2599cbd6c7ecbc2c1a840c648f22fdfb382f3dec4c8b372ec37a110536f08667581be47 SHA512 (dnf-2.7.5-modularity-4.tar.gz) = 3f2baa8f1dd713b2637c788f41a2070cb3847e7e18edf853bc9c9bb5534aa59f3438cdf406ae28e31d614cf7480c4a06d47651c09a2a17a13948112c96a90ba6