]> git.pld-linux.org Git - packages/rpm-build-macros.git/blobdiff - rpm.macros
1.691: add %udev_hwdb_update responsible for updating hardware database index
[packages/rpm-build-macros.git] / rpm.macros
index 22725b841575df28d7d80ae480f4501d4fe5ab1f..e0f39f3ef91260aead100796f4725f4d7e9e4a9e 100644 (file)
 %x8664         x86_64 amd64 ia32e
 %arm           armv3l armv4b armv4l armv5teb armv5tel
 
-# kernel compiler
-%kgcc          %{__cc}
-%kgcc_package  gcc
-
 # compiler version
 %cc_version    %{expand:%%global cc_version %(%{__cc} -dumpversion 2>/dev/null || echo 0.0)}%cc_version
 %cxx_version   %{expand:%%global cxx_version %(%{__cxx} -dumpversion 2>/dev/null || echo 0.0)}%cxx_version
 # Regular expressions are supported, but to avoid some character be treated
 # as regular expression it must be escaped twice.
 
-%filter_out                                            \
-       for (i = 1; i in I; i++) {      A=0;    \
+%filter_out                                                    \
+       for (i = 1; i in I; i++) { A=0; \
                for (f in F) {                          \
                        if (I[i] ~ "^" F[f] "$") A=1;   \
                };                                                      \
        }
 }')
 
+# override %__spec_build_pre and %__spec_install_pre from macros.rpmbuild
+# adding %{_clean_env}
+%__spec_build_pre      %{_clean_env}\
+%{___build_pre}\
+%{nil}
+%__spec_install_pre    %{_clean_env}\
+%{___build_pre}\
+%{?buildroot:%{__rm} -rf '%{buildroot}'; %{__mkdir_p} '%{buildroot}'}\
+%{nil}
+
 #-----------------------------------------------------------------
 %configure2_13 { \
  if [ -n "$LINGUAS" ]; then unset LINGUAS; fi; \
  %{?__cxx:CXX="%{__cxx}" ; export CXX ; } \
  %{?configuredir:%{configuredir}}%{!?configuredir:.}/configure \
        --host=%{_target_platform} \
-       --prefix=%{_prefix} \
+       --prefix=%{_prefix} \
        --exec-prefix=%{_exec_prefix} \
        --bindir=%{_bindir} \
        --sbindir=%{_sbindir} \
        %{dependencytracking} \
 }
 
+# Note: pass only standard cmake macros here.
+# The only exception is SYSCONF_INSTALL_DIR, used commonly in KDE packages,
+# where the default (${CMAKE_INSTALL_PREFIX}/etc) is not FHS-compliant and
+# absolute path MUST be used to comply with FHS.
+# The other non-standard cmake macros used commonly in KDE
+# (INCLUDE_INSTALL_DIR, LIB_INSTALL_DIR, SHARE_INSTALL_PREFIX)
+# have sane default values in KDE, and some packages use these names
+# in different way (e.g. expect them to be always relative or always
+# absolute).
 %cmake \
-%{?__cc:CC="%{__cc}"} \\\
-%{?__cxx:CXX="%{__cxx}"} \\\
+%{?__cc:CC="${CC:-%{__cc}}"} \\\
+%{?__cxx:CXX="${CXX:-%{__cxx}}"} \\\
 CPPFLAGS="${CPPFLAGS:-%{rpmcppflags}}" \\\
 %{__cmake} \\\
        -DCMAKE_VERBOSE_MAKEFILE=ON \\\
        -DCMAKE_BUILD_TYPE=%{!?debug:PLD}%{?debug:Debug} \\\
        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-       -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
-       -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
-       -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
        -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
-       -DCMAKE_CXX_FLAGS_PLD="${CXXFLAGS:-%{rpmcxxflags} -DNDEBUG}" \\\
-       -DCMAKE_C_FLAGS_PLD="${CFLAGS:-%{rpmcflags} -DNDEBUG}" \\\
-       -DCMAKE_Fortran_FLAGS_PLD="${CFLAGS:-%{rpmcflags} -DNDEBUG}" \\\
+       -DCMAKE_CXX_FLAGS_PLD="${CXXFLAGS:-%{rpmcxxflags} -DNDEBUG -DQT_NO_DEBUG}" \\\
+       -DCMAKE_C_FLAGS_PLD="${CFLAGS:-%{rpmcflags} -DNDEBUG -DQT_NO_DEBUG}" \\\
+       -DCMAKE_Fortran_FLAGS_PLD="${CFLAGS:-%{rpmcflags} -DNDEBUG -DQT_NO_DEBUG}" \\\
        -DCMAKE_EXE_LINKER_FLAGS_PLD="${LDFLAGS:-%{rpmldflags}}" \\\
        -DCMAKE_SHARED_LINKER_FLAGS_PLD="${LDFLAGS:-%{rpmldflags}}" \\\
        -DCMAKE_MODULE_LINKER_FLAGS_PLD="${LDFLAGS:-%{rpmldflags}}" \\\
