Change ',' to '#' in sed 's' command

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

diff --git a/macros.in b/macros.in
index 352f17a..e285ce1 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -186,15 +186,15 @@
 #      Template for debug information sub-package.
 %debug_package \
 %global __debug_package 1\
-%package debuginfo\
-Summary: Debug information for package %{name}\
+%package debugsource\
+Summary: Debug sources 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\
+%description debugsource\
+This package provides debug sources for package %{name}.\
+Debug sources are useful when developing applications that use this\
 package or when debugging this package.\
-%files debuginfo -f debugfiles.list\
+%files debugsource -f debugsources.list\
 %defattr(-,root,root)\
 %{nil}
 
@@ -447,14 +447,18 @@ package or when debugging this package.\
 #
 # Path to scripts to autogenerate package dependencies,
 #
+%__set_helper_env %{lua:
+posix.setenv("RPMBUILD_SPECFILE",rpm.expand("%?_specfile"));
+posix.setenv("RPMBUILD_SOURCEDIR",rpm.expand("%?_sourcedir"));
+}
 # Note: Used iff _use_internal_dependency_generator is zero.
 #%__find_provides      %{_rpmconfigdir}/rpmdeps --provides
 #%__find_requires      %{_rpmconfigdir}/rpmdeps --requires
-%__find_provides       %{_rpmconfigdir}/find-provides %name
-%__find_requires       %{_rpmconfigdir}/find-requires %name
+%__find_provides       %{__set_helper_env}%{_rpmconfigdir}/find-provides %name
+%__find_requires       %{__set_helper_env}%{_rpmconfigdir}/find-requires %name
 #%__find_conflicts     ???
 #%__find_obsoletes     ???
-#%__find_supplements   ???
+%__find_supplements    %{__set_helper_env}%{_rpmconfigdir}/find-supplements %name
 #%__find_enhances      ???
 
 # 
@@ -862,7 +866,8 @@ package or when debugging this package.\
        --localstatedir=%{_localstatedir} \\\
        --sharedstatedir=%{_sharedstatedir} \\\
        --mandir=%{_mandir} \\\
-       --infodir=%{_infodir}
+       --infodir=%{_infodir} \\\
+       --disable-dependency-tracking
 
 #------------------------------------------------------------------------------
 # The make install analogue of %configure for modern autotools:
@@ -1054,6 +1059,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,
@@ -1073,6 +1080,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