X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dnf.spec;h=a1c3c3912f2d8bde6e969a57110a118860dbc115;hb=c4dd43df3f1694a3d0dac0592945dc8ae2369f98;hp=be96e3c4bc2fea49b800d5788e85b7d50a035100;hpb=e4e8a540bc2f126b15cb92a5b17218d3a2f49684;p=packages%2Fdnf.git

diff --git a/dnf.spec b/dnf.spec
index be96e3c..a1c3c39 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -2,22 +2,30 @@
 # Conditional build:
 %bcond_without	tests		# build without tests
 #
-%define	hawkey_ver	0.59.0
-%define	libcomps_ver	0.1.8
-%define	libmodulemd_ver	2.9.3
-%define	rpm_ver		4.14.0
+%define		hawkey_ver		0.67.0
+%define		libcomps_ver		0.1.8
+%define		libmodulemd_ver		2.9.3
+%define		rpm_ver			4.14.0
+
+%define		_enable_debug_packages	0
 
 Summary:	Package manager
 Summary(pl.UTF-8):	Zarządca pakietów
 Name:		dnf
-Version:	4.6.1
-Release:	7
+Version:	4.12.0
+Release:	2
 Group:		Base
 # GPL v2+ with GPL v2 and GPL parts; for a breakdown of the licensing, see PACKAGE-LICENSING
 License:	GPL v2 (parts on GPL v2+ or GPL)
 Source0:	https://github.com/rpm-software-management/dnf/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	21880d44905d6aa67ab6bee1e86380b3
+# Source0-md5:	0e0242e443f87290efd16226b056f18c
+Source1:	pld.repo
+Source2:	pld-archive.repo
+Source3:	pld-debuginfo.repo
+Source4:	pld-multilib.repo
 Patch0:		install.patch
+Patch1:		repos.d.patch
+Patch2:		uname-cpuinfo-deps.patch
 URL:		https://github.com/rpm-software-management/dnf
 BuildRequires:	bash-completion-devel
 BuildRequires:	cmake >= 2.4
@@ -42,13 +50,13 @@ Requires:	python3-gpg
 Requires:	python3-hawkey >= %{hawkey_ver}
 Requires:	python3-libcomps >= %{libcomps_ver}
 Requires:	python3-libdnf >= %{hawkey_ver}
+Requires:	python3-modules
 Requires:	python3-rpm
 Requires:	systemd-units >= 0.38
 Recommends:	deltarpm
 Recommends:	python3-dbus
 Recommends:	python3-unbound
 Recommends:	rpm-plugin-systemd-inhibit
-BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -58,18 +66,6 @@ supports RPMs, modules and comps groups & environments.
 %description -l pl.UTF-8
 Marzędzie umożliwiające użytkownikom zarządzanie pakietami w systemie.
 
-%package common
-Summary:	Common data and configuration files for DNF
-Summary(pl.UTF-8):	Wspólne dane i pliki konfiguracyjne dla DNF-a
-Group:		Base
-Requires:	libreport-filesystem
-
-%description common
-Common data and configuration files for DNF.
-
-%description common -l pl.UTF-8
-Wspólne dane i pliki konfiguracyjne dla DNF-a.
-
 %package automatic
 Summary:	Alternative CLI to "dnf upgrade" suitable for automatic, regular execution
 Summary(pl.UTF-8):	Alternatywny interfejs do "dnf upgrade" nadający się do automatycznego wywoływania
@@ -78,6 +74,8 @@ Requires(post):	systemd
 Requires(preun):	systemd
 Requires(postun):	systemd
 Requires:	%{name} = %{version}-%{release}
+Requires:	python3-modules
+BuildArch:	noarch
 
 %description automatic
 Alternative CLI to "dnf upgrade" suitable for automatic, regular
@@ -93,6 +91,7 @@ Summary(pl.UTF-8):	Bashowe uzupełnianie parametrów dla polecenia dnf
 Group:		Applications/Shells
 Requires:	%{name} = %{version}-%{release}
 Requires:	bash-completion
+BuildArch:	noarch
 
 %description -n bash-completion-dnf
 Bash completion for dnf command.
@@ -107,6 +106,7 @@ Group:		Base
 Requires:	%{name} = %{version}-%{release}
 Recommends:	sqlite3
 Conflicts:	yum < 3.4.3-505
+BuildArch:	noarch
 
 %description -n yum
 Yum compatibility layer for DNF.
