Changeset 104634 in vbox for trunk/src/VBox

Timestamp:

May 14, 2024 9:21:07 PM (10 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

163180

Message:

Installer/linux/rpm: Remove the STAGEDHELP mess (exactly as it was done for .deb packages) completely. Either expect all docs or none.

Location:

trunk/src/VBox/Installer/linux/rpm

Files:

• VirtualBox.tmpl.spec (modified) (2 diffs)
• rules (modified) (1 diff)

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -29 +29 @@
 %define %OSE% 1
 %define %PYTHON% 1
-%define %QHELP% 1
 %define VBOXDOCDIR %{_defaultdocdir}/%NAME%
 %global __requires_exclude_from ^/usr/lib/virtualbox/VBoxPython.*$|^/usr/lib/python.*$|^.*\\.py$
@@ -202 +201 @@
 mv VBox.png $RPM_BUILD_ROOT/usr/share/pixmaps/VBox.png
 %{!?is_ose: mv LICENSE $RPM_BUILD_ROOT%{VBOXDOCDIR}}
-mv UserManual*.pdf $RPM_BUILD_ROOT%{VBOXDOCDIR}
-%{?with_qhelp: mv UserManual*.qch UserManual*.qhc $RPM_BUILD_ROOT%{VBOXDOCDIR}}
+mv UserManual*.pdf UserManual*.qch UserManual*.qhc $RPM_BUILD_ROOT%{VBOXDOCDIR}
 install -m 755 -d $RPM_BUILD_ROOT/usr/lib/debug/usr/lib/virtualbox
 %if %{?rpm_suse:1}%{!?rpm_suse:0}

trunk/src/VBox/Installer/linux/rpm/rules

@@ -255 +255 @@
             -e 's|%SPEC%|$(rpmspec)|g' \
             -e 's|%DATE%|$(shell date "+%a %b %d %Y")|g' \
-            -e 's|%QHELP%|$(if $(STAGEDQHELP),with_qhelp,without_qhelp)|g' \
             -e 's|%PYTHON%|$(if $(filter el5,$(rpmrel)),without_python,with_python)|g' \
             -e 's|%MACROSPYTHON%|$(if $(wildcard /usr/lib/rpm/macros.d/macros.python3),,$(if $(wildcard /usr/lib/rpm/macros.python),%include /usr/lib/rpm/macros.python,))|g' \