Changeset 1079

Timestamp:

Apr 5, 2017, 9:28:37 PM (8 years ago)

Author:

dmik

Message:

rpm: Remove usage of scripts moved out in r1078.

Location:

rpm/trunk

Files:

• macros.in (modified) (2 diffs)
• platform.in (modified) (1 diff)
• scripts/Makefile.am (modified) (1 diff)
• scripts/brp-strip (modified) (1 diff)
• scripts/brp-strip-comment-note (modified) (1 diff)
• scripts/brp-strip-shared (modified) (1 diff)

rpm/trunk/macros.in

@@ -201 +201 @@
 %{nil}
 
-# Path to script that installs legacy runtime libraries.
-%__legacy_runtime_install_post \
-   %{_rpmconfigdir}/find-legacy-runtime.sh install "%{_target_cpu}" "%{_builddir}/%{?buildsubdir}"\
-%{nil}
-
-# Template for legacy runtime sub-packages.
-%legacy_runtime_packages \
-%global __legacy_runtime_packages 1\
-%{expand:%(%{_rpmconfigdir}/find-legacy-runtime.sh package "%{name}" "%{_sourcedir}" "%{_target_cpu}" "%{buildroot}")}\
-%{nil}
-
 %_defaultdocdir         %{_datadir}/doc
 %_defaultlicensedir     %{_datadir}/licenses
@@ -748 +737 @@
 %{__arch_install_post}\
 %{__os_install_post}\
-%{?__legacy_runtime_packages:%{__legacy_runtime_install_post}}\
 %{nil}
 %__spec_install_template        #!%{__spec_install_shell}\

rpm/trunk/platform.in

@@ -70 +70 @@
     %{_rpmconfigdir}/brp-compress \
     %{_rpmconfigdir}/brp-strip %{__strip} \
-    %{_rpmconfigdir}/brp-strip.os2 "%{_builddir}/%{?buildsubdir}" %{?_strip_no_compress:--no-compress} %{!?__debug_package:--no-debuginfo} %{?_strip_opts} \
     %{_rpmconfigdir}/brp-strip-static-archive %{__strip} \
     %{_rpmconfigdir}/brp-strip-comment-note %{__strip} %{__objdump} \
 %{nil}
-
-%__debug_install_post  %{nil}
 
 @apple@#---------------------------------------------------------------------

rpm/trunk/scripts/Makefile.am

@@ -28 +28 @@
         brp-strip brp-strip-comment-note brp-python-hardlink \
         brp-strip-shared brp-strip-static-archive \
-        brp-strip.os2 wps-object.cmd warpin-conflicts.cmd os2deps.sh \
-        find-legacy-runtime.sh \
+        wps-object.cmd warpin-conflicts.cmd os2deps.sh \
         check-files check-prereqs \
         check-buildroot check-rpaths check-rpaths-worker \

rpm/trunk/scripts/brp-strip

@@ -9 +9 @@
 case `uname -a` in
 Darwin*) exit 0 ;;
-OS/2*) exit 0 ;; # YD use platform specific macro
+OS/2*) exit 0 ;;
 *) ;;
 esac

rpm/trunk/scripts/brp-strip-comment-note

@@ -10 +10 @@
 case `uname -a` in
 Darwin*) exit 0 ;;
+OS/2*) exit 0 ;;
 *) ;;
 esac

rpm/trunk/scripts/brp-strip-shared

@@ -12 +12 @@
 case `uname -a` in
 Darwin*) exit 0 ;;
+OS/2*) exit 0 ;;
 *) ;;
 esac