@@ -117,6 +117,8 @@ Warstwa zgodności z YUM-em dla DNF-a.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 install -d build
@@ -132,7 +134,7 @@ cd build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{%{name}/{vars,aliases.d,plugins,modules.d,modules.defaults.d},yum} \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{yum,%{name}/{vars,aliases.d,plugins,modules.d,modules.defaults.d,repos.d}} \
 	-d $RPM_BUILD_ROOT{%{_localstatedir}/log/,%{_var}/cache/dnf} \
 	-d $RPM_BUILD_ROOT%{py3_sitescriptdir}/dnf-plugins/__pycache__
 
@@ -150,9 +152,54 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}.log
 ln -sr $RPM_BUILD_ROOT%{_sysconfdir}/{%{name}/%{name}.conf,yum.conf}
 ln -sr $RPM_BUILD_ROOT%{_sysconfdir}/{%{name}/plugins,yum/pluginconf.d}
 ln -sr $RPM_BUILD_ROOT%{_sysconfdir}/{%{name}/protected.d,yum/protected.d}
+ln -sr $RPM_BUILD_ROOT%{_sysconfdir}/{%{name}/repos.d,yum/repos.d}
 ln -sr $RPM_BUILD_ROOT%{_sysconfdir}/{%{name}/vars,yum/vars}
 ln -s dnf $RPM_BUILD_ROOT%{_bindir}/yum
 
+%ifarch i686 ppc sparc alpha athlon aarch64 %{arm}
+	%define		ftp_arch	%{_target_cpu}
+%endif
+%ifarch pentium2 pentium3 pentium4
+	%define		ftp_arch	i686
+%endif
+%ifarch %{x8664}
+	%define		ftp_arch	x86_64
+	%define		ftp_alt_arch	i686
+	%define		ftp_alt2_arch	x32
+%endif
+%ifarch x32
+	%define		ftp_arch	x32
+	%define		ftp_alt_arch	x86_64
+	%define		ftp_alt2_arch	i686
+%endif
+
+%define	pld_repo %{SOURCE1}
+%define	pld_archive_repo %{SOURCE2}
+%define	pld_debuginfo_repo %{SOURCE3}
+
+%ifarch %{x8664} x32
+	%define	pld_multilib_repo %{SOURCE4}
+	%define	pld_multilib2_repo %{SOURCE4}
+%endif
+
+%{__sed} -e 's|%%ARCH%%|%{ftp_arch}|g' < %{pld_repo} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld.repo
+
+%if 0%{?pld_multilib_repo:1}
+	%{__sed} 's|%%ARCH%%|%{ftp_alt_arch}|g' < %{pld_multilib_repo} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{ftp_alt_arch}.repo
+%endif
+
+%if 0%{?pld_multilib2_repo:1}
+	%{__sed} 's|%%ARCH%%|%{ftp_alt2_arch}|g' < %{pld_multilib_repo} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-%{ftp_alt2_arch}.repo
+%endif
+
+%if 0%{?pld_debuginfo_repo:1}
+%{__sed} -e 's|%%ARCH%%|%{ftp_arch}|g' < %{pld_debuginfo_repo} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-debuginfo.repo
+%endif
+
+%if 0%{?pld_archive_repo:1}
+%{__sed} -e 's|%%ARCH%%|%{ftp_arch}|g' < %{pld_archive_repo} > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/repos.d/pld-archive.repo
+%endif
+
 %py3_comp $RPM_BUILD_ROOT%{py3_sitescriptdir}/dnf
 %py3_ocomp $RPM_BUILD_ROOT%{py3_sitescriptdir}/dnf
 
@@ -186,8 +233,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/%{name}
 %dir %{_sysconfdir}/%{name}/plugins
 %dir %{_sysconfdir}/%{name}/protected.d
+%dir %{_sysconfdir}/%{name}/repos.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/dnf.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/protected.d/dnf.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/repos.d/*.repo
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libreport/events.d/collect_dnf.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
 %{_mandir}/man5/dnf.conf.5*
@@ -230,6 +279,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/yum
 %{_sysconfdir}/yum/pluginconf.d
 %{_sysconfdir}/yum/protected.d
+%{_sysconfdir}/yum/repos.d
 %{_sysconfdir}/yum/vars
 %{_mandir}/man1/yum-aliases.1*
 %{_mandir}/man5/yum.conf.5.*