- AMD64 support seems to work now (forgot to commit this earlier)

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index db74fb0084ba332c35fb719ea0a43018e6bd6d30..50548880de371be3367cfb32f518f7f521edf3fa 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -143,7 +143,7 @@
 %_omf_dest_dir %(scrollkeeper-config --omfdir)
 
 # Location of pkgconfig files
-%_pkgconfigdir /usr/lib/pkgconfig
+%_pkgconfigdir /usr/%{_lib}/pkgconfig
 
 # Location of top applink dir
 %_applnkdir    /usr/X11R6/share/applnk
@@ -187,7 +187,7 @@
 %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")
 
-%apache_modules_api %(awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' /usr/include/apache/ap_mmn.h)
+%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)
@@ -302,9 +302,9 @@ done; fi; } \
 echo "Compress kernel modules if any."; \
     %{?verbose:set -x;} \
     if test -d $RPM_BUILD_ROOT/lib/modules ; then \
-       find $RPM_BUILD_ROOT/lib/modules -name \*.o -type f -print | \
+       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" | \
+          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; \
 } }
@@ -379,7 +379,7 @@ echo "Compress kernel modules if any."; \
 
 # Software written in Python language require Python with main version
 # unchanged
-%pyrequires_eq() Requires:       %1 >= %py_ver %1 < %(echo `python -c "import sys; import string; ver=sys.version[:3].split('.'); ver[1]=str(int(ver[1])+1); print string.join(ver, '.')"`)
+%pyrequires_eq() Requires:       %1 >= 1:%py_ver %1 < 1:%(echo `python -c "import sys; import string; ver=sys.version[:3].split('.'); ver[1]=str(int(ver[1])+1); print string.join(ver, '.')"`)
 
 # depmod macro
 %depmod() { \