X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.macros;h=5bafd7603290271a12b1f63624d055165a337b35;hb=19de623d966290f012dd43ffa3fe06a369355448;hp=ffd87bcfcc80b9c220f1852a1b4cdd06d9be7ef6;hpb=fddf0dcdb6ee3bceb43b3ef2878c8126a7ee152e;p=packages%2Frpm.git diff --git a/rpm.macros b/rpm.macros index ffd87bc..5bafd76 100644 --- a/rpm.macros +++ b/rpm.macros @@ -47,6 +47,9 @@ # and that both p and q are package names (i.e. no version/release). %_dependency_whiteout %{nil} +%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\ + && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\ + [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS") #----------------------------------------------------------------- # @@ -344,6 +347,12 @@ unset DISPLAY ||:\ echo "Compress man pages: $i"; \ find "$RPM_BUILD_ROOT$i" -name '*.bz2' -print | xargs -r %{__bzip2} -df; \ find "$RPM_BUILD_ROOT$i" -name '*.gz' -print | xargs -r %{__gzip} -dnf; \ + find $RPM_BUILD_ROOT$i -type l | while read a; do \ + m=$(readlink $a); \ + rm -f $a; \ + echo .so ${m##*/} > $a; \ + echo >&2 "Converted ${a#$RPM_BUILD_ROOT} from symlink to man link: ${m##*/}"; \ + done; \ find "$RPM_BUILD_ROOT$i" -type f -size +%{_min_compress_bytes}c -print | xargs -r %{__gzip} -9nf; \ fi; \ done; \ @@ -374,7 +383,7 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \ echo "DONE"; \ fi; \ fi; \ - filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*\.debug" ! -regex ".*%{_docdir}/.*" ! -regex ".*%{_includedir}/.*" %{?_noautostrip:! -regex "%{_noautostrip}"}`; \ + filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*libpthread-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*\.debug" ! -regex ".*%{_docdir}/.*" ! -regex ".*%{_includedir}/.*" %{?_noautostrip:! -regex "%{_noautostrip}"}`; \ # vim - " \ if [ -z "$filelist" ]; then \ return; \ @@ -686,7 +695,7 @@ fi \ %__spec_install_post_py_hardlink {\ %{!?no_install_post_py_hardlink: __spec_install_post_py_hardlink() { \ [ ! -d "$RPM_BUILD_ROOT" ] || find "$RPM_BUILD_ROOT" -name '*.pyc' | while read a; do \ - b="$(echo $a|sed -e 's/.pyc$/.pyo/')"; \ + b="${a%.pyc}.pyo"; \ if cmp -s "$a" "$b"; then \ ln -f "$a" "$b"; \ fi; \ @@ -843,75 +852,6 @@ else \ [ ! -x /usr/sbin/nscd ] || /usr/sbin/nscd -i group || : \ fi; -# apache_config_{install/uninstall} macros *DEPRECATED* -# Author: Elan Ruusamäe -# -# You should use webapp macros instead. these are here until single piece of -# them is gone from specs ;) -# -# The config is installed/removed inside trigger, this means that you can any -# time install apache1 or apache package and the configuration file is updated. -# if you don't need the config for various reason for specific apache, just -# remove the symlink from apache config directory. the trigger will not put the -# config again to that version of apache. In other words the config is linked -# to apache config directory on first install of PACKAGE or apache. -# -# should be called in trigger body: -# %triggerin -- apache1 >= 1.3.33-2 -# %apache_config_install -v 1 -# -# Add package's apache config to apache config. -# -# Usage: -# %apache_config_install -v {1|2} -c %{_sysconfdir}/apache-%{name}.conf -n 99 -# -# -v REQUIRED: specify apache version. can be 1 or 2. -# -c OPTIONAL: specify full path to PACKAGE's config. Defaults to %{_sysconfdir}/apache-%{name}.conf. -# -n OPTIONAL: specify config "slot". defaults to 99 -# -f OPTIONAL: force symlink creation regardless if package was upraded. useful in triggers -# -# Internal macros. don't use ;). -# expands apache config dir by apache version at build time. -%__apache_confdir() %(if [ %{1} = 1 ]; then echo /etc/apache/conf.d; elif [ %{1} = 2 ]; then echo /etc/httpd/httpd.conf; else echo >&2 Unknown apache version specified; fi) -# expands apache service name by apache version at build time. -%__apache_svcname() %(if [ %{1} = 1 ]; then echo apache; elif [ %{1} = 2 ]; then echo httpd; else echo >&2 Unknown apache version specified; fi) - -%apache_config_install(fv:c:n:) \ -%{!-v:%{error:apache_config_install: Required argument -v missing}} \ -%{?debug:set -x; echo "apache_config_install:%{-v*} %{name}-%{version}-%{release} 1:[$1]; 2:[$2]"} \ -if [ -n "%{-f:1}" ] || ([ "$1" = "1" ] && [ "$2" = "1" ]) && [ -d %{__apache_confdir %{-v*}} ]; then\ - ln -sf %{-c*}%{!-c:%{_sysconfdir}/apache-%{name}.conf} %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf\ -fi\ -# reload apache if the config symlink is there\ -if [ -L %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf ]; then\ - # additionally don't reload if target package (the webserver) is upgraded, as webserver is restarted anyway in %post \ - if [ "$2" != "2" ] && [ -f /var/lock/subsys/%{__apache_svcname %{-v*}} ]; then\ - /etc/rc.d/init.d/%{__apache_svcname %{-v*}} reload 1>&2\ - fi\ -fi\ -%{nil} - -# Remove package's apache config from apache config. -# -# Usage: -# %apache_config_uninstall -v {1|2} -n 99 -# -# -v REQUIRED: specify apache version. can be 1 or 2. -# -n OPTIONAL: specify config "slot". defaults to 99 -%apache_config_uninstall(v:n:) \ -%{!-v:%{error:apache_config_uninstall: Required argument -v missing}} \ -%{?debug:set -x; echo "apache_config_uninstall:%{-v*} %{name}-%{version}-%{release}: 1:[$1]; 2:[$2]"} \ -# remove link if either of the packages are gone \ -if [ "$1" = "0" ] || [ "$2" = "0" ]; then \ - if [ -L %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf ]; then \ - rm -f %{__apache_confdir %{-v*}}/%{-n*}%{!-n:99}_%{name}.conf \ - if [ -f /var/lock/subsys/%{__apache_svcname %{-v*}} ]; then \ - /etc/rc.d/init.d/%{__apache_svcname %{-v*}} reload 1>&2 \ - fi \ - fi \ -fi \ -%{nil} - # webapp macros # Author: Elan Ruusamäe # @@ -950,32 +890,6 @@ if [ -n "%{-f:1}" ] || [ "$1" = "0" ] || [ "$2" = "0" ] && [ -L /etc/%1/webapps. fi \ %{nil} -# see browser-plugins.spec / template-browser-plugin.spec -# Author: Elan Ruusamäe -%nsplugin_install(d:f) { \ -# create link if it's first install of either of the packages \ -if [ -n "%{-f:1}" ] || ([ "$1" = "1" ] && [ "$2" = "1" ] && [ -d %{-d*} ]); then \ -( \ -%( \ - for file in %{*}; do \ - echo echo Installing $file to %{-d*}; \ - echo "ln -sf %{_libdir}/browser-plugins/$file %{-d*};"; \ - done ) \ -) | ( %banner -t 5 -e %{name}-in ); fi; \ -} - -%nsplugin_uninstall(d:) { \ -# remove link if either of the packages are gone \ -if [ "$1" = "0" ] || [ "$2" = "0" ]; then \ -( \ -%( \ - for file in %{*}; do \ - echo echo Removing $file from %{-d*}; \ - echo "rm -f %{-d*}/$file;"; \ - done ) \ -) | ( %banner -t 5 -e %{name}-un ); fi; \ -} - # service macro. # Author: Elan Ruusamäe # @@ -1259,8 +1173,9 @@ done \ compile() { \ L="<"; [[ '%{*}' != *$L$L* ]] || PATCH_SH="set -x -e;$(cat)" \ set -e -x \ + local cfgs='%{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}' \ \ -for cfg in %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}; do \ +for cfg in $cfgs; do \ [ -r "%{_kernelsrcdir}/config-$cfg" ] || exit 1 \ \ rm -rf o \ @@ -1270,8 +1185,8 @@ for cfg in %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}; do \ ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h \ %ifarch ppc ppc64 \ install -d o/include/asm \ - [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* o/include/asm \ - [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -snf %{_kernelsrcdir}/include/asm-powerpc/* o/include/asm \ + [ ! -d %{_kernelsrcdir}/include/asm-%{_target_base_arch} ] || ln -snf %{_kernelsrcdir}/include/asm-%{_target_base_arch}/* o/include/asm \ + [ ! -d %{_kernelsrcdir}/include/asm-powerpc ] || ln -snf %{_kernelsrcdir}/include/asm-powerpc/* o/include/asm \ %else \ ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} o/include/asm \ %endif \ @@ -1321,7 +1236,7 @@ compile %{*}\ # -s -- suffix to use when installing modules, useful when module # with same name exists in kernel already # -n -- name of modprobe config file to use (without .conf extension) -# for definig aliases, only useful with -s +# for defining aliases, only useful with -s %install_kernel_modules(m:d:s:n:) \ %{!?-m:%{error:%{0}: Required module name (-m) missing}exit 1} \