diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2011-05-30 11:44:17 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2011-05-30 11:44:17 +0000 |
| commit | c7d328c35f0d3eb0bea296a8f5dfbb54576de81b (patch) | |
| tree | 664d70ed799570f11568ac36b39dc8a37a93a57c | |
| parent | ce4db18b12a6e880de733812234f5bc201437b6d (diff) | |
| download | rpm-setup-c7d328c35f0d3eb0bea296a8f5dfbb54576de81b.tar rpm-setup-c7d328c35f0d3eb0bea296a8f5dfbb54576de81b.tar.gz rpm-setup-c7d328c35f0d3eb0bea296a8f5dfbb54576de81b.tar.bz2 rpm-setup-c7d328c35f0d3eb0bea296a8f5dfbb54576de81b.tar.xz rpm-setup-c7d328c35f0d3eb0bea296a8f5dfbb54576de81b.zip | |
Do not append .%distro_section if section is core1.132
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | build.macros.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Version 1.132 - 19 May 2011, by Pascal Terjan +- do not append .%distro_section if section is core + +Version 1.131 - 19 May 2011, by Pascal Terjan +- append .%distro_section if set + Version 1.130 - 6 May 2011, by Nicolas Vigier - set default distsuffix to .mga (after being changed to mga in version 1.128) diff --git a/build.macros.in b/build.macros.in index cb557de..fe97b5f 100644 --- a/build.macros.in +++ b/build.macros.in @@ -152,7 +152,7 @@ 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:.%distro_section} +%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 7d34d96..aa36632 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.131, pterjan@mageia.org) +AC_INIT(rpm-mageia-setup, 1.132, pterjan@mageia.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9 -Wno-portability) AC_CONFIG_SRCDIR |