X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.macros;h=bc615f08e3435f2630d8b49ed853cfb8c967b4c8;hb=8fecb226f2a850e66cac1a03924cb6ffa1426852;hp=5bca27c772164faae907651da20f26c5d3b4a09d;hpb=1f8e11510a8311ea1751a976a7c456855bb93845;p=packages%2Frpm-build-macros.git

diff --git a/rpm.macros b/rpm.macros
index 5bca27c..bc615f0 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -187,13 +187,13 @@
 %requires_releq()  		%(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}-%%{release}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
 %requires_releq_kernel_up()  	%(LC_ALL="C" rpm -qf --qf 'Prereq: kernel-up = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -vE "(is not|no such)")
 %requires_releq_kernel_smp()  	%(LC_ALL="C" rpm -qf --qf 'Prereq: kernel-smp = %%{epoch}:%%{version}-%%{release}\\n' %{_kernelsrcdir}/include/linux/version.h | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -vE "(is not|no such)")
-%requires_eq_to %(LC_ALL="C" rpm -q --qf 'Requires: %1 = %%{epoch}:%%{version}\\n' %2 | 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):/ /' -e 's/ 0:/ /' | grep -v "is not")
 
 %apache_modules_api %(awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' /usr/include/apache/ap_mmn.h 2>/dev/null || echo ERROR)
 
 # kernel version-release handling
-%__kernel_ver    %(grep UTS_RELEASE %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | cut -d'"' -f2)
-%__kernel_rel    %(LC_ALL="C" rpm -qf %{_kernelsrcdir}/include/linux/version.h --queryformat "%{RELEASE}" | grep -v "is not")
+%__kernel_ver   %([ -f %{_kernelsrcdir}/include/linux/version.h ] && (grep UTS_RELEASE %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | cut -d'"' -f2) || (awk '/^VERSION/ { ver = $0; gsub(/VERSION.*=/, NIL, ver); } /^PATCHLEVEL/ { plev = $0; gsub(/PATCHLEVEL.*=/, NIL, plev); } /^SUBLEVEL/ { slev = $0; gsub(/SUBLEVEL.*=/, NIL, slev); } END { printf("%d.%d.%d", ver, plev, slev); }' %{_kernelsrcdir}/Makefile 2> /dev/null))
+%__kernel_rel    %(LC_ALL="C" rpm -qf %{_kernelsrcdir}/include/linux/fs.h --queryformat "%{RELEASE}" | grep -v "is not")
 %_kernel_ver     %(echo %{__kernel_ver}%{!?_without_dist_kernel:-%{__kernel_rel}})
 %_kernel_ver_str %(echo %{_kernel_ver} | sed s/-/_/g)
 
@@ -242,9 +242,10 @@ echo "Compress man and info pages."; \
 #%no_install_post_strip	1
 %__spec_install_post_strip {%{!?debug: \
 %{!?no_install_post_strip: \
-	%{?verbose:set -x;} \
+    %{?verbose:set -x;} \
+    if [ -d "$RPM_BUILD_ROOT" ]; then \
 	echo "Strip executable binaries, archives and shared object files."; \
-	filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*"`; \
+	filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" %{?_noautostrip:! -regex "%{_noautostrip}"}`; \
 	elfexelist=`echo $filelist | xargs -r file | \
 		awk '/ELF.*executable/ {print $1}' | cut -d: -f1`; \
 	elfsharedlist=`echo $filelist | xargs -r file | \
@@ -252,14 +253,15 @@ echo "Compress man and info pages."; \
 	elfarchiveslist=`echo $filelist | xargs -r file | \
 		awk '/current ar archive/ {print $1}' | cut -d: -f1`; \
 	if [ -n "$elfexelist" ]; then \
-		strip --remove-section=.note  --remove-section=.comment $elfexelist; \
+		%{__strip} --remove-section=.note  --remove-section=.comment $elfexelist; \
 	fi; \
 	if [ -n "$elfsharedlist" ]; then \
-		strip --strip-unneeded --remove-section=.note  --remove-section=.comment $elfsharedlist; \
+		%{__strip} --strip-unneeded --remove-section=.note  --remove-section=.comment $elfsharedlist; \
 	fi; \
 	if [ -n "$elfarchiveslist" ]; then \
-		strip --strip-debug --remove-section=.note  --remove-section=.comment $elfarchiveslist; \
-	fi; } \
+		%{__strip} --strip-debug --remove-section=.note  --remove-section=.comment $elfarchiveslist; \
+	fi; \
+    fi; } \
 } }
 #-----------------------------------------------------------------
 # remove all RPATH from executable binaries and shared object files
@@ -270,9 +272,9 @@ echo "Compress man and info pages."; \
 %__spec_install_post_chrpath {%{!?debug: \
 %{!?no_install_post_chrpath: \
 	%{?verbose:set -x;} \
+if [ -d "$RPM_BUILD_ROOT" ]; then \
 echo "Remove RPATH from executable binaries and shared object files."; \
-if [ "$(uname -m)" != alpha ] ; then \
-find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" | xargs -r file | \
+find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*" %{?_noautochrpath:! -regex "%{_noautochrpath}"} | xargs -r file | \
 	awk '/ELF.*(executable|shared object)/ {print $1}' | cut -d: -f1 | \
 while read file ; do \
 	rpath= ; \
@@ -291,7 +293,8 @@ while read file ; do \
 	done ; \
 	if [ "$rpath" = "" ] ; then chrpath -d "$file" > /dev/null ; \
 	else chrpath -r "$rpath" "$file" > /dev/null ; fi ; \
-done; fi; } \
+done; \
+fi; } \
 } }
 #-----------------------------------------------------------------
 # Find and gzip all kernel modules
