X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.macros;h=a886f53c64205e33b1218fcffccc2c78a511f23c;hb=968c9e061bbddb3fccdf4787db5dbae6a09d4e39;hp=351e41adf388268f87923b6d2fddfc27e2bebe20;hpb=dd7fb1c7504355c0d60fe52e556a7f612b1d57be;p=packages%2Frpm-build-macros.git

diff --git a/rpm.macros b/rpm.macros
index 351e41a..a886f53 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -10,10 +10,6 @@
 %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
@@ -30,12 +26,12 @@
 #
 # if you want to disable parallel build do:
 # echo '%__jobs %{nil}' >> ~/.rpmmacros
-%__jobs		%{expand:%%global __jobs %(_NCPUS=$(/usr/bin/getconf _NPROCESSORS_ONLN); [ "$_NCPUS" -gt 2 ] && echo $(($_NCPUS / 2)))%%{nil}}%__jobs
+%__jobs		%{expand:%%global __jobs %(_NCPUS=$(/usr/bin/getconf _NPROCESSORS_ONLN); [ "$_NCPUS" -gt 3 ] && echo $(($_NCPUS / 2)))%%{nil}}%__jobs
 
 # expands to -jN if %__jobs has a value
 %_smp_mflags	%{expand:%%global _smp_mflags %(jobs=%{__jobs}; echo ${jobs:+-j$jobs}%%{nil})}%_smp_mflags
 
-%__make		/usr/bin/make %{?_smp_mflags}
+%__make		/usr/bin/make %{?_make_opts} %{?_smp_mflags}
 %__scons	/usr/bin/scons %{?_smp_mflags}
 %__waf		/usr/bin/waf %{?_smp_mflags}
 %__cmake	/usr/bin/cmake
@@ -89,10 +85,10 @@
 %_specdir       %{expand:%%global _specdir %([ ! -d %{_topdir}/SPECS ] && echo %{_topdir}/%{name} || echo %{_topdir}/SPECS)}%_specdir
 %_sourcedir		%{expand:%%global _sourcedir %([ ! -d %{_topdir}/SOURCES ] && echo %{_specdir} || echo %{_topdir}/SOURCES)}%_sourcedir
 
-# BUILD/RPMS/SRPMS are one same level by default as packages dir, if these exist
+# BUILD/RPMS/SRPMS are on same level by default as packages dir, if these exist
 # if they don't exist assume we are having custom topdir (which is not named as
 # "packages", i.e ~/rpm/kde/{kdelibs,BUILD/RPMS/SRPMS})
-# NOTE: readlink fails if some parent dir is not readable (/home/services/builder for example can't read /home/services), therfore the extra echo
+# NOTE: readlink fails if some parent dir is not readable (/home/services/builder for example can't read /home/services), therefore the extra echo
 %_builddir		%{expand:%%global _builddir %(if [ -d %{_topdir}/BUILD ]; then echo %{_topdir}/BUILD; else readlink -m %{_topdir}/../BUILD || echo %{_topdir}/../BUILD; fi)}%_builddir
 %_rpmdir		%{expand:%%global _rpmdir %(if [ -d %{_topdir}/RPMS ]; then echo %{_topdir}/RPMS; else readlink -m %{_topdir}/../RPMS || echo readlink -m %{_topdir}/../RPMS; fi)}%_rpmdir
 %_srcrpmdir		%{expand:%%global _srcrpmdir %(if [ -d %{_topdir}/SRPMS ]; then echo %{_topdir}/SRPMS; else readlink -m %{_topdir}/../SRPMS || echo readlink -m %{_topdir}/../SRPMS; fi)}%_srcrpmdir
@@ -127,8 +123,8 @@
 # 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;	\
 		};							\
@@ -186,8 +182,8 @@
 %_preserve_env_base	PATH HOME TMP TMPDIR SSH_AUTH_SOCK
 
 # "env -i" must end in first line of expaned macros because it's used as first line of shell script (#! env...)
