X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.macros;h=39b90945d07f5b925da8e753e95b03821507312d;hb=fd3a42b034c253109958c424cc5690c0c24f64d7;hp=1a939825f09883e890b5e473953963c2c96d3e90;hpb=266b27408df2359cf560acdba95bffd295b9b6fa;p=packages%2Frpm.git diff --git a/rpm.macros b/rpm.macros index 1a93982..39b9094 100644 --- a/rpm.macros +++ b/rpm.macros @@ -205,40 +205,6 @@ CXXFLAGS="%{rpmcxxflags}" \ %{?configure_cache:--cache-file=%{configure_cache_file:-%{buildroot}.configure.cache}} \ } -# ------------------------------------------------------------------------ -# Overloading of some basic macros -%prep \ -%%prep\ -export LC_ALL=C\ -export LANG=C\ -unset LINGUAS ||:\ -unset LANGUAGE ||:\ -unset LC_MESSAGES ||:\ -unset DISPLAY ||:\ -%{nil} - -%build %%build\ -export LC_ALL=C\ -export LANG=C\ -unset LINGUAS ||:\ -unset LANGUAGE ||:\ -unset LC_MESSAGES ||:\ -unset DISPLAY ||:\ -%{nil} - -%install \ -%if 0%{?_enable_debug_packages}\ -%{?buildsubdir:%{debug_package}}\ -%endif\ -%%install\ -export LC_ALL=C\ -export LANG=C\ -unset LINGUAS ||:\ -unset LANGUAGE ||:\ -unset LC_MESSAGES ||:\ -unset DISPLAY ||:\ -%{nil} - # Location of autoconf macros %_aclocaldir %(aclocal --print-ac-dir) @@ -373,7 +339,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 \ @@ -381,37 +353,56 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \ modulelist=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type f -print); \ modulecount=$(echo -n "$modulelist" | wc -l); \ if [ "$modulecount" -gt 0 ]; then \ - printf "Stripping %d kernel modules..."; \ + printf "Stripping %d kernel modules..." $modulecount; \ echo "$modulelist" | xargs -l512 chmod u+w; \ echo "$modulelist" | xargs -l512 %{__strip} --strip-unneeded --remove-section=.comment --remove-section=.note.GNU-stack; \ echo "DONE"; \ fi; \ fi; \ - 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; \ + filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*/usr/lib[0-9]*/debug/.*\.debug" ! -regex ".*/lib/modules/.*" ! -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 -n "$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 -n "$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 -n "$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 -n "$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 -n "$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 -n "$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 } } } @@ -421,17 +412,19 @@ 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 \ - files=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*" ! -regex ".*%{_docdir}/.*" ! -regex ".*%{_includedir}/.*" %{?_noautochrpath:! -regex "%{_noautochrpath}"}`; \ + files=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" ! -regex ".*/usr/lib[0-9]*/debug/.*" ! -regex ".*/lib/modules/.*" ! -regex ".*%{_docdir}/.*" ! -regex ".*%{_includedir}/.*" %{?_noautochrpath:! -regex "%{_noautochrpath}"}`; \ if [ -n "$files" ]; then \ objs=`echo "$files" | xargs -r -d'\\n' file | awk -F: '/ELF.*(executable.*dynamically linked|shared object)/ {print $1}'`; \ - fi - #" + fi; \ if [ -n "$objs" ]; then \ - printf "Remove RPATH from %d executable binaries and shared object files.\n" $(echo "$objs" | wc -l); \ + printf "Remove RPATH from %d executable binaries and shared object files.\n" $(echo -n "$objs" | wc -l); \ echo "$objs" | \ while read file; do \ rpath= ; \ @@ -463,10 +456,10 @@ fi; }; __spec_install_post_chrpath } } } %__spec_install_post_compress_modules { \ %{!?no_install_post_compress_modules: __spec_install_post_compress_modules() { \ if [ -d $RPM_BUILD_ROOT/lib/modules ]; then \ - echo "Compress kernel modules"; \ q=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type f -print); \ + printf "Compress %d kernel modules..." $(echo -n "$q" | wc -l); \ echo "$q" | xargs -r %{__gzip} -9nf; \ - printf "%d modules compressed\n" $(echo "$q" | wc -l); \ + 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; \ @@ -591,6 +584,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) @@ -781,7 +776,12 @@ fi; \ # -e - send to stderr instead of stdout # -n - no show banner (overrides -t) # -t - show only, if RPM_SCRIPTVERBOSITY >= n; default n=5 -%banner(aent:) \ +# +# Tests: +# (rpm -E '%banner -e banner < m; sh -x m +# rpm -E 'date | %banner -e banner' > m; sh -x m +# +%banner(aent:) ( \ RPM_SCRIPTVERBOSITY=5 \ [ -r /etc/sysconfig/rpm ] && . /etc/sysconfig/rpm \ if [ -x /usr/bin/banner.sh ]; then \ @@ -789,8 +789,8 @@ if [ -x /usr/bin/banner.sh ]; then \ else \ CMD="cat%{-e: >&2}" \ fi \ -eval $CMD %2%{?3: %3} \ -%nil +eval $CMD %{?2:%2}%{?3: %3}) \ +%{nil} # useradd/groupadd macros # Author: Elan Ruusamäe @@ -941,7 +941,6 @@ fi \ # 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 @@ -989,6 +988,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,7 +1305,7 @@ for MODULE in {%{-m*},}; do \ MNAME=${MODULE##*/} \ install -D ${MODULE}-$cfg.ko \\\ %{KernelD}$suf/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko \ - %{?-s:install -d %{ModprobeD} \ + %{?-s:install -d %{ModprobeD}$suf \ echo "alias ${MNAME} ${MNAME}-%{-s*}" \\\ >> %{ModprobeD}$suf/%{-n*}.conf} \ done \