@@ -287,6 +299,7 @@ CXX="%{__cxx}" \
 CPP="%{__cpp}" \
 CFLAGS="%{rpmcflags}" \
 CXXFLAGS="%{rpmcxxflags}" \
+LINKFLAGS="%{rpmldflags}" \
 %{__waf} \
 }
 
@@ -295,7 +308,7 @@ CXXFLAGS="%{rpmcxxflags}" \
 %configure_cache_file  %{buildroot}.configure.cache
 
 %configure {./configure \
-       LDFLAGS="${LDFLAGS:-%rpmldflags}" \
+       LDFLAGS="${LDFLAGS:-%rpmldflags}" \
        CFLAGS="${CFLAGS:-%rpmcflags}" \
        CXXFLAGS="${CXXFLAGS:-%rpmcxxflags}" \
        FFLAGS="${FFLAGS:-%rpmcflags}" \
@@ -305,7 +318,7 @@ CXXFLAGS="%{rpmcxxflags}" \
        %{?__cxx:CXX="%{__cxx}"} \
        --host=%{_target_platform} \
        --build=%{_target_platform} \
-       --prefix=%{_prefix} \
+       --prefix=%{_prefix} \
        --exec-prefix=%{_exec_prefix} \
        --bindir=%{_bindir} \
        --sbindir=%{_sbindir} \
@@ -403,17 +416,11 @@ CXXFLAGS="%{rpmcxxflags}" \
 %__unsermake /usr/share/unsermake/unsermake
 
 # Current date
-%date          %(LC_ALL=C date +"%a %b %d %Y")
+%date          %(LC_ALL=C date +"%a %b %d %Y")
 
 # Example files, programs, scripts...
 %_examplesdir  /usr/src/examples
 
-# Alternative kernel type/version
-%_alt_kernel   %{nil}%{?alt_kernel:-%{?alt_kernel}}
-
-# The directory holding Linux kernel sources
-%_kernelsrcdir /usr/src/linux%{_alt_kernel}
-
 # SysV-style initscripts dir
 %_initddir             /etc/rc.d/init.d
 
@@ -429,12 +436,18 @@ CXXFLAGS="%{rpmcxxflags}" \
 # and release 0.zzz.bootstrap if built with bootstrap
 %bootstrap_release() %{!?with_bootstrap:%{1}%{?2:.%{2}}}%{?with_bootstrap:%{!?2:%(expr %{1} - 1)}%{?2:%{1}.%(expr %{2} - 1)}.zzz.bootstrap}
 
+# Alternative kernel type/version
+%_alt_kernel   %{nil}%{?alt_kernel:-%{?alt_kernel}}
+
+# The directory holding Linux kernel sources
+%_kernelsrcdir /usr/src/linux%{_alt_kernel}
+
 # rpm -qf on kernel version.h file
 %__kernel_qf()         %(R=$(cd %{_kernelsrcdir} 2>/dev/null && LC_ALL=C rpm -q --qf '%*' -f include/linux/version.h 2>/dev/null | grep -v 'is not'); echo ${R:-ERROR})
 
 # kernel %{name} and kernel %{epoch}:%{version}-%{release} macro respecing alt_kernel
-%kernel_name   %{expand:%%global kernel_name %(N=%{__kernel_qf %{N}};echo ${N%%-headers})}%kernel_name
-%kernel_version        %{expand:%%global kernel_version %{__kernel_qf %|E?{%{E}:}|%{V}-%{R}}}%kernel_version
+%kernel_name   %(N=%{__kernel_qf %{N}}; echo ${N%%-headers})
+%kernel_version        %{__kernel_qf %|E?{%{E}:}|%{V}-%{R}}
 
 # -n drm to generate kernel%{_alt_kernel}-drm dependency
 %releq_kernel(n:)              %{kernel_name}%{?-n:-%{-n*}} = %{kernel_version}
@@ -446,6 +459,25 @@ CXXFLAGS="%{rpmcxxflags}" \
 %requires_releq_kernel_up(s:n:)                Requires%{-s:(%{-s*})}: %releq_kernel_up
 %requires_releq_kernel_smp(s:n:)       Requires%{-s:(%{-s*})}: %releq_kernel_smp
 
+# kernel version-release handling
+%__kernel_ver   %( \\
+       Z=$([ -f '%{_kernelsrcdir}/include/generated/utsrelease.h' ] && awk -F'"' '/UTS_RELEASE/{print $2}' %{_kernelsrcdir}/include/{linux/version,generated/utsrelease}.h 2>/dev/null || awk -F'"' '/UTS_RELEASE/{print $2}' %{_kernelsrcdir}/include/linux/{version,utsrelease}.h 2>/dev/null); \\
+       Z=${Z:-$(awk -F' = ' '/^VERSION/{v=$2} /^PATCHLEVEL/{p=$2} /^SUBLEVEL/{s=$2} /^EXTRAVERSION/{e=$2} END {printf("%d.%d.%d%s", v, p, s, e)}' %{_kernelsrcdir}/Makefile 2>/dev/null)}; \\
+       echo ${Z:-ERROR}; \\
+)
+
+%_kernel_version_code   %( \\
+       Z=$(awk '/LINUX_VERSION_CODE/{print $3}' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null); \\
+       echo ${Z:-ERROR}; \\
+)
+
+%_kernel_version_magic()        %(echo $((%{1} * 65536 + %{2} * 256 + %{3})))
+
+# `uname -r` used for building/installing kernel modules
+%_kernel_ver   %{__kernel_ver}%{!?_without_dist_kernel:%(echo %{__kernel_ver} | grep -q -e - || echo -%{__kernel_qf %{R}})}
+# package version OR `uname -r` for non-dist kernel to be used in @release field
+%_kernel_ver_str %(echo %{!?_without_dist_kernel:%{__kernel_qf %{V}-%{R}}}%{?_without_dist_kernel:%{__kernel_ver}} | tr '-' '_')
+
 # Requires name = version-release
 %requires_releq()      %{!?1:ERROR}%{?2:ERROR}%{?1:%{!?2:%{expand:%%requires_eq_to -r %1 %1}}}
 # Requires: name = version
@@ -458,29 +490,14 @@ CXXFLAGS="%{rpmcxxflags}" \
 # Requires: name >= version (version based on querying package %2)
 %requires_ge_to(r)     %{!?2:ERROR}%{?3:ERROR}%{?2:%{!?3:%(if ! LC_ALL=C rpm -q --qf 'Requires: %1 >= %|E?{%{E}:}|%{V}%{?-r:-%{R}}\\n' %2 | grep '^Requires:'; then echo "BuildRequires: %2"; fi)}}
 
-# \helper for renaming packages
+# helper for renaming packages
 # %rename old-package
 %rename() \
 Obsoletes: %{1} < %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}} \
