From ac6820baf548b5bc524dc3fa472d135b86808442 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Mon, 30 May 2011 12:00:13 +0000 Subject: Default to core, useful for local builds --- NEWS | 5 ++++- build.macros.in | 3 ++- configure.ac | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 7057dcb..75012ae 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,7 @@ -Version 1.132 - 19 May 2011, by Pascal Terjan +Version 1.133 - 30 May 2011, by Pascal Terjan +- default to core section + +Version 1.132 - 30 May 2011, by Pascal Terjan - do not append .%distro_section if section is core Version 1.131 - 19 May 2011, by Pascal Terjan diff --git a/build.macros.in b/build.macros.in index fe97b5f..7cf90a8 100644 --- a/build.macros.in +++ b/build.macros.in @@ -152,7 +152,8 @@ GCONF_CONFIG_SOURCE=`%{_gconftool_bin} --get-default-source` %{_gconftool_bin} - %distsuffix @DISTSUFFIX@ -%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release}%([ "%{distro_section}" != "core" ] && echo .%distro_section) +%__distro_section %{?distro_section:%distro_section}%{?!distro_section:core} +%mkrel(c:) %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release}%([ "%{__distro_section}" != "core" ] && echo .%__distro_section) #------------------------------------------------------------------------------ # definions merged from manbo-setup-build diff --git a/configure.ac b/configure.ac index aa36632..c0295fb 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # $Id: configure.ac 271266 2010-11-04 10:43:28Z fwang $ AC_PREREQ(2.59) -AC_INIT(rpm-mageia-setup, 1.132, pterjan@mageia.org) +AC_INIT(rpm-mageia-setup, 1.133, pterjan@mageia.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9 -Wno-portability) AC_CONFIG_SRCDIR -- cgit v1.2.1