Modify eu-strip option to perform strip in post script of rpm package & add option...

[platform/upstream/rpm.git] / macros.in

diff --git a/macros.in b/macros.in
index 63694b5..a7cab87 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -179,29 +179,21 @@
 #      A spec file can %%define _find_debuginfo_opts to pass options to
 #      the script.  See the script for details.
 #
+
+%_find_debuginfo_opts %{?_rpm_strip_disable:--strip-disable}
+%_find_debuginfo_strip_opts %{?_rpm_strip_option:\'--strip-option=%{_rpm_strip_option}\'}
+
 %__debug_install_post   \
-   %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"\
+   %{_rpmconfigdir}/find-debuginfo.sh %{?_missing_build_ids_terminate_build:--strict-build-id} %{?_find_debuginfo_opts} %{?_find_debuginfo_strip_opts} "%{_builddir}/%{?buildsubdir}"\
 %{nil}
 
 #      Template for debug information sub-package.
 %debug_package \
 %global __debug_package 1\
-%package debuginfo\
-Summary: Debug information for package %{name}\
-Group: Development/Debug\
-AutoReqProv: 0\
-%description debuginfo\
-This package provides debug information for package %{name}.\
-Debug information is useful when developing applications that use this\
-package or when debugging this package.\
-%files debuginfo -f debugfiles.list\
-%defattr(-,root,root)\
-\
 %package debugsource\
 Summary: Debug sources for package %{name}\
 Group: Development/Debug\
 AutoReqProv: 0\
-Requires: %{name}-debuginfo = %{version}-%{release}\
 %description debugsource\
 This package provides debug sources for package %{name}.\
 Debug sources are useful when developing applications that use this\
@@ -878,7 +870,8 @@ posix.setenv("RPMBUILD_SOURCEDIR",rpm.expand("%?_sourcedir"));
        --localstatedir=%{_localstatedir} \\\
        --sharedstatedir=%{_sharedstatedir} \\\
        --mandir=%{_mandir} \\\
-       --infodir=%{_infodir}
+       --infodir=%{_infodir} \\\
+       --disable-dependency-tracking
 
 #------------------------------------------------------------------------------
 # The make install analogue of %configure for modern autotools:
@@ -1070,6 +1063,8 @@ PreReq: python >= %minver, python < %maxver
 # %files -f %{name}.lang
 #
 %find_lang     %{_rpmconfigdir}/find-lang.sh %{buildroot}
+%no_lang_C  --without-C
+
 
 # Commands + opts to use for retrieving remote files
 # Proxy opts can be set through --httpproxy/--httpport popt aliases,
@@ -1089,6 +1084,12 @@ PreReq: python >= %minver, python < %maxver
 %__collection_sepolicy_flags   1
 
 #------------------------------------------------------------------------------
+# transaction specific macros
+%__transaction_plugins     msm
+%__plugindir                           %{_libdir}/rpm-plugins
+%__transaction_msm                     %{__plugindir}/msm.so
+%__transaction_msm_default_policy      %{_libdir}/rpm-plugins/msm-device-sec-policy
+#------------------------------------------------------------------------------
 # Macros for further automated spec %setup and patch application
 
 # default to plain patch