@@ -301,14 +304,16 @@ done; fi; } \
 #%no_install_post_compress_modules  1
 %__spec_install_post_compress_modules { \
 %{!?no_install_post_compress_modules: \
-echo "Compress kernel modules if any."; \
     %{?verbose:set -x;} \
+    if [ -d "$RPM_BUILD_ROOT" ]; then \
+echo "Compress kernel modules if any."; \
     if test -d $RPM_BUILD_ROOT/lib/modules ; then \
        find $RPM_BUILD_ROOT/lib/modules -name \*o -type f -print | \
        xargs -r %{__gzip} -9nf; \
 	   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; \
 } }
 
 %_source_payload        w9.gzdio
@@ -338,9 +343,9 @@ echo "Compress kernel modules if any."; \
 #
 %_noautoreqfiles	%(sed -e s'/#.*//' /etc/rpm/noautoreqfiles)
 %_noautoprovfiles	%(sed -e s'/#.*//' /etc/rpm/noautoprovfiles)
-#%_noautoreq		%{nil}
+%_noautoreq		%(sed -e s'/#.*//' /etc/rpm/noautoreq)
 %_noautoreqdep		%(sed -e s'/#.*//' /etc/rpm/noautoreqdep)
-#%_noautoprov		%{nil}
+%_noautoprov		%(sed -e s'/#.*//' /etc/rpm/noautoprov)
 #%_noautocompressdoc	%{nil}
 #
 %_missing_doc_files_terminate_build	1%{nil}
@@ -350,8 +355,10 @@ echo "Compress kernel modules if any."; \
 %_emacs_lispdir %(emacs %___emacs_lispdir_helper)
 %_xemacs_lispdir %(xemacs %___emacs_lispdir_helper)
 
-%__php_provides	@RPMCONFIGDIR@/php.prov
-%__php_requires @RPMCONFIGDIR@/php.req
+%__php_provides	%{nil}
+%__php_requires %{nil}
+%__perl_provides %{nil}
+%__perl_requires %{nil}
 
 # Perl specific macro definitions.
 %perl_privlib	%(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib)
@@ -370,8 +377,10 @@ echo "Compress kernel modules if any."; \
 # directories
 %py_prefix      %(echo `python -c "import sys; print sys.prefix"`)
 %py_libdir      %{py_prefix}/%{_lib}/python%{py_ver}
+%py_scriptdir	%{py_prefix}/share/python%{py_ver}
 %py_incdir      /usr/include/python%{py_ver}
-%py_sitedir     %{py_libdir}/site-packages
+%py_sitedir	%{py_libdir}/site-packages
+%py_sitescriptdir %{py_scriptdir}/site-packages
 %py_dyndir      %{py_libdir}/lib-dynload
 
 # pure python modules compilation