-%_clean_env		%{!?_preserve_env:%global _preserve_env %{nil}}%{expand:%%global _preserve_env %{_preserve_env} %_preserve_env_base} env -i %(awk -vq="'" -vqq="\\"'\\"" -vq2q="'\\"'" 'BEGIN {
-	split("%{?_preserve_env}", P);
+%_clean_env env -i %(awk -vq="'" -vqq="\\"'\\"" -vq2q="'\\"'" 'BEGIN {
+	split("%{?_preserve_env:%_preserve_env %_preserve_env_base}%{!?_preserve_env:%_preserve_env_base}", P);
 	for (i in P) {
 		p = P[i];
 		if (!ENVIRON[p] || d[p]) {
@@ -212,6 +208,16 @@
 	}
 }')
 
+# 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; \
@@ -225,7 +231,7 @@
  %{?__cxx:CXX="%{__cxx}" ; export CXX ; } \
  %{?configuredir:%{configuredir}}%{!?configuredir:.}/configure \
 	--host=%{_target_platform} \
- 	--prefix=%{_prefix} \
+	--prefix=%{_prefix} \
 	--exec-prefix=%{_exec_prefix} \
 	--bindir=%{_bindir} \
 	--sbindir=%{_sbindir} \
@@ -242,27 +248,50 @@
 	%{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_BINDIR:PATH=%{_bindir} \\\
+	-DCMAKE_INSTALL_SBINDIR:PATH=%{_sbindir} \\\
+	-DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \\\
+	-DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \\\
+	-DCMAKE_INSTALL_SHAREDSTATEDIRPATH:PATH=%{_sharedstatedir} \\\
+	-DCMAKE_INSTALL_LOCALSTATEDIRPATH:PATH=%{_localstatedir} \\\
 	-DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
+	-DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \\\
+	-DCMAKE_INSTALL_OLDINCLUDEDIR:PATH=%{_includedir} \\\
+	-DCMAKE_INSTALL_DATAROOTDIR:PATH=%{_datadir} \\\
+	-DCMAKE_INSTALL_DATADIR:PATH=%{_datadir} \\\
+	-DCMAKE_INSTALL_INFODIR:PATH=%{_infodir} \\\
+	-DCMAKE_INSTALL_LOCALEDIR:PATH=%{_localedir} \\\
+	-DCMAKE_INSTALL_MANDIR:PATH=%{_mandir} \\\
+	-DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir} \\\
 	-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}}" \\\
 %if "%{_lib}" == "lib64" \
 	-DLIB_SUFFIX=64 \\\
+%endif \
+%if "%{_lib}" == "libx32" \
+	-DLIB_SUFFIX=x32 \\\
 %endif \
 	-DBUILD_SHARED_LIBS:BOOL=ON \\\
 %{nil}
@@ -287,6 +316,7 @@ CXX="%{__cxx}" \
 CPP="%{__cpp}" \
 CFLAGS="%{rpmcflags}" \
 CXXFLAGS="%{rpmcxxflags}" \
+LINKFLAGS="%{rpmldflags}" \
 %{__waf} \
 }
 
@@ -295,7 +325,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 +335,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 +433,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,16 +453,6 @@ 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}
 
-# -n drm to generate kernel%{_alt_kernel}-drm dependency
-%releq_kernel(n:)		%{expand:%%global releq_kernel %(R=$(cd %{_kernelsrcdir} 2>/dev/null && LC_ALL=C rpm -q --qf '%{N}%{?-n:-%{-n*}} = %|E?{%{E}:}|%{V}-%{R}' -f include/linux/version.h 2>/dev/null | grep -v 'is not' | sed -e 's:-headers::;s:-config::'); echo ${R:-ERROR})}%releq_kernel
-%releq_kernel_up(n:)	%{expand:%%global releq_kernel_up %(R=$(cd %{_kernelsrcdir} 2>/dev/null && LC_ALL=C rpm -q --qf '%{N}%{?-n:-%{-n*}}-up = %|E?{%{E}:}|%{V}-%{R}' -f include/linux/version.h 2>/dev/null | grep -v 'is not' | sed -e 's:-headers::;s:-config::'); echo ${R:-ERROR})}%releq_kernel_up
-%releq_kernel_smp(n:)	%{expand:%%global releq_kernel_smp %(R=$(cd %{_kernelsrcdir} 2>/dev/null && LC_ALL=C rpm -q --qf '%{N}%{?-n:-%{-n*}}-smp = %|E?{%{E}:}|%{V}-%{R}' -f include/linux/version.h 2>/dev/null | grep -v 'is not' | sed -e 's:-headers::;s:-config::'); echo ${R:-ERROR})}%releq_kernel_smp
-
-# -s post to generate Requires(post) dependency
-%requires_releq_kernel(s:n:)		Requires%{-s:(%{-s*})}: %releq_kernel
-%requires_releq_kernel_up(s:n:)		Requires%{-s:(%{-s*})}: %releq_kernel_up
-%requires_releq_kernel_smp(s:n:)	Requires%{-s:(%{-s*})}: %releq_kernel_smp
-
 # Requires name = version-release
 %requires_releq()	%{!?1:ERROR}%{?2:ERROR}%{?1:%{!?2:%{expand:%%requires_eq_to -r %1 %1}}}
 # Requires: name = version
