aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Välimaa <wally@mageia.org>2019-12-28 22:16:12 +0200
committerJani Välimaa <wally@mageia.org>2019-12-28 22:16:12 +0200
commitf17bf4d56e15c51d84f7e4bfe66be2ff8ef178d4 (patch)
treefdd7bac4f88c56580d0885dc4901197267eb0147
parent25ac9f65c540db77c11c23fd491367359aec8992 (diff)
downloadrpm-setup-f17bf4d56e15c51d84f7e4bfe66be2ff8ef178d4.tar
rpm-setup-f17bf4d56e15c51d84f7e4bfe66be2ff8ef178d4.tar.gz
rpm-setup-f17bf4d56e15c51d84f7e4bfe66be2ff8ef178d4.tar.bz2
rpm-setup-f17bf4d56e15c51d84f7e4bfe66be2ff8ef178d4.tar.xz
rpm-setup-f17bf4d56e15c51d84f7e4bfe66be2ff8ef178d4.zip
Clean build.macros.in a bit
-rw-r--r--build.macros.in10
1 files changed, 4 insertions, 6 deletions
diff --git a/build.macros.in b/build.macros.in
index 6000cbd..2496fe5 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -91,8 +91,6 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} -
%{nil}
# Mageia Linux version
-# - "9.1" => 910
-# - "10.2.2" => 1022
# (user may copy the following line in specfile)
%mgaversion %distro_release
@@ -104,7 +102,7 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} -
%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?dist:%dist}%{?!dist:%__dist_ident}%([ "%{__distro_section}" != "core" ] && echo .%__distro_section)
-%_logdir %{_var}/log
+%_logdir %{_var}/log
%_localstatedir /var
%_pkgdocdir %{_docdir}/%{name}
@@ -119,7 +117,6 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} -
%_debugsource_packages 1
%_debuginfo_subpackages 1
-
#------------------------------------------------------------------------------
# definions merged from manbo-setup-build
#
@@ -131,11 +128,11 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} -
%_install_info() if [[ -f %{_infodir}/%{1}%{_extension} ]]; then %{__install_info} %{_infodir}/%{1}%{_extension} --dir=%{_infodir}/dir; fi \
%{nil}
+
# (nb: keep the "alone on its line ';'")
%_remove_install_info() if [ "$1" = "0" ]; then if [[ -f %{_infodir}/%{1}%{_extension} ]]; then %{__install_info} %{_infodir}/%{1}%{_extension} --dir=%{_infodir}/dir --remove ; fi; fi \
%{nil}
-
# Macro: %{mklibname <name> [<major> [<minor>]] [-s] [-d]}
# - %{mklibname test} => lib64test, on a lib64 platform
# - %{mklibname test 1 -d} => libtest1-devel
@@ -316,7 +313,6 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
# %{_mandir}/*/*
#
-
%perl_convert_version() %(perl -Mversion -le '
$x = "%{1}";
$y = $x;
@@ -498,6 +494,8 @@ fi
#
## Should python bytecompilation errors terminate a build?
%_python_bytecompile_errors_terminate_build 1
+
+#
## Should python bytecompilation compile outisde python specific directories?
%_python_bytecompile_extra 1