autotag: make git complatible (however needs to be in package dir)

[packages/rpm-build-macros.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 9fd44b6a57076751bcac7110802fac74bd500726..9bcf7a7d3b57f768f0311ba589eb7b141a799d0c 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -521,7 +521,9 @@ CXXFLAGS="%{rpmcxxflags}" \
                                        l=${l#/usr/share/man/}; \
                                        l=${l#/usr/X11R6/man/}; \
                                else \
-                                       l=$m; \
+                                       l=${a#$RPM_BUILD_ROOT$i/}; \
+                                       l=${l%/*}; \
+                                       l="$l/$m"; \
                                fi; \
                                rm -f $a; \
                                echo ".so $l" > $a; \
@@ -1475,7 +1477,7 @@ fi \
 
 # Command invoking PEAR CLI
 # Same as /usr/bin/pear, except we force GMT timezone
-%__pear        %__php -doutput_buffering=1 -dopen_basedir="" -dmemory_limit=-1 -ddate.timezone=GMT %{php_pear_dir}/pearcmd.php
+%__pear        %__php -doutput_buffering=1 -dopen_basedir="" -dmemory_limit=-1 -ddate.timezone=GMT /usr/share/pear/pearcmd.php
 
 %pear_install(a:d:n:zD) \
 %__pear \\\
@@ -1649,7 +1651,7 @@ compile() {                                                                                                                       \
                                                                                                                                        \
        [ -r "%{_kernelsrcdir}/.config" ] || exit 1                                             \
        rm -rf o                                                                                                                \
-       install -d o/include/linux o/include/generated o/arch/powerpc/lib       \
+       install -d o/include/linux o/include/generated o/arch/x86/include o/arch/powerpc/lib    \
        ln -sf %{_kernelsrcdir}/.config o/.config                                               \
        ln -sf %{_kernelsrcdir}/Module.symvers o/Module.symvers                 \
        if [ -f %{_kernelsrcdir}/include/generated/autoconf.h ]; then   \
@@ -1657,6 +1659,9 @@ compile() {                                                                                                                       \
                ln -s ../generated/autoconf.h o/include/linux/autoconf.h        \
        else                                                                                                                    \
                ln -sf %{_kernelsrcdir}/include/linux/autoconf.h o/include/linux/autoconf.h \
+       fi                                                                                                                              \
+       if [ -d %{_kernelsrcdir}/arch/x86/include/generated ]; then             \
+               ln -s %{_kernelsrcdir}/arch/x86/include/generated o/arch/x86/include    \
        fi                                                                                                                              \
                                                                                                                                        \
        set +x                                                                                                                  \
@@ -2133,12 +2138,21 @@ fi; \
 # pre/post script for packages supporting systemd units
 #
 # Author: Bartlomiej Zimon <uzi18@o2.pl>
+#                Jan Rękorajski <baggins@mimuw.edu.pl>
 #
 # Usage:
 # %systemd_reload
+# %systemd_service <unit command> service_name1.service service_name2.service
+# %systemd_service_enable service_name1.service service_name2.service
+# %systemd_service_disable service_name1.service service_name2.service
+# %systemd_service_start service_name1.service service_name2.service
+# %systemd_service_stop service_name1.service service_name2.service
+# %systemd_service_restart service_name1.service service_name2.service
+# %systemd_service_reload service_name1.service service_name2.service
+#
 # %systemd_post service_name1.service service_name2.service
 # %systemd_preun service_name1.service service_name2.service
-# %systend_trigger service_name1.service service_name2.service
+# %systemd_trigger service_name1.service service_name2.service
 #
 # Sample:
 # %post
@@ -2154,11 +2168,47 @@ fi; \
 # %systemd_trigger %{name}.service
 #
 # Requirements:
-# BuildRequires: rpmbuild(macros) >= 1.627
-# Requires:     systemd-units >= 37-0.10
+# BuildRequires:       rpmbuild(macros) >= 1.647
+# Requires:    systemd-units >= 38
 
 %systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || :
 
+%systemd_service_enable() \
+       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+       /bin/systemctl --quiet enable %{*} || : \
+       /bin/systemd_booted && echo 'Run "/bin/systemctl start %{*}" to start %{*}.' || : \
+%{nil}
+
+%systemd_service_disable() \
+       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+       /bin/systemctl --quiet disable %{*} || : \
+%{nil}
+
+%systemd_service() \
+       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+       /bin/systemd_booted && /bin/systemctl --quiet %{*} || : \
+%{nil}
+
+%systemd_service_start() \
+       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+       /bin/systemd_booted && /bin/systemctl --quiet start %{*} || : \
+%{nil}
+
+%systemd_service_stop() \
+       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+       /bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \
+%{nil}
+
+%systemd_service_restart() \
+       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+       /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \
+%{nil}
+
+%systemd_service_reload() \
+       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+       /bin/systemd_booted && /bin/systemctl --quiet reload %{*} || : \
+%{nil}
+
 %systemd_trigger() \
 want_enable_service() { \
        [ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
@@ -2179,19 +2229,19 @@ want_enable_service() { \
        /bin/systemd_booted && /bin/systemctl --quiet daemon-reload || : \
        if [ $1 -eq 1 ]; then \
                /bin/systemctl --quiet enable %{*} || : \
-       fi \
-       if [ $1 -gt 1 ] && [ -z "$NORESTART" ]; then \
-               /bin/systemctl --quiet try-restart %{*} || : \
+               /bin/systemd_booted && echo 'Run "/bin/systemctl start %{*}" to start %{*}.' || : \
+       elif [ -z "$NORESTART" ]; then \
+               /bin/systemd_booted && /bin/systemctl --quiet try-restart %{*} || : \
+       else \
+               /bin/systemd_booted && echo 'Run "/bin/systemctl restart %{*}" to restart %{*}.' || : \
        fi \
 %{nil}
 
 %systemd_preun() \
        if [ $1 -eq 0 ]; then \
-               export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog; \
-               /bin/systemctl --no-reload --quiet disable %{*} || : \
-               if /bin/systemd_booted; then \
-                       /bin/systemctl --quiet stop %{*} || : \
-               fi \
+               export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
+               /bin/systemd_booted && /bin/systemctl --quiet stop %{*} || : \
+               /bin/systemctl --quiet disable %{*} || : \
        fi \
 %{nil}