RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 30-Mar-2011 16:33:34
Branch: HEAD Handle: 2011033014333400
Modified files:
rpm CHANGES
rpm/macros mandriva.in
Log:
add systemd macros from Andrey Borzenkov (mdvbz#62741)
Summary:
Revision Changes Path
1.3586 +2 -1 rpm/CHANGES
1.12 +15 -0 rpm/macros/mandriva.in
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3585 -r1.3586 CHANGES
--- rpm/CHANGES 30 Mar 2011 14:16:03 -0000 1.3585
+++ rpm/CHANGES 30 Mar 2011 14:33:34 -0000 1.3586
@@ -1,6 +1,7 @@
5.4.0 -> 5.4.1:
+ - proyvind: mandriva: add systemd macros (mdvbz#62741, from Andrey
Borzenkov).
- proyvind: dbconvert: fix conversion to older hash database format
- resulting in "missing" package from rpmdb
+ resulting in "missing" package from rpmdb.
- devzero2000: add %_initddir macro for Mandriva
(ref http://lists.mandriva.com/maintainers/2011-03/msg00252.php)
- jbj: fix: reduce false positives checking for
@@ .
patch -p0 <<'@@ .'
Index: rpm/macros/mandriva.in
============================================================================
$ cvs diff -u -r1.11 -r1.12 mandriva.in
--- rpm/macros/mandriva.in 30 Mar 2011 14:28:09 -0000 1.11
+++ rpm/macros/mandriva.in 30 Mar 2011 14:33:34 -0000 1.12
@@ -73,4 +73,19 @@
%_loop_detection_loglevel 3
+# mdvbz#62741
+# standard systemd directories
+%_systemdrootdir /lib/systemd
+%_systemunitdir %{_systemdrootdir}/system
+%_systemgeneratordir %{_systemdrootdir}/system-generators
+%_systemshutdowndir %{_systemdrootdir}/system-shutdown
+
+%_systemddatadir %{_datadir}/systemd
+%_userunitdir %{_systemddatadir}/user
+
+%_systemdlibexecdir %{_libexecdir}/systemd
+%_usergeneratordir %{_systemdlibexecdir}/user-generators
+
+%_systemdconfdir %{_sysconfdir}/systemd
+
%{load:/etc/rpm/macros.d/*.macros}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
