Skip to content

Commit 9dde5c6

Browse files
committed
Spec file: Fix yum.conf installation
Source1 was never defined in the upstream spec file (so building an RPM would fail). In Fedora, we use it to override the upstream yum.conf with our own. As upstream should rather be distro-agnostic, let's just stick with the defaults here.
1 parent ec7c205 commit 9dde5c6

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

yum.spec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,14 +257,13 @@ INIT=sysv
257257

258258
make DESTDIR=$RPM_BUILD_ROOT UNITDIR=%{_unitdir} INIT=$INIT install
259259

260-
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/yum.conf
261260
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/yum/pluginconf.d $RPM_BUILD_ROOT/%{yum_pluginslib}
262261
mkdir -p $RPM_BUILD_ROOT/%{yum_pluginsshare}
263262

264263
%if %{move_yum_conf_back}
265264
# for now, move repodir/yum.conf back
266265
mv $RPM_BUILD_ROOT/%{_sysconfdir}/yum/repos.d $RPM_BUILD_ROOT/%{_sysconfdir}/yum.repos.d
267-
rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum.conf
266+
mv $RPM_BUILD_ROOT/%{_sysconfdir}/yum/yum.conf $RPM_BUILD_ROOT/%{_sysconfdir}/yum.conf
268267
%endif
269268

270269
%if %{yum_updatesd}

0 commit comments

Comments
 (0)