-Provides: %{1} = %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}} 
+Provides: %{1} = %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}}
 
 %apache_modules_api %{expand:%%global apache_modules_api %(awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' /usr/include/apache/ap_mmn.h 2>/dev/null || echo ERROR)}%apache_modules_api
 
-# kernel version-release handling
-%__kernel_ver   %{expand:%%global __kernel_ver %( \\
-       Z=$([ -f '%{_kernelsrcdir}/include/generated/utsrelease.h' ] && awk -F'"' '/UTS_RELEASE/{print $2}' %{_kernelsrcdir}/include/{linux/version,generated/utsrelease}.h 2>/dev/null || awk -F'"' '/UTS_RELEASE/{print $2}' %{_kernelsrcdir}/include/linux/{version,utsrelease}.h 2>/dev/null); \\
-       Z=${Z:-$(awk -F' = ' '/^VERSION/{v=$2} /^PATCHLEVEL/{p=$2} /^SUBLEVEL/{s=$2} /^EXTRAVERSION/{e=$2} END {printf("%d.%d.%d%s", v, p, s, e)}' %{_kernelsrcdir}/Makefile 2>/dev/null)}; \\
-       echo ${Z:-ERROR}; \\
-)}%__kernel_ver
-
-%__kernel_rel  %{expand:%%global __kernel_rel %(Z=$(cd %{_kernelsrcdir} 2>/dev/null && LC_ALL=C rpm -qf include/linux/fs.h 2>/dev/null --qf "%{R}" | grep -v "is not"); echo ${Z:-ERROR})}%__kernel_rel
-%__kernel_rpmvr        %{expand:%%global __kernel_rpmvr %(Z=$(cd %{_kernelsrcdir} 2>/dev/null && LC_ALL=C rpm -qf include/linux/fs.h 2>/dev/null --qf "%{V}-%{R}" | grep -v "is not"); echo ${Z:-ERROR})}%__kernel_rpmvr
-%_kernel_ver   %{expand:%%global _kernel_ver %{__kernel_ver}%{?with_dist_kernel:%(echo %{__kernel_ver} | grep -q -e - || echo -%{__kernel_rel})}}%_kernel_ver
-%_kernel_ver_str %{expand:%%global _kernel_ver_str %(echo %{!?_without_dist_kernel:%{__kernel_rpmvr}}%{?_without_dist_kernel:%{__kernel_ver}} | sed -e 's/-/_/g')}%_kernel_ver_str
-
-# `uname -r` to be used in @release field
-%_kernel_vermagic      %{expand:%%global _kernel_vermagic %(echo %{_kernel_ver} | sed -e 's/-/_/g')}%_kernel_vermagic
-
 # sgml macros
 %xmlcat_add()          /usr/bin/xmlcatalog --noout --add nextCatalog \"\" %1 /etc/xml/catalog ;
 %xmlcat_del()          /usr/bin/xmlcatalog --noout --del %1 /etc/xml/catalog ;
@@ -951,8 +968,11 @@ fi; \
 # NOTE: error output must be empty. otherwise can't build pecl packages if no php*-devel is installed
 %php_suffix                            %{expand:%%global php_suffix %(c=$(php-config --sysconfdir 2>/dev/null) || echo '' && echo ${c#/etc/php})%%{nil}}%php_suffix
 
+# phpXY, version always present for using current php version (in regards of php*-devel package)
+%php_versuffix                 %{expand:%%global php_versuffix %((IFS=.; set -- $(php-config --version); echo $1$2))%%{nil}}%php_versuffix
+
 # php cli. version that php headers are installed for
-%__php                                 /usr/bin/%{php_name}
+%__php                                 /usr/bin/php%{php_versuffix}
 
 # helper macro
 %__php_api_requires(v:) Requires: %{php_name}(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}
@@ -1068,7 +1088,7 @@ fi \
 
 # Python 3.x
 # python main version
-%__python3                     python3
+%__python3                     /usr/bin/python3
 %py3_ver                       %{expand:%%global py3_ver %(%{__python3} -c "import sys; print(sys.version[:3])" 2>/dev/null || echo ERROR)}%py3_ver
 
 # directories
@@ -1090,11 +1110,11 @@ fi \
 # BuildRequires: rpmbuild(macros) >= 1.634
 %nodejs_libdir         /usr/lib/node_modules
 
-# bash-compltion 2.0 compltions d ir
+# bash-completion 2.0 completions dir
 # Requirements:
 # BuildRequires: rpmbuild(macros) >= 1.673
 # Requires:    bash-completion >= 2.0
-%bash_compdir          /usr/shar/bash-completion/completions
+%bash_compdir          /usr/share/bash-completion/completions
 
 # Hardlink binary identical .pyc and .pyo files
 %__spec_install_post_py_hardlink {\
@@ -1490,7 +1510,7 @@ echo -e "</dependencies>\\n" >> %{_mavendepmapdir}/maven2-depmap.xml
 # JAVA macros specific for PLD
 
 # Directory for tomcat context configuration files
-%_tomcatconfdir        %{_sharedstatedir}/tomcat/conf/Catalina/localhost
+%_tomcatconfdir        /etc/tomcat/Catalina/localhost
 
 # Tomcat cache path
 %_tomcatcachedir %{_sharedstatedir}/tomcat/work/Catalina/localhost
@@ -1703,17 +1723,17 @@ done \
 %build_kernel_modules(p:P:m:C:c)                                                                       \
 %{!?-m:%{error:%{0}: Required module name/list missing} exit 1}                \
                                                                                                                                        \
-%define Opts                                                                                                           \\\\\\\
+%define Opts                                                                                                           \\\\\\\
 %if "%{_target_base_arch}" != "%{_host_base_arch}"                                     \\\
        %if "%{_host_base_arch}" == "x86_64" && "%{_target_base_arch}" == "i386" \\\
-       CC="%{kgcc}" ARCH=%{_target_base_arch}                                                  \\\
+       CC="%{__cc}" ARCH=%{_target_base_arch}                                                  \\\
        %else                                                                                                                   \\\
        ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux- \\\
        %endif                                                                                                                  \\\
 %else                                                                                                                          \\\
-       CC="%{kgcc}"                                                                                                    \\\
+       CC="%{__cc}"                                                                                                    \\\
 %endif                                                                                                                         \
-%define        MakeOpts HOSTCC="%{kgcc}" SYSSRC=%{_kernelsrcdir} SYSOUT=$PWD/o \\\\\\\
+%define        MakeOpts HOSTCC="%{__cc}" SYSSRC=%{_kernelsrcdir} SYSOUT=$PWD/o \\\\\\\
                O=$PWD/o %{?with_verbose:V=1} %{Opts}                                           \
                                                                                                                                        \
 %{?-C:cd %{-C*}}                                                                                                       \
@@ -1729,7 +1749,7 @@ compile() {                                                                                                                       \
        ln -sf %{_kernelsrcdir}/Module.symvers o/Module.symvers                 \
        if [ -f %{_kernelsrcdir}/include/generated/autoconf.h ]; then   \
                ln -sf %{_kernelsrcdir}/include/generated/autoconf.h o/include/generated/autoconf.h \
-               ln -s ../generated/autoconf.h o/include/linux/autoconf.h        \
+               ln -s ../generated/autoconf.h o/include/linux/autoconf.h        \
        else                                                                                                                    \
                ln -sf %{_kernelsrcdir}/include/linux/autoconf.h o/include/linux/autoconf.h \
        fi                                                                                                                              \
@@ -1756,7 +1776,27 @@ compile() {                                                                                                                      \
                M=$PWD CONSTIFY_PLUGIN="" %{MakeOpts}                                           \
 %{?-C:cd -}                                                                                                                    \
 }                                                                                                                                      \
-compile_old() {                                                                                                                \
+compile %{*}                                                                                                           \
+%{nil}
+
+%build_kernel_modules_compat(p:P:m:C:c)                                                                \
+%{!?-m:%{error:%{0}: Required module name/list missing} exit 1}                \
+                                                                                                                                       \
+%define Opts                                                                                                           \\\\\\\
+%if "%{_target_base_arch}" != "%{_host_base_arch}"                                     \\\
+       %if "%{_host_base_arch}" == "x86_64" && "%{_target_base_arch}" == "i386" \\\
+       CC="%{__cc}" ARCH=%{_target_base_arch}                                                  \\\
+       %else                                                                                                                   \\\
+       ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux- \\\
+       %endif                                                                                                                  \\\
+%else                                                                                                                          \\\
+       CC="%{__cc}"                                                                                                    \\\
+%endif                                                                                                                         \
+%define        MakeOpts HOSTCC="%{__cc}" SYSSRC=%{_kernelsrcdir} SYSOUT=$PWD/o \\\\\\\
+               O=$PWD/o %{?with_verbose:V=1} %{Opts}                                           \
+                                                                                                                                       \
+%{?-C:cd %{-C*}}                                                                                                       \
+compile() {                                                                                                                    \
        local L="<" PATCH_SH;                                                                                   \
        [[ '%{*}' != *$L$L* ]] || PATCH_SH="set -x -e;$(cat)"                   \
        set -e -x                                                                                                               \
@@ -1771,7 +1811,7 @@ for cfg in ${cfgs:-dist}; do                                        \
        ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers    \
        if [ -f %{_kernelsrcdir}/include/generated/autoconf-$cfg.h ]; then      \
                ln -sf %{_kernelsrcdir}/include/generated/autoconf-$cfg.h o/include/generated/autoconf.h \
-               ln -s ../generated/autoconf.h o/include/linux/autoconf.h \
+               ln -s ../generated/autoconf.h o/include/linux/autoconf.h        \
        else                                                                                                                    \
                ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h \
        fi                                                                                                                              \
@@ -1792,7 +1832,7 @@ for cfg in ${cfgs:-dist}; do                                        \
        %endif                                                                                                                  \
                                                                                                                                        \
        %{!?-c:%{__make} -C %{_kernelsrcdir} clean                                              \\\
-               RCS_FIND_IGNORE="-name '*.[ks]o' -o"                                                    \\\
+               RCS_FIND_IGNORE="-name '*.[ks]o' -o"                                            \\\
                ${1+"$@"}                                                                                                       \\\
                M=$PWD %{MakeOpts}}                                                                                     \
                                                                                                                                        \
@@ -1806,11 +1846,7 @@ for cfg in ${cfgs:-dist}; do                                        \
 done                                                                                                                           \
 %{?-C:cd -}                                                                                                                    \
 }                                                                                                                                      \
-if [ -r "%{_kernelsrcdir}/.config" ]; then     \
-       compile %{*}                                                    \
-else                                                                           \
-       compile_old %{*}                                                \
-fi                                                                                     \
+compile %{*}                                                                                                           \
 %{nil}
 
 
@@ -1829,14 +1865,19 @@ fi                                                                                      \
 #              with same name exists in kernel already
 #  -n <file> -- name of modprobe config file to use (without .conf extension)
 #              for defining aliases, only useful with -s
+#  -D <directory> -- DESTDIR, base directory for installed files,
+#              defaults to RPM_BUILD_ROOT
 
-%install_kernel_modules(m:d:s:n:)                                                                      \
+%install_kernel_modules(m:d:s:n:D:)                                                                    \
 %{!?-m:%{error:%{0}: Required module name (-m) missing}exit 1}         \
 %{!?-d:%{error:%{0}: Required module directory missing}exit 1}         \
 %{?-n:%{!?-s:%{error:%{0}: Modprobe .conf file requires module suffix}exit 1}} \
                                                                                                                                        \
-%define KernelD $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}                     \
-%define ModprobeD $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver} \
+INSTALLROOT=%{-D*}                                                                                                     \
+[ -n "$INSTALLROOT" ] || INSTALLROOT=$RPM_BUILD_ROOT                           \
+                                                                                                                                       \
+%define KernelD $INSTALLROOT/lib/modules/%{_kernel_ver}                                \
+%define ModprobeD $INSTALLROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver} \
                                                                                                                                        \
 __install_kernel_modules() {                                                                           \
 %{!?debug:set +x;}                                                                                                     \
@@ -1849,7 +1890,22 @@ for MODULE in {%{-m*},}; do                                                                                      \
                echo "alias ${MNAME} ${MNAME}-%{-s*}" >> %{ModprobeD}/%{-n*}.conf}      \
 done                                                                                                                           \
 }                                                                                                                                      \
-__install_kernel_modules_old() {                                                                       \
+__install_kernel_modules                                                                                       \
+unset INSTALLROOT                                                                                                      \
+%{nil}
+
+%install_kernel_modules_compat(m:d:s:n:D:)                                                     \
+%{!?-m:%{error:%{0}: Required module name (-m) missing}exit 1}         \
+%{!?-d:%{error:%{0}: Required module directory missing}exit 1}         \
+%{?-n:%{!?-s:%{error:%{0}: Modprobe .conf file requires module suffix}exit 1}} \
+                                                                                                                                       \
+INSTALLROOT=%{-D*}                                                                                                     \
+[ -n "$INSTALLROOT" ] || INSTALLROOT=$RPM_BUILD_ROOT                           \
+                                                                                                                                       \
+%define KernelD $INSTALLROOT/lib/modules/%{_kernel_ver}                                \
+%define ModprobeD $INSTALLROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver} \
+                                                                                                                                       \
+__install_kernel_modules() {                                                                           \
 %{!?debug:set +x;}                                                                                                     \
 local cfgs='%{?with_dist_kernel:%{?with_smp: smp}%{?with_up: up}}%{!?with_dist_kernel: nondist}' \
                                                                                                                                        \
@@ -1866,32 +1922,49 @@ for MODULE in {%{-m*},}; do                                                                                     \
        done                                                                                                                    \
 done                                                                                                                           \
 }                                                                                                                                      \
-if [ -r "%{_kernelsrcdir}/.config" ]; then                                                     \
-       __install_kernel_modules                                                                                \
-else                                                                                                                           \
-       __install_kernel_modules_old                                                                    \
-fi                                                                                                                                     \
+__install_kernel_modules                                                                                       \
+unset INSTALLROOT                                                                                                      \
 %{nil}
 
 # patchset macros
+# generate SourceX urls from range START STOP
+# Format can be SINGLE format char of %e, %f, %g, see seq(1)
+# The sources start from 10000
+#
 # Author: Elan Ruusamäe <glen@pld-linux.org>
 #
 # Usage:
 #   %patchset_source -f <seq(1) format> <start> [<end>]
 #   %patchset_patch <start> [<end>]
-#
 # If <end> is omited, it is assumed to be <start>.
 #
 # For example in preamble:
 #  %patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 33 44
 # and in %prep:
 #  %patchset_patch 33 44
-
-# generate SourceX urls from range START STOP
-# Format can be SINGLE format char of %e, %f, %g, see seq(1)
-# The sources start from 10000
-%patchset_source(f:b:) %(
-       base=%{-b*}%{!-b*:10000};
+#
+# Using sources list:
+#   BuildRequires:     rpmbuild(macros) >= 1.426
+#   %patchset_source -f <url> -s <filelist>
+#   %patchset_patch -s <filelist>
+# For example (ncurses):
+#   BuildRequires:     rpmbuild(macros) >= 1.683
+#   %patchset_source -f ftp://dickey.his.com/ncurses/%{basever}/ -s sources
+#   %patchset_patch -s sources -p1
+#
+
+%patchset_source(f:b:s:) %(
+       base=%{-b*}%{!-b*:10000}
+%{-s:
+       baseurl='%{-f*}'
+       filelist='%{-s*}'
+       i=$base
+       while read checksum file; do
+               printf "Patch%d: %s%s\\n" $i "$baseurl" "$file"
+               i=$((i+1))
+       done < $filelist
+}
+%{!-s:
        start=$(expr $base + %1);
        end=$(expr $base + %{?2}%{!?2:%{1}});
        # we need to call seq twice as it doesn't allow two formats
@@ -1899,18 +1972,31 @@ fi                                                                                                                                      \
        seq -f '%{-f*}' %1 %{?2}%{!?2:%{1}} > %{tmpdir}/__ps2;
        paste %{tmpdir}/__ps{1,2};
        rm -f %{tmpdir}/__ps{1,2};
+}
 ) \
 %{nil}
 
 # apply sources from %patchset_source
 # -p specify -pX for %patch line
 # -b base offset: defaults to 10000
-%patchset_patch(f:p:b:) %(
-       base=%{-b*}%{!-b*:10000};
+# -s filelist to read files from
+%patchset_patch(f:p:b:s:) %(
+       base=%{-b*}%{!-b*:10000}
+       patchlevel=%{-p*:-p%{-p*}}
+%{-s:
+       filelist='%{-s*}'
+       i=$base
+       while read checksum file; do
+               printf "patch%d %s\\n" $i "$patchlevel" | sed -e s,^,%%,
+               i=$((i+1))
+       done < $filelist
+}
+%{!-s:
        start=$(expr $base + %1);
        end=$(expr $base + %{?2}%{!?2:%{1}});
        echo ": patchset_patch %1%{?2: to %2}";
-       seq -f 'patch%g %{-p*:-p%{-p*}}' $start $end | sed -e s,^,%%,;
+       seq -f "patch%g $patchlevel" $start $end | sed -e s,^,%%,;
+}
 ) \
 %{nil}
 
@@ -2098,11 +2184,11 @@ else: \
 #
 # Requirements:
 # BuildRequires:       sed >= 4.0
-# BuildRequires:       rpmbuild(macros) >= 1.565
+# BuildRequires:       rpmbuild(macros) >= 1.674
 
 # NB: make sure this macro stays on one line
 # NB: make sure it includes newline escape
-%undos(f:i)    %{-f:%{__find} -regextype posix-extended -%{-i:i}regex '^.+\\.(%(echo %{-f*} | tr ',' '|'))$' -print0 | xargs -0} %{__sed} -i -e 's,\\r$,,' %* \
+%undos(f:i)    %{-f:%{__find} -type f -regextype posix-extended -%{-i:i}regex '^.+\\.(%(echo %{-f*} | tr ',' '|'))$' -print0 | xargs -0} %{__sed} -i -e 's,\\r$,,' %* \
 %{nil}
 
 # Hook to register nagios object based plugins in Nagios NRPE daemon config.
@@ -2124,20 +2210,25 @@ else: \
 # Requirements:
 # Requires:                    grep
 # Requires:                    sed >= 4.0
-# BuildRequires:       rpmbuild(macros) >= 1.552
+# BuildRequires:       rpmbuild(macros) >= 1.685
 %nagios_nrpe(a:d:c:f:) {\
-       m=$(md5sum < /etc/nagios/nrpe.cfg); \
+       if %{__grep} -q '^include_dir=/etc/nagios/nrpe.d' /etc/nagios/nrpe.cfg && [ -d /etc/nagios/nrpe.d ]; then \
+               file=/etc/nagios/nrpe.d/%{-a*}%{-d*}.cfg; \
+       else \
+               file=/etc/nagios/nrpe.cfg; \
+       fi; \
+       m=$(test -f $file && md5sum < $file); \
        %{-a:# on -a and config exists \
        if [ -f /etc/nagios/nrpe.cfg ]; then \
-               if ! %{__grep} -q '^command\[%{-a*}\]' /etc/nagios/nrpe.cfg; then \
-                               %{__sed} -ne 's/^[ \t]*command_line[ \t]\+\(.\+\)/command[%{-a*}]=\1/p' %{-f*} >> /etc/nagios/nrpe.cfg; \
+               if [ ! -f $file ] || ! %{__grep} -q '^command\[%{-a*}\]' $file; then \
+                       %{__sed} -ne 's/^[ \t]*command_line[ \t]\+\(.\+\)/command[%{-a*}]=\1/p' %{-f*} >> $file; \
                fi; \
        fi;} \
        %{-d:# on package remove, -d and config exists \
-       if [ "$1" = "0" -a -f /etc/nagios/nrpe.cfg ]; then \
-               %{__sed} -i -e '/^[ \t]*command\[%{-d*}\]/d' /etc/nagios/nrpe.cfg; \
+       if [ "$1" = "0" -a -f $file ]; then \
+               %{__sed} -i -e '/^[ \t]*command\[%{-d*}\]/d' $file; \
        fi;} \
-       if [ "$m" != "$(md5sum < /etc/nagios/nrpe.cfg)" ]; then \
+       if [ "$m" != "$(md5sum < $file)" ]; then \
                %service -q nrpe restart; \
        fi; \
 }%{nil}
@@ -2169,6 +2260,7 @@ fi; \
 # pre/post script for -upstart subpackages
 #
 # Author: Jacek Konieczny <jajcus@jajcus.net>
+# Author: Elan Ruusamäe <glen@pld-linux.org>
 #
 # Usage:
 #      %upstart_post service_name
@@ -2182,15 +2274,16 @@ fi; \
 # %upstart_postun %{name}
 #
 # Requirements:
-# BuildRequires:       rpmbuild(macros) >= 1.560
+# BuildRequires:       rpmbuild(macros) >= 1.690
 # Requires:                    rc-scripts >= 0.4.3
 
 # migrate from init script to upstart job
 %upstart_post() \
-       if [ -f /var/lock/subsys/%1 ]; then \
+       if [ -x /sbin/initctl ] && [ -f /var/lock/subsys/%1 ]; then \
                /sbin/service --no-upstart %1 stop \
                /sbin/service %1 start \
-       fi
+       fi \
+%{nil}
 
 # restart the job after upgrade or migrate to init script on removal
 # cannot be stopped with 'service' as /etc/init/$name.conf may be missing
@@ -2199,7 +2292,8 @@ fi; \
        if [ -x /sbin/initctl ] && /sbin/initctl status %1 2>/dev/null | grep -q 'running' ; then \
                /sbin/initctl stop %1 >/dev/null 2>&1 \
                [ -f /etc/rc.d/init.d/%1 -o -f /etc/init/%1.conf ] && { echo -n "Re-"; /sbin/service %1 start; }; \
-       fi
+       fi \
+%{nil}
 
 # Haskell Macros
 # BuildRequires:  rpmbuild(macros) >= 1.608
@@ -2327,6 +2421,18 @@ want_enable_service() { \
 %{nil}
 
 %systemdunitdir /lib/systemd/system
+%systemduserunitdir /usr/lib/systemd/user
 %systemdtmpfilesdir /usr/lib/tmpfiles.d
 
+#-----------------------------------------------------------------
+# Update hardware database index
+#
+# Requirements:
+# BuildRequires:       rpmbuild(macros) >= 1.691
+# Requires:            udev-core >= 1:196
+
+%udev_hwdb_update() \
+/sbin/udevadm hwdb --update >/dev/null 2>&1 || : \
+%{nil}
+
 # EOF
This page took 0.084418 seconds and 4 git commands to generate.