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:35:32 Branch: rpm-5_3 Handle: 2011033014353101 Modified files: (Branch: rpm-5_3) rpm CHANGES rpm/macros mandriva.in Log: add systemd macros from Andrey Borzenkov (mdvbz#62741) Summary: Revision Changes Path 1.3296.2.187+2 -1 rpm/CHANGES 1.1.2.14 +15 -0 rpm/macros/mandriva.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3296.2.186 -r1.3296.2.187 CHANGES --- rpm/CHANGES 30 Mar 2011 14:18:18 -0000 1.3296.2.186 +++ rpm/CHANGES 30 Mar 2011 14:35:31 -0000 1.3296.2.187 @@ -1,6 +1,7 @@ 5.3.9 -> 5.3.10 + - 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 missing merge from HEAD of --enable-rpm-lua-extensions-based-on-rpmlib patch - devzero2000: add %_initddir macro for Mandriva @@ . patch -p0 <<'@@ .' Index: rpm/macros/mandriva.in ============================================================================ $ cvs diff -u -r1.1.2.13 -r1.1.2.14 mandriva.in --- rpm/macros/mandriva.in 29 Mar 2011 17:10:47 -0000 1.1.2.13 +++ rpm/macros/mandriva.in 30 Mar 2011 14:35:32 -0000 1.1.2.14 @@ -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