@@ -451,29 +465,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 ;
@@ -539,10 +538,10 @@ Provides: %{1} = %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}
 			# verify that .so links point to existing files (not allowed to point to "other package") \
 			# TODO: iterate over all man dirs, but in Th there is only one true man dir \
 			err=$(grep -rl '^\.so ' "$RPM_BUILD_ROOT$i" | while read doc; do \
-				l=$(cat "$doc"); \
+				l=$(grep -r '^\.so ' "$doc"); \
 				l=${l#.so }; \
 				d=$(dirname $doc); \
-				test -e $RPM_BUILD_ROOT$i/$l || test -e $d/$l || echo "  ${doc#$RPM_BUILD_ROOT} points to inexistent manpage: $l"; \
+				test -e $RPM_BUILD_ROOT$i/$l || test -e $d/$(basename $l) || echo "  ${doc#$RPM_BUILD_ROOT} points to inexistent manpage: $l"; \
 			done); \
 			test "$err" != "" && { echo >&2 "Man page link errors:"; echo >&2 "$err"; exit 1; }; \
 			find "$RPM_BUILD_ROOT$i" -type f -size +%{_min_compress_bytes}c -print | xargs -r %{__gzip} -9nf; \
@@ -653,7 +652,7 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
 		while read file; do \
 			rpath= ; \
 			chmod u+w "$file"; \
-			for dir in $(chrpath -l "$file" | awk '/R(|UN)PATH=/ { gsub(/.*RPATH=/,""); gsub(/.*RUNPATH=/,""); gsub(/:/," "); print $0 }'); do \
+			for dir in $(chrpath -l "$file" | awk '/(R|RUN)PATH=/ { gsub(/.*RPATH=/,""); gsub(/.*RUNPATH=/,""); gsub(/:/," "); print $0 }'); do \
 					case $dir in \
 					'$ORIGIN' ) \
 						if [ "$rpath" = "" ] ; then rpath="$dir" ; \
@@ -729,25 +728,37 @@ __spec_install_post_check_tmpfiles() { \
 }; __spec_install_post_check_tmpfiles }}
 
 #-----------------------------------------------------------------
-# Find and gzip all kernel modules
+# Verify that scripts have reasonable shebangs
+# Test spec: see "test/spec_install_post_check_shebangs" branch on packages/test.spec
 #
-# Requires: find
+#%no_install_post_check_shebangs 1
 #
