SOURCES: rpm.macros - reverted; apache1 MMN is most likely never c...

[glen]

Author: glen                         Date: Thu Dec 22 14:20:48 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- reverted; apache1 MMN is most likely never change anymore

---- Files affected:
SOURCES:
   rpm.macros (1.273 -> 1.274) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.273 SOURCES/rpm.macros:1.274
--- SOURCES/rpm.macros:1.273	Wed Dec 21 22:53:08 2005
+++ SOURCES/rpm.macros	Thu Dec 22 15:20:42 2005
@@ -195,7 +195,7 @@
 
 %requires_eq_to() %(LC_ALL="C" rpm -q --qf 'Requires: %1 = %%{epoch}:%%{version}\\n' %2 | sed -e 's/ (none):/ /' | grep -v "is not")
 
-%apache_modules_api(v:) %(awk '/#define MODULE_MAGIC_NUMBER_MAJOR/ {print $3}' /usr/include/apache%{-v*}/ap_mmn.h 2>/dev/null || echo ERROR)
+%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	%([ -f %{_kernelsrcdir}/include/linux/version.h ] && (grep UTS_RELEASE %{_kernelsrcdir}/include/linux/version.h 2>/dev/null | head -n 1 | 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); } /^EXTRAVERSION/ { ever = $0; gsub(/EXTRAVERSION.*=/, NIL, ever); gsub(/ /, NIL, ever); } END { printf("%d.%d.%d%s", ver, plev, slev, ever); }' %{_kernelsrcdir}/Makefile 2> /dev/null))
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.273&r2=1.274&f=u