aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-03-24 11:46:41 +0000
committerColin Guthrie <colin@mageia.org>2013-03-24 11:46:41 +0000
commitf7577e777779eeb8781dad30903d318a921824de (patch)
tree13e2760ba20ef48cb5604600147a29c6b8900704
parent4aeb4a8784d32492f708a8cf1836ec323e534478 (diff)
downloadrpm-setup-f7577e777779eeb8781dad30903d318a921824de.tar
rpm-setup-f7577e777779eeb8781dad30903d318a921824de.tar.gz
rpm-setup-f7577e777779eeb8781dad30903d318a921824de.tar.bz2
rpm-setup-f7577e777779eeb8781dad30903d318a921824de.tar.xz
rpm-setup-f7577e777779eeb8781dad30903d318a921824de.zip
Add version macros for systemd/rpm-helper to ease distro upgrades
-rw-r--r--NEWS2
-rw-r--r--build.macros.in9
2 files changed, 10 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index cb8f204..5854e64 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- add version macros for systemd/rpm-helper to ease distro upgrades
+
Version 1.168 - 17 March 2013, by Luc Menut
- fix find-lang.pl : do not own man lang directories with --with-man
(patch from Thierry Vignaud, mga #3697, #9055)
diff --git a/build.macros.in b/build.macros.in
index 3b9914e..1488f3f 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -498,7 +498,7 @@ popd
%{!-C:--fix-permissions}
#------------------------------------------------------------------------------
-# Systemd macros
+# Systemd and general service related macros
#
%_unitdir /usr/lib/systemd/system
@@ -507,6 +507,13 @@ popd
%_tmpfilescreate() /usr/bin/systemd-tmpfiles --create %{1}.conf \
%{nil}
+# Minimum versions for various packaging helpers.
+# These is defined here to easy upgrading from previous distros when the various
+# service helpers change and thus those pacakges need to be installed first to
+# ensure a smooth upgrade
+%rpmhelper_required_version 0.24.11
+%systemd_required_version 195
+
#------------------------------------------------------------------------------
# Redefine RPM sections to allow jumping over them using "--without <section>".
# This an interesting alternative to --short-circuit.