X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=rpm.macros;h=d110183eb4a7d8cb802c220d14c6d640e02f0105;hb=ee170415bbc418155178c6cb94e31c20914b4bf1;hp=ffd87bcfcc80b9c220f1852a1b4cdd06d9be7ef6;hpb=fddf0dcdb6ee3bceb43b3ef2878c8126a7ee152e;p=packages%2Frpm.git diff --git a/rpm.macros b/rpm.macros index ffd87bc..d110183 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") #----------------------------------------------------------------- # @@ -288,8 +291,12 @@ unset DISPLAY ||:\ # Requires name = version-release %requires_releq() %(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}-%%{release}\\n' | sed -e 's/ (none):/ /' | grep -v "is not") -%releq_kernel() %((LC_ALL="C" rpm -qf --qf '%%{name} = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null || echo ERROR) | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)") -%requires_releq_kernel(s:) Requires%{-s:(%{-s*})}: %releq_kernel +%releq_kernel() %((LC_ALL="C" rpm -qf --qf '%%{name} = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null || echo ERROR) | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)") +%releq_kernel_up() %((LC_ALL="C" rpm -qf --qf '%%{name}-up = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null || echo ERROR) | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)") +%releq_kernel_smp() %((LC_ALL="C" rpm -qf --qf '%%{name}-smp = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h 2>/dev/null || echo ERROR) | sed -e 's/ (none):/ /' | sed -e 's:-headers::' | grep -vE "(is not|no such)") +%requires_releq_kernel(s:) Requires%{-s:(%{-s*})}: %releq_kernel +%requires_releq_kernel_up(s:) Requires%{-s:(%{-s*})}: %releq_kernel_up +%requires_releq_kernel_smp(s:) Requires%{-s:(%{-s*})}: %releq_kernel_smp %requires_eq() %(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") %requires_eq_to() %(LC_ALL="C" rpm -q --qf 'Requires: %1 = %%{epoch}:%%{version}\\n' %2 | sed -e 's/ (none):/ /' | grep -v "is not") @@ -344,6 +351,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; \ @@ -360,7 +373,13 @@ unset DISPLAY ||:\ # # Requires: find, awk, strip, cut, xargs # -#%no_install_post_strip 1 +# Special macros which affect this process: +#%no_install_post_strip 1 # disable stripping at all +#%_noautostrip regexp # exclude files matching (anchored!) regex from stripping +#%_autostripall regexp # strip files matching (anchored!) regex using plain strip +#%_autostripunneeded regexp # strip files matching (anchored!) regex using strip --strip-unneeded +#%_autostripdebug regexp # strip files matching (anchored!) regex using strip --strip-debug +# %__spec_install_post_strip {%{!?debug: \ %{!?no_install_post_strip:__spec_install_post_strip() { \ if [ -d "$RPM_BUILD_ROOT" ]; then \ @@ -374,31 +393,50 @@ 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}"}`; \ - # vim - " \ - if [ -z "$filelist" ]; then \ - return; \ + filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*/usr/lib[0-9]*/debug/.*\.debug" ! -regex ".*%{_docdir}/.*" ! -regex ".*%{_includedir}/.*" %{?_noautostrip:! -regex "%{_noautostrip}"} %{?_autostripall:! -regex "%{_autostripall}"} %{?_autostripunneeded:! -regex "%{_autostripunneeded}"} %{?_autostripdebug:! -regex "%{_autostripdebug}"}`; \ + if [ -n "$filelist" ]; then \ + filetypes=`echo "$filelist" | xargs -r -d'\\n' file`; \ + elfexelist=`echo "$filetypes" | awk -F: '/ELF.*executable/ {print $1}'`; \ + elfsharedlist=`echo "$filetypes" | awk -F: '/LF.*shared object/ {print $1}'`; \ + archiveslist=`echo "$filetypes" | awk -F: '/current ar archive/ {print $1}'`; \ + if [ -n "$elfexelist" ]; then \ + printf "Stripping %d ELF executables..." $(echo "$elfexelist" | wc -l); \ + chmod u+w $elfexelist; \ + %{__strip} --remove-section=.note --remove-section=.comment $elfexelist; \ + echo "DONE"; \ + fi; \ + if [ -n "$elfsharedlist" ]; then \ + printf "Stripping %d ELF shared libraries..." $(echo "$elfsharedlist" | wc -l); \ + chmod u+w $elfsharedlist; \ + %{__strip} --strip-unneeded --remove-section=.note --remove-section=.comment $elfsharedlist; \ + echo "DONE"; \ + fi; \ + if [ -n "$archiveslist" ]; then \ + printf "Stripping %d ar archives..." $(echo "$archiveslist" | wc -l); \ + chmod u+w $archiveslist; \ + %{__strip} --strip-debug --remove-section=.note --remove-section=.comment $archiveslist; \ + echo "DONE"; \ + fi; \ fi; \ - filetypes=`echo "$filelist" | xargs -r -d'\\n' file`; \ - elfexelist=`echo "$filetypes" | awk -F: '/ELF.*executable/ {print $1}'`; \ - elfsharedlist=`echo "$filetypes" | awk -F: '/LF.*shared object/ {print $1}'`; \ - archiveslist=`echo "$filetypes" | awk -F '/current ar archive/ {print $1}'`; \ - if [ -n "$elfexelist" ]; then \ - printf "Stripping %d ELF executables..." $(echo "$elfexelist" | wc -l); \ - chmod u+w $elfexelist; \ - %{__strip} --remove-section=.note --remove-section=.comment $elfexelist; \ + filelist_all=%{?_autostripall:`find $RPM_BUILD_ROOT -type f -regex "%{_autostripall}"`}; \ + filelist_unneeded=%{?_autostripunneeded:`find $RPM_BUILD_ROOT -type f -regex "%{_autostripunneeded}"`}; \ + filelist_debug=%{?_autostripdebug:`find $RPM_BUILD_ROOT -type f -regex "%{_autostripdebug}"`}; \ + if [ -n "$filelist_all" ]; then \ + printf "Stripping everything from %d additional files..." $(echo "$filelist_all" | wc -l); \ + chmod u+w $filelist_all; \ + %{__strip} --remove-section=.note --remove-section=.comment $filelist_all; \ echo "DONE"; \ fi; \ - if [ -n "$elfsharedlist" ]; then \ - printf "Stripping %d ELF shared libraries..." $(echo "$elfsharedlist" | wc -l); \ - chmod u+w $elfsharedlist; \ - %{__strip} --strip-unneeded --remove-section=.note --remove-section=.comment $elfsharedlist; \ + if [ -n "$filelist_unneeded" ]; then \ + printf "Stripping unneeded from %d additional files..." $(echo "$filelist_unneeded" | wc -l); \ + chmod u+w $filelist_unneeded; \ + %{__strip} --strip-unneeded --remove-section=.note --remove-section=.comment $filelist_unneeded; \ echo "DONE"; \ fi; \ - if [ -n "$archiveslist" ]; then \ - printf "Stripping %d ar archives..." $(echo "$elfsharedlist" | wc -l); \ - chmod u+w $archiveslist; \ - %{__strip} --strip-debug --remove-section=.note --remove-section=.comment $archiveslist; \ + if [ -n "$filelist_debug" ]; then \ + printf "Stripping debuginfo from %d additional files..." $(echo "$filelist_debug" | wc -l); \ + chmod u+w $filelist_debug; \ + %{__strip} --strip-debug --remove-section=.note --remove-section=.comment $filelist_debug; \ echo "DONE"; \ fi; \ fi; }; __spec_install_post_strip } } } @@ -408,7 +446,10 @@ fi; }; __spec_install_post_strip } } } # # Requires: find, awk, cut, xargs, chrpath, uname # -#%no_install_post_chrpath 1 +# Special macros which affect this process +#%no_install_post_chrpath 1 # disable chrpath at all +#%_noautochrpath regex # exclude files matching (anchored!) regex from chrpath +# %__spec_install_post_chrpath {%{!?debug: \ %{!?no_install_post_chrpath: __spec_install_post_chrpath() { \ if [ -d "$RPM_BUILD_ROOT" ]; then \ @@ -578,6 +619,8 @@ fi \ %ruby_archdir %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]' 2>/dev/null || echo ERROR) %ruby_ridir %(ruby -r rbconfig -e 'include Config; print File.join(CONFIG["datadir"], "ri", CONFIG["ruby_version"], "system")' 2>/dev/null || echo ERROR) %ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]' 2>/dev/null || echo ERROR) +%ruby_vendorarchdir %(ruby -r rbconfig -e 'print Config::CONFIG["vendorarchdir"]' 2>/dev/null || echo ERROR) +%ruby_vendorlibdir %(ruby -r rbconfig -e 'print Config::CONFIG["vendorlibdir"]' 2>/dev/null || echo ERROR) %ruby_sitearchdir %(ruby -r rbconfig -e 'print Config::CONFIG["sitearchdir"]' 2>/dev/null || echo ERROR) %ruby_sitelibdir %(ruby -r rbconfig -e 'print Config::CONFIG["sitelibdir"]' 2>/dev/null || echo ERROR) %ruby_version %(ruby -r rbconfig -e 'print Config::CONFIG["ruby_version"]' 2>/dev/null || echo ERROR) @@ -686,7 +729,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 +886,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 +924,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 # @@ -1023,7 +971,6 @@ if [ "$1" = "0" ] || [ "$2" = "0" ]; then \ # Directory where arch-specific (JNI) version-independent jars are installed. %_jnidir %{_libdir}/java - %java_home %([ -f %{_javadir}-utils/java-functions ] || { echo ERROR; exit 0; }; unset JAVA_HOME; . %{_javadir}-utils/java-functions; set_jvm; echo ${JAVA_HOME:-ERROR}) %ant JAVA_HOME=%{java_home} ant @@ -1071,6 +1018,53 @@ set_options $BASE_OPTIONS\ run "$@"\ EOF +# jpackage 1.7 +# Directory for maven depmaps +# +%_mavendepmapdir /etc/maven +%_mavendepmapfragdir /etc/maven/fragments + +# +# add_to_depmap adds an entry to the depmap. The arguments are: +# +# %1 the original groupid +# %2 the original artifact id +# %3 the version +# %4 the new groupid +# %5 the new artifactid +# + +%add_to_maven_depmap() \ +install -dm 755 $RPM_BUILD_ROOT/%{_mavendepmapfragdir}\ +cat >>$RPM_BUILD_ROOT/%{_mavendepmapfragdir}/%{name}<< EOF\ +\ + \ + %1\ + %2\ + %3\ + \ + \ + %4\ + %5\ + %3\ + \ +\ +\ +EOF\ +%{nil} + +#============================================================================== +# +# update_maven_depmap updates the main maven depmap +# +%update_maven_depmap() \ +echo -e "\\n" > %{_mavendepmapdir}/maven2-depmap.xml\ +if [ -d %{_mavendepmapfragdir} ] && [ -n "`find %{_mavendepmapfragdir} -type f`" ]; then\ +cat %{_mavendepmapfragdir}/* >> %{_mavendepmapdir}/maven2-depmap.xml\ +fi\ +echo -e "\\n" >> %{_mavendepmapdir}/maven2-depmap.xml + + # PEAR install macros # Author: Elan Ruusamäe # @@ -1259,8 +1253,9 @@ done \ compile() { \ L="<"; [[ '%{*}' != *$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 %{?with_dist_kernel:dist}%{!?with_dist_kernel:nondist}; do \ +for cfg in ${cfgs:-dist}; do \ [ -r "%{_kernelsrcdir}/config-$cfg" ] || exit 1 \ \ rm -rf o \ @@ -1270,8 +1265,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 +1316,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} \ @@ -1331,23 +1326,19 @@ compile %{*}\ %define KernelD $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver} \ %define ModprobeD $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver} \ \ -install -d %{KernelD}/%{-d*} \ -%{?-s:install -d %{ModprobeD}} \ +local cfgs='%{?with_dist_kernel:%{?with_smp: smp}%{?with_up: up}}%{!?with_dist_kernel: nondist}' \ \ for MODULE in {%{-m*},}; do \ [ -n "${MODULE}" ] || continue \ - MNAME=${MODULE##*/} \ - %if %{without dist_kernel} \ - install ${MODULE}-nondist.ko \\\ - %{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko \ - %{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}" \\\ - >> %{ModprobeD}/%{-n*}.conf} \ - %else \ - install ${MODULE}-dist.ko \\\ - %{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko \ - %{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}" \\\ - >> %{ModprobeD}/%{-n*}.conf} \ - %endif \ + for cfg in ${cfgs:-dist}; do \ + [ "$cfg" = smp ] && suf=smp || suf= \ + MNAME=${MODULE##*/} \ + install -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 \ %{nil}