-#%no_install_post_compress_modules	1
-%__spec_install_post_compress_modules { \
-%{!?no_install_post_compress_modules: __spec_install_post_compress_modules() { \
+%__spec_install_post_check_shebangs { \
+__spec_install_post_check_shebangs() { \
 %{!?debug:set +x;} \
-	if [ -d $RPM_BUILD_ROOT/lib/modules ]; then \
-		q=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type f -print); \
-		if [ "$q" ]; then \
-			printf "Compress %d kernel modules..." $(echo "$q" | wc -l); \
-			echo "$q" | xargs -r %{__gzip} -9nf; \
-			echo "DONE"; \
-			find $RPM_BUILD_ROOT/lib/modules -name '*o' -type l -printf "%p %l\n" | \
-			while read a b; do ln -sf $b.gz $a.gz; rm -f $a; done; \
-		fi; \
-	fi; \
-}; __spec_install_post_compress_modules } }
+	fail=0; \
+	echo "Checking script shebangs..."; \
+	for f in $(find $RPM_BUILD_ROOT -type f -perm -500 -print) ; do \
+		shebang=$(sed -e'1s/#! *\(.*\)/\1/;t;d;q' "$f") ; \
+		f=${f##$RPM_BUILD_ROOT}; \
+		case "$shebang" in \
+			"%{__python}"|"%{__python3}"|"%{__python} "*|"%{__python3} "* \
+			|"/usr/bin/python%{py_ver}"|"/usr/bin/python%{py_ver} "* \
+			|"/usr/bin/python%{py3_ver}"|"/usr/bin/python%{py3_ver} "*) \
+				;; \
+			"/usr/bin/env python"*|"/usr/bin/python"|"/usr/bin/python "*) \
+				echo "$f starts with '#!$shebang', should be '#!%{__python}' or '#!%{__python3}'" >&2;\
+				fail=1 ; \
+				;; \
+			"/usr/bin/env "*) \
+				echo "$f starts with '#!$shebang', should be explicit interpreter path" >&2;\
+				fail=1 ; \
+				;; \
+			*) ;;\
+		esac ; \
+	done ; \
+	echo " DONE" ; \
+}; %{!?no_install_post_check_shebangs:__spec_install_post_check_shebangs} }
 
 # Remove common Perl files we don't package
 %__spec_install_post_perl_clean {\
@@ -860,6 +871,9 @@ fi; \
 	%{?_noautoreq: %{_noautoreq}} \
 	%{?_noautoreq_pear: %{__noauto_regexp_helper -p pear %{_noautoreq_pear}}} \
 	%{?_noautoreq_perl: %{__noauto_regexp_helper -p perl %{_noautoreq_perl}}} \
+	%{?_noautoreq_java: %{__noauto_regexp_helper -p java %{_noautoreq_java}}} \
+	%{?_noautoreq_pyegg: %{__noauto_regexp_helper -p pythonegg %{_noautoreq_pyegg}}} \
+	%{?_noautoreq_py3egg: %{__noauto_regexp_helper -p python3egg %{_noautoreq_py3egg}}} \
 	%{nil}
 
 # helper for wrapping _noautoreq between perl() or pear()
@@ -868,7 +882,14 @@ fi; \
 # BuildRequires:	rpmbuild(macros) >= 1.654
 # %define _noautoreq_pear Excluded.php PEAR/Something.php
 # %define _noautoreq_perl Apache::.*
-%__noauto_regexp_helper(p:) %(echo "%*" | awk 'BEGIN{RS=" "}{printf("%{-p*}\\\\\\(%%s\\\\\\) ", $1)}')
+# BuildRequires:	rpmbuild(macros) >= 1.672
+# %define _noautoreq_java ClassDataVersion
+#
+%__noauto_regexp_helper(p:) %(echo "%*" | awk 'BEGIN{RS=" "}{printf("%{-p*}%{__qchar}(%%s%{__qchar}) ", $1)}')
+# detect quote character runtime
+%__qchar_4 \\\\%{nil}
+%__qchar_5 \\\\\\%{nil}
+%__qchar %{expand:%%global __qchar %%__qchar_%(echo %{_rpmversion} | cut -c1)}%__qchar
 
 #%_noautocompressdoc	%{nil}
 #
@@ -897,21 +918,33 @@ fi; \
 # Ruby
 %__ruby				/usr/bin/ruby
 
-%ruby_archdir		%{expand:%%global ruby_archdir %(%{__ruby} -r rbconfig -e 'print Config::CONFIG["archdir"]' 2>/dev/null || echo ERROR)}%ruby_archdir
-%ruby_libdir		%{expand:%%global ruby_libdir %(%{__ruby} -r rbconfig -e 'print Config::CONFIG["rubylibdir"]' 2>/dev/null || echo ERROR)}%ruby_libdir
-%ruby_ridir			%{expand:%%global ruby_ridir %(%{__ruby} -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")' 2>/dev/null || echo ERROR)}%ruby_ridir
-%ruby_rubylibdir	%{expand:%%global ruby_rubylibdir %(%{__ruby} -r rbconfig -e 'print Config::CONFIG["rubylibdir"]' 2>/dev/null || echo ERROR)}%ruby_rubylibdir
-%ruby_vendorarchdir	%{expand:%%global ruby_vendorarchdir %(%{__ruby} -r rbconfig -e 'print Config::CONFIG["vendorarchdir"]' 2>/dev/null || echo ERROR)}%ruby_vendorarchdir
-%ruby_vendorlibdir	%{expand:%%global ruby_vendorlibdir %(%{__ruby} -r rbconfig -e 'print Config::CONFIG["vendorlibdir"]' 2>/dev/null || echo ERROR)}%ruby_vendorlibdir
-%ruby_sitearchdir	%{expand:%%global ruby_sitearchdir %(%{__ruby} -r rbconfig -e 'print Config::CONFIG["sitearchdir"]' 2>/dev/null || echo ERROR)}%ruby_sitearchdir
-%ruby_sitedir		%{expand:%%global ruby_sitedir %(%{__ruby} -r rbconfig -e 'print Config::CONFIG["sitedir"]' 2>/dev/null || echo ERROR)}%ruby_sitedir
-%ruby_sitelibdir	%{expand:%%global ruby_sitelibdir %(%{__ruby} -r rbconfig -e 'print Config::CONFIG["sitelibdir"]' 2>/dev/null || echo ERROR)}%ruby_sitelibdir
+# Ruby ABI version
+# NOTE: %ruby_version may be empty, depending how Ruby was built
+%ruby_abi			%{expand:%%global ruby_abi %(%{__ruby} -r rbconfig -e 'print [RbConfig::CONFIG["MAJOR"], RbConfig::CONFIG["MINOR"]].join(".")' 2>/dev/null || echo ERROR)}%ruby_abi
+
+# get rbconfig parameter
+%__ruby_rbconfig()	%(%{__ruby} -r rbconfig -e 'print RbConfig::CONFIG["%1"]' 2>/dev/null || echo ERROR)
+%__ruby_rbconfig_path()	%(%{__ruby} -r rbconfig -r pathname -e 'print Pathname(RbConfig::CONFIG["%1"]).cleanpath' 2>/dev/null || echo ERROR)
+
+%ruby_archdir		%{expand:%%global ruby_archdir %{__ruby_rbconfig_path archdir}}%ruby_archdir
+%ruby_libdir		%{expand:%%global ruby_libdir %{__ruby_rbconfig rubylibdir}}%ruby_libdir
+%ruby_ridir			%{expand:%%global ruby_ridir %(%{__ruby} -r rbconfig -e 'print File.join(RbConfig::CONFIG["datadir"], "ri", RbConfig::CONFIG["ruby_version"], "system")' 2>/dev/null || echo ERROR)}%ruby_ridir
+%ruby_rubylibdir	%{expand:%%global ruby_rubylibdir %{__ruby_rbconfig_path rubylibdir}}%ruby_rubylibdir
+%ruby_vendorarchdir	%{expand:%%global ruby_vendorarchdir %{__ruby_rbconfig vendorarchdir}}%ruby_vendorarchdir
+%ruby_vendorlibdir	%{expand:%%global ruby_vendorlibdir %{__ruby_rbconfig_path vendorlibdir}}%ruby_vendorlibdir
+%ruby_sitearchdir	%{expand:%%global ruby_sitearchdir %{__ruby_rbconfig sitearchdir}}%ruby_sitearchdir
+%ruby_sitedir		%{expand:%%global ruby_sitedir %{__ruby_rbconfig sitedir}}%ruby_sitedir
+%ruby_sitelibdir	%{expand:%%global ruby_sitelibdir %{__ruby_rbconfig_path sitelibdir}}%ruby_sitelibdir
 %ruby_rdocdir		/usr/share/rdoc
-%ruby_vendordir		%{expand:%%global ruby_vendordir %(%{__ruby} -r rbconfig -e 'print Config::CONFIG["vendordir"]' 2>/dev/null || echo ERROR)}%ruby_vendordir
-%ruby_version		%{expand:%%global ruby_version %(%{__ruby} -r rbconfig -e 'print Config::CONFIG["ruby_version"]' 2>/dev/null || echo ERROR)}%ruby_version
+%ruby_vendordir		%{expand:%%global ruby_vendordir %{__ruby_rbconfig vendordir}}%ruby_vendordir
+%ruby_version		%{expand:%%global ruby_version %(r=%{__ruby_rbconfig ruby_version}; echo ${r:-%%nil})}%ruby_version
 
-%ruby_ver_requires_eq	Requires:	ruby(ver) = %ruby_version
-%ruby_mod_ver_requires_eq	Requires:	ruby-modules(ver) = %ruby_version
+%ruby_gemdir		%{expand:%%global ruby_gemdir %(%{__ruby} -r rubygems -e 'puts Gem.respond_to?(:default_dirs) ? Gem.default_dirs[:system][:gem_dir] : Gem.path.first' 2>/dev/null || echo ERROR)}%{ruby_gemdir}
+%ruby_specdir		%{ruby_gemdir}/specifications
+
+# deprecated, ruby 2.0 noarch packages are versionless and extension dependency is generated by rpm5
+%ruby_ver_requires_eq	%{nil}
+%ruby_mod_ver_requires_eq	%{nil}
 
 %php_pear_dir		/usr/share/pear
 %php_data_dir		/usr/share/php
@@ -935,7 +968,13 @@ fi; \
 %php_name				php%{?php_suffix}
 # use rpmbuild -D 'php_suffix 54' to build php extension for php 5.4
 # NOTE: error output must be empty. otherwise can't build pecl packages if no php*-devel is installed
-%php_suffix             %(c=$(php-config --sysconfdir 2>/dev/null) || echo '' && echo ${c#/etc/php})
+%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%{php_versuffix}
 
 # helper macro
 %__php_api_requires(v:) Requires: %{php_name}(%{expand:%1}) = %{expand:%{%{!?2:%{1}}%{?2}}}
@@ -1051,7 +1090,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
@@ -1068,18 +1107,71 @@ fi \
 
 %py3_ocomp		%{__python3} -O -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
 
+%py_build	{ \
+	LDFLAGS="${LDFLAGS:-%rpmldflags}"; export LDFLAGS; \
+	CFLAGS="${CFLAGS:-%rpmcppflags %rpmcflags}"; export CFLAGS; \
+	CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
+	%{?__cc:CC="%{__cc}"; export CC;} \
+	%{?__cxx:CXX="%{__cxx}"; export CXX;} \
+	%{__python} setup.py \
+				build --build-base=build-2 \
+}
+
+%py_install	{ \
+	LDFLAGS="${LDFLAGS:-%rpmldflags}"; export LDFLAGS; \
+	CFLAGS="${CFLAGS:-%rpmcppflags %rpmcflags}"; export CFLAGS; \
+	CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
+	%{?__cc:CC="%{__cc}"; export CC;} \
+	%{?__cxx:CXX="%{__cxx}"; export CXX;} \
+	%{__python} setup.py \
+				build --build-base=build-2 \
+				install --skip-build \
+				--prefix=%{_prefix} \
+				--optimize=2 \
+				--root=$RPM_BUILD_ROOT \
+}
+
+%py3_build	{ \
+	LDFLAGS="${LDFLAGS:-%rpmldflags}"; export LDFLAGS; \
+	CFLAGS="${CFLAGS:-%rpmcppflags %rpmcflags}"; export CFLAGS; \
+	CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
+	%{?__cc:CC="%{__cc}"; export CC;} \
+	%{?__cxx:CXX="%{__cxx}"; export CXX;} \
+	%{__python3} setup.py build --build-base=build-3 \
+}
+
+%py3_install	{ \
+	LDFLAGS="${LDFLAGS:-%rpmldflags}"; export LDFLAGS; \
+	CFLAGS="${CFLAGS:-%rpmcppflags %rpmcflags}"; export CFLAGS; \
+	CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
+	%{?__cc:CC="%{__cc}"; export CC;} \
+	%{?__cxx:CXX="%{__cxx}"; export CXX;} \
+	%{__python3} setup.py \
+				build --build-base=build-3 \
+				install --skip-build \
+				--prefix=%{_prefix} \
+				--optimize=2 \
+				--root=$RPM_BUILD_ROOT \
+}
+
 # node.js libdir
 # Requirements:
 # BuildRequires: rpmbuild(macros) >= 1.634
 %nodejs_libdir		/usr/lib/node_modules
 
+# bash-completion 2.0 completions dir
+# Requirements:
+# BuildRequires: rpmbuild(macros) >= 1.673
+# Requires:	bash-completion >= 2.0
+%bash_compdir		/usr/share/bash-completion/completions
+
 # Hardlink binary identical .pyc and .pyo files
 %__spec_install_post_py_hardlink {\
 %{!?no_install_post_py_hardlink: __spec_install_post_py_hardlink() { \
 %{!?debug:set +x;} \
-local a b c=0 t=0; \
+local a b c=0 t=0 pyc=%{tmpdir}/%{name}-%{version}-%{release}__rpm_pyc; \
 if [ -d "$RPM_BUILD_ROOT" ]; then \
-	find "$RPM_BUILD_ROOT" -name '*.pyc' > __rpm_pyc; \
+	find "$RPM_BUILD_ROOT" -name '*.pyc' > $pyc; \
 	while read a; do \
 		b="${a%.pyc}.pyo"; \
 		if cmp -s "$a" "$b"; then \
@@ -1087,9 +1179,9 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \
 			c=$((c + 1)); \
 		fi; \
 		t=$((t + 1)); \
-	done < __rpm_pyc; \
+	done < $pyc; \
 	[ $t -gt 0 ] && printf "Hardlink Python files: %d/%d files hardlinked\n" $c $t; \
-	rm -f __rpm_pyc; \
+	rm -f $pyc; \
 fi; \
 }; __spec_install_post_py_hardlink } }
 
@@ -1100,9 +1192,11 @@ fi; \
 # Usage:
 # %py_postclean /usr/share/extra -x keepme.py,keeptoo.py
 # Options:
-# -x - comma separated of file basenames to preserve
+# -x - comma separated of file basenames to preserve (rpmbuild(macros) >= 1.658)
 # ARGS - extra directories to clean for .py sources
 #
+# BuildRequires:	rpmbuild(macros) >= 1.189
+#
 %py_postclean(x:) \
 for d in %{py_sitescriptdir} %{py_sitedir} %*; do \
 	[ ! -d "$RPM_BUILD_ROOT$d" ] || find "$RPM_BUILD_ROOT$d" -name '*.py' -print0 %{-x:| grep -ZzvE '/(%(echo '%{-x*}' | tr ',' '|'))$'} | xargs -0r -l512 rm;\
@@ -1135,9 +1229,6 @@ fi; \
 %xmms_effect_plugindir		%{expand:%%global xmms_effect_plugindir %(xmms-config --effect-plugin-dir 2>/dev/null || echo ERROR)}%xmms_effect_plugindir
 %xmms_general_plugindir		%{expand:%%global xmms_general_plugindir %(xmms-config --general-plugin-dir 2>/dev/null || echo ERROR)}%xmms_general_plugindir
 
-%_host_base_arch	%{expand:%%global _host_base_arch %(echo %{_host_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_host_base_arch
-%_target_base_arch	%{expand:%%global _target_base_arch %(echo %{_target_cpu} | sed 's/i.86/i386/;s/athlon/i386/;s/pentium./i386/;s/amd64/x86_64/;s/ia32e/x86_64/;s/sparcv./sparc/;s/arm.*/arm/')}%_target_base_arch
-
 # user/group checking macros
 #
 # Usage:
@@ -1467,7 +1558,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
@@ -1594,6 +1685,7 @@ fi \
 f = io.open("%{_docdir}/%{name}-%{version}/optional-packages.txt", "r") \
 if f then \
 	for l in f:lines() do print(l); end \
+	f:close() \
 end \
 %{nil}
 
@@ -1645,229 +1737,45 @@ done \
 
 %env_update [ ! -x /sbin/env-update ] || /sbin/env-update -u || :
 
-
-# Build modules for kernels 2.6
-# Author: Przemyslaw Iskra <sparky@pld-linux.org>
-#
-# Usage:
-#	%build_kernel_modules -m <modules> -C <directory>
-#
-#  remember that proper Makefile is still required
-# Options:
-#  -m <modules> (required) -- comma-separated list of modules to save,
-#		without .ko extension, may be placed in subdirectory
-#  -C <directory> -- change to <directory> before doing anything
-#  -p <arg>, -P <arg> -- arguments passeed to make scripts
-#  -c -- do not execute make clean
-#  <additional arguments> -- all additional arguments will be passed to
-#		make modules
-#
-# Additional patching supported via here document. Try:
-#	%build_kernel_modules -m module <<'EOF'
-#	your patch script here
-#	EOF
-# Don't use it unless patching depends on config options.
-
-# Developer note: don't touch it unless you know how to handle '\'.
-# - \ in script expands to nothing
-# - \\\ in script expands to \
-# - \\\ inside definition expands to nothing
-# - \\\\\\\ inside definition expands to \
-# - in last line \ has to touch arguments so arguments passing
-#   in new lines (using \) will be supported
-
-%build_kernel_modules(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="%{kgcc}" ARCH=%{_target_base_arch}							\\\
-	%else															\\\
-	ARCH=%{_target_base_arch} CROSS_COMPILE=%{_target_cpu}-pld-linux- \\\
-	%endif															\\\
-%else																\\\
-	CC="%{kgcc}" 													\\\
-%endif																\
-%define	MakeOpts HOSTCC="%{kgcc}" 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														\
-																	\
-	[ -r "%{_kernelsrcdir}/.config" ] || exit 1						\
-	rm -rf o														\
-	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	\
-		ln -sf %{_kernelsrcdir}/include/generated/autoconf.h o/include/generated/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																\
-	if [ -d %{_kernelsrcdir}/arch/x86/include/generated ]; then		\
-		ln -s %{_kernelsrcdir}/arch/x86/include/generated o/arch/x86/include	\
-	fi																\
-																	\
-	set +x															\
-	[ -z "$PATCH_SH" ] || echo "$PATCH_SH" | %__spec_build_shell	\
-	set -x															\
-																	\
-	install -d o/include/config										\
-	touch o/include/config/MARKER									\
-	ln -sf %{_kernelsrcdir}/include/config/auto.conf o/include/config/auto.conf	\
-	ln -sf %{_kernelsrcdir}/scripts o/scripts						\
-																	\
-	%{!?-c:%{__make} -C %{_kernelsrcdir} clean						\\\
-		RCS_FIND_IGNORE="-name '*.[ks]o' -o"						\\\
-		${1+"$@"}													\\\
-		M=$PWD %{MakeOpts}}											\
-																	\
-	%{__make} -C %{_kernelsrcdir} modules							\\\
-		${1+"$@"}													\\\
-		M=$PWD CONSTIFY_PLUGIN="" %{MakeOpts}						\
-%{?-C:cd -}															\
-}																	\
-compile_old() {														\
-	local L="<" PATCH_SH;											\
-	[[ '%{*}' != *$L$L* ]] || PATCH_SH="set -x -e;$(cat)"			\
-	set -e -x														\
-	local cfgs='%{?with_dist_kernel:%{?with_smp: smp}%{?with_up: up}}%{!?with_dist_kernel: nondist}' \
-																	\
-for cfg in ${cfgs:-dist}; do                                        \
-	[ -r "%{_kernelsrcdir}/config-$cfg" ] || exit 1					\
-																	\
-	rm -rf o														\
-	install -d o/include/linux o/include/generated o/arch/powerpc/lib	\
-	ln -sf %{_kernelsrcdir}/config-$cfg o/.config					\
-	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 \
-	else															\
-		ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h \
-	fi																\
-																	\
-	set +x															\
-	[ -z "$PATCH_SH" ] || echo "$PATCH_SH" | %__spec_build_shell	\
-	set -x															\
-																	\
-	%if %{with dist_kernel}	|| %(test -f %{_kernelsrcdir}/scripts/bin2c ; echo $?)	\
-		%{__make} -j1 -C %{_kernelsrcdir} prepare scripts			\\\
-			%{-p*} %{-P*}											\\\
-			%{MakeOpts}												\
-	%else															\
-		install -d o/include/config									\
-		touch o/include/config/MARKER								\
-		ln -sf %{_kernelsrcdir}/include/config/auto-$cfg.conf o/include/config/auto.conf	\
-		ln -sf %{_kernelsrcdir}/scripts o/scripts					\
-	%endif															\
-																	\
-	%{!?-c:%{__make} -C %{_kernelsrcdir} clean						\\\
-		RCS_FIND_IGNORE="-name '*.[ks]o' -o"							\\\
-		${1+"$@"}													\\\
-		M=$PWD %{MakeOpts}}											\
-																	\
-	%{__make} -C %{_kernelsrcdir} modules							\\\
-		${1+"$@"}													\\\
-		M=$PWD CONSTIFY_PLUGIN="" %{MakeOpts}						\
-																	\
-	for MODULE in {%{-m*},}; do										\
-		[ -z "${MODULE}" ] || mv ${MODULE}{,-$cfg}.ko				\
-	done															\
-done																\
-%{?-C:cd -}															\
-}																	\
-if [ -r "%{_kernelsrcdir}/.config" ]; then	\
-	compile %{*}							\
-else										\
-	compile_old %{*}						\
-fi											\
-%{nil}
-
-
-# Install kernel modules built by %build_kernel_modules
-# Author: Przemyslaw Iskra <sparky@pld-linux.org>
-#
-# Usage:
-#	%install_kernel_modules -m <modules> -d <directory>
-#
-# Options:
-#  -m <modules> (required) -- comma-separated list of modules to install,
-#		without .ko extension, may be placed in subdirectory
-#  -d <directory> (required) -- in what subdirectory modules should be
-#		installed (eg. misc, kernel/drivers/net)
-#  -s <suffix> -- suffix to use when installing modules, useful when module
-#		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
-
-%install_kernel_modules(m:d:s:n:)									\
-%{!?-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} \
-																	\
-__install_kernel_modules() {										\
-%{!?debug:set +x;}													\
-																	\
-for MODULE in {%{-m*},}; do											\
-	[ -n "${MODULE}" ] || continue									\
-	MNAME=${MODULE##*/}												\
-	install -m 644 -D ${MODULE}.ko %{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko	\
-	%{?-s:install -d %{ModprobeD}									\
-		echo "alias ${MNAME} ${MNAME}-%{-s*}" >> %{ModprobeD}/%{-n*}.conf}	\
-done																\
-}																	\
-__install_kernel_modules_old() {									\
-%{!?debug:set +x;}													\
-local cfgs='%{?with_dist_kernel:%{?with_smp: smp}%{?with_up: up}}%{!?with_dist_kernel: nondist}' \
-																	\
-for MODULE in {%{-m*},}; do											\
-	[ -n "${MODULE}" ] || continue									\
-	for cfg in ${cfgs:-dist}; do                                    \
-		[ "$cfg" = smp ] && suf=smp || suf=							\
-		MNAME=${MODULE##*/}											\
-		install -m 644 -D ${MODULE}-$cfg.ko							\\\
-			%{KernelD}$suf/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko			\
-		%{?-s:install -d %{ModprobeD}$suf							\
-			echo "alias ${MNAME} ${MNAME}-%{-s*}"					\\\
-			>> %{ModprobeD}$suf/%{-n*}.conf}						\
-	done															\
-done																\
-}																	\
-if [ -r "%{_kernelsrcdir}/.config" ]; then							\
-	__install_kernel_modules										\
-else																\
-	__install_kernel_modules_old									\
-fi																	\
-%{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
@@ -1875,18 +1783,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}
 
@@ -1954,7 +1875,11 @@ end\
 for _, s in ipairs({%{expand:%%__lua_split %*}}) do\
 	if not t[s] then\
 		print("Adding "..s.." to /etc/shells")\
-		f = io.open("/etc/shells", "a"); f:write(s.."\\n"); f:close()\
+		f = io.open("/etc/shells", "a")\
+		if f then\
+			f:write(s.."\\n")\
+			f:close()\
+		end\
 	end\
 end\
 %{nil}
@@ -1974,7 +1899,11 @@ s=""\
 for _, l in pairs(t) do\
 	s=s..l.."\\n"\
 end\
-io.open("/etc/shells", "w"):write(s)\
+f = io.open("/etc/shells", "w")\
+if f then\
+	f:write(s)\
+	f:close()\
+end\
 %{nil}
 
 # Backwards compat. Use of %lua_ prefixed macros is preferred as these are cleaner to read.
@@ -2066,11 +1995,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.
@@ -2092,20 +2021,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}
@@ -2137,6 +2071,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
@@ -2150,15 +2085,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
@@ -2167,7 +2103,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
@@ -2179,7 +2116,7 @@ fi; \
 #
 %ghc_pkg_recache() {{ \
 	umask 022; \
-	/usr/bin/ghc-pkg recache; \
+	[ ! -x /usr/bin/ghc-pkg ] || /usr/bin/ghc-pkg recache; \
 };} \
 %{nil}
 
@@ -2217,7 +2154,7 @@ fi; \
 # %systemd_trigger %{name}.service
 #
 # Requirements:
-# BuildRequires:	rpmbuild(macros) >= 1.647
+# BuildRequires:	rpmbuild(macros) >= 1.671
 # Requires:	systemd-units >= 38
 
 %systemd_reload /bin/systemd_booted && SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog /bin/systemctl --quiet daemon-reload || :
@@ -2262,7 +2199,7 @@ fi; \
 want_enable_service() { \
 	[ -f /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \
 	[ ${RPM_ENABLE_SYSTEMD_SERVICE:-yes} = no ] && return 1 \
-	/sbin/chkconfig --list ${1%.service} 2>/dev/null | grep -qsv "[0-6]:on" && return 1 \
+	[ "$(echo /etc/rc.d/rc[0-6].d/S[0-9][0-9]${1%.service})" = "/etc/rc.d/rc[0-6].d/S[0-9][0-9]${1%.service}" ] && return 1 \
 	return 0 \
 }\
 	export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
@@ -2295,6 +2232,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