diff options
| -rw-r--r-- | build.macros.in | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/build.macros.in b/build.macros.in index 3effa32..262b3d2 100644 --- a/build.macros.in +++ b/build.macros.in @@ -143,20 +143,16 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} - # Include minimal debug information in build binaries. # Requires _enable_debug_packages. # -%_include_minidebuginfo 1 +%_enable_debug_packages 1 +%_include_minidebuginfo 1 %_include_gdb_index 1 %_debugsource_packages 1 %_debuginfo_subpackages 1 -# Use SHA-256 for FILEDIGESTS instead of default MD5 -%_source_filedigest_algorithm 8 -%_binary_filedigest_algorithm 8 - #------------------------------------------------------------------------------ # definions merged from manbo-setup-build # -%_enable_debug_packages 1 # Default extension to use (for info files) %_extension .xz @@ -199,9 +195,6 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} - export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%optflags" \ %{nil} -# Maximum number of CPU's to use when building, 0 for unlimited. -%_smp_ncpus_max 0 - %make \ echo "warning: %%make is deprecated, try %%make_build instead" 1>&2\ %{__make} -O %_smp_mflags @@ -280,11 +273,15 @@ if [ %{_with install} -eq 1 ]; then\ mkdir "$RPM_BUILD_ROOT"\ fi +# Maximum number of CPU's to use when building, 0 for unlimited. +%_smp_ncpus_max 0 + #============================================================================== # ---- Build policy macros. # +# #--------------------------------------------------------------------- -# Expanded at end of %install scriptlet. +# Expanded at beginning of %install scriptlet. # %__os_install_post \ @@ -304,9 +301,6 @@ fi # Useful python macros %pyver %(python -V 2>&1 | cut -f2 -d" " | cut -f1,2 -d".") -# Should python bytecompilation errors terminate a build? -%_python_bytecompile_errors_terminate_build 1 - # Enable python bytecompilation %_python_bytecompile_build 1 @@ -467,5 +461,13 @@ popd [ %{_with check} -eq 1 ] || exit 0 \ %{nil} +# +## Should python bytecompilation errors terminate a build? +%_python_bytecompile_errors_terminate_build 1 + +# Use SHA-256 for FILEDIGESTS instead of default MD5 +%_source_filedigest_algorithm 8 +%_binary_filedigest_algorithm 8 + # Automatically trim changelog entries after 2 years %_changelog_trimtime %{lua:print(os.time() - 2 * 365 * 86400)} |