Skip to content

Commit f744162

Browse files
m-blahadmach
authored andcommitted
YUM3 compat layer
- /etc/yum/* paths - manpage for repoquery - manpage for yum-shell - removed duplicity of modules.d and modules.defaults.d
1 parent e90cb1b commit f744162

File tree

3 files changed

+25
-3
lines changed

3 files changed

+25
-3
lines changed

dnf.spec

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,12 @@ ln -sr %{buildroot}%{_bindir}/dnf-2 %{buildroot}%{_bindir}/yum
329329
%endif
330330
%endif
331331
rm -vf %{buildroot}%{_bindir}/dnf-automatic-*
332+
%if "%{yum_subpackage_name}" == "yum"
333+
mkdir -p %{buildroot}%{_sysconfdir}/yum
334+
ln -sr %{buildroot}%{pluginconfpath} %{buildroot}%{_sysconfdir}/yum/pluginconf.d
335+
ln -sr %{buildroot}%{confdir}/protected.d %{buildroot}%{_sysconfdir}/yum/protected.d
336+
ln -sr %{buildroot}%{confdir}/vars %{buildroot}%{_sysconfdir}/yum/vars
337+
%endif
332338

333339

334340
%check
@@ -396,8 +402,6 @@ rm -vf %{buildroot}%{_bindir}/dnf-automatic-*
396402
%dir %{confdir}/modules.d
397403
%dir %{confdir}/modules.defaults.d
398404
%dir %{pluginconfpath}
399-
%dir %{_sysconfdir}/%{name}/modules.d
400-
%dir %{_sysconfdir}/%{name}/modules.defaults.d
401405
%dir %{confdir}/protected.d
402406
%dir %{confdir}/vars
403407
%config(noreplace) %{confdir}/%{name}.conf
@@ -421,8 +425,19 @@ rm -vf %{buildroot}%{_bindir}/dnf-automatic-*
421425
%{_bindir}/yum
422426
%{_mandir}/man8/yum.8*
423427
%{_sysconfdir}/yum.conf
428+
%{_sysconfdir}/yum/pluginconf.d
429+
%{_sysconfdir}/yum/protected.d
430+
%{_sysconfdir}/yum/vars
431+
%{_mandir}/man1/repoquery.1.*
424432
%{_mandir}/man5/yum.conf.5.*
425433
%{_mandir}/man8/yum.8*
434+
%{_mandir}/man8/yum-shell.8*
435+
%else
436+
%exclude %{_mandir}/man1/repoquery.1.*
437+
%exclude %{_mandir}/man8/yum-shell.8*
438+
%exclude %{_sysconfdir}/yum/pluginconf.d
439+
%exclude %{_sysconfdir}/yum/protected.d
440+
%exclude %{_sysconfdir}/yum/vars
426441
%endif
427442

428443
%if "%{yum_subpackage_name}" == "yum4"
@@ -434,8 +449,8 @@ rm -vf %{buildroot}%{_bindir}/dnf-automatic-*
434449
%endif
435450

436451
%if "%{yum_subpackage_name}" == "%{name}-yum"
437-
%{_sysconfdir}/yum.conf
438452
%{_bindir}/yum
453+
%{_sysconfdir}/yum.conf
439454
%{_mandir}/man5/yum.conf.5*
440455
%{_mandir}/man8/yum.8*
441456
%endif

doc/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ if (NOT WITH_MAN EQUAL 0)
1616
${CMAKE_CURRENT_BINARY_DIR}/dnf.automatic.8
1717
${CMAKE_CURRENT_BINARY_DIR}/yum2dnf.8
1818
${CMAKE_CURRENT_BINARY_DIR}/yum.8
19+
${CMAKE_CURRENT_BINARY_DIR}/yum-shell.8
1920
DESTINATION share/man/man8)
2021
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dnf.conf.5
2122
${CMAKE_CURRENT_BINARY_DIR}/yum.conf.5
2223
DESTINATION share/man/man5)
24+
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/repoquery.1
25+
DESTINATION share/man/man1)
2326
endif()

doc/conf.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,10 @@ def version_readout():
244244
AUTHORS, 8),
245245
('command_ref', 'yum', u'redirecting to DNF Command Reference',
246246
AUTHORS, 8),
247+
('command_ref', 'repoquery', u'redirecting to DNF Command Reference',
248+
AUTHORS, 1),
249+
('command_ref', 'yum-shell', u'redirecting to DNF Command Reference',
250+
AUTHORS, 8),
247251
]
248252

249253
# If true, show URL addresses after external links.

0 commit comments

Comments
 (0)