SPECS: rpm-build-macros.spec - 1.279 (fixed ruby macros bootstrapp...

[glen]

Author: glen                         Date: Sat Dec 31 13:41:33 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 1.279 (fixed ruby macros bootstrapping)

---- Files affected:
SPECS:
   rpm-build-macros.spec (1.48 -> 1.49) 

---- Diffs:

================================================================
Index: SPECS/rpm-build-macros.spec
diff -u SPECS/rpm-build-macros.spec:1.48 SPECS/rpm-build-macros.spec:1.49
--- SPECS/rpm-build-macros.spec:1.48	Thu Dec 29 17:52:18 2005
+++ SPECS/rpm-build-macros.spec	Sat Dec 31 14:41:28 2005
@@ -1,10 +1,10 @@
 # $Revision$, $Date$
-%define	rpm_macros_rev	1.277
+%define	rpm_macros_rev	1.279
 Summary:	PLD Linux RPM build macros
 Summary(pl):	Makra do budowania pakietów RPM dla Linuksa PLD
 Name:		rpm-build-macros
 Version:	%{rpm_macros_rev}
-Release:	1
+Release:	0.1
 License:	GPL
 Group:		Base
 Source0:	rpm.macros
@@ -15,7 +15,7 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_rpmlibdir /usr/lib/rpm
+%define		_rpmlibdir %{_prefix}/lib/rpm
 
 %description
 This package contains rpm build macros for PLD Linux.
@@ -24,8 +24,9 @@
 Ten pakiet zawiera makra rpm-a do budowania pakietów dla Linuksa PLD.
 
 %prep
-if ! awk '/^#.*Revision:.*Date/{exit($3 > %{rpm_macros_rev})}' %{SOURCE0}; then
-	echo >&2 "Update rpm_macros_rev, it seems outdated"
+rev=$(awk '/^#.*Revision:.*Date/{print $3}' %{SOURCE0})
+if [ "$rev" != "%rpm_macros_rev" ]; then
+	: Update rpm_macros_rev define to $rev, and retry
 	exit 1
 fi
 
@@ -49,11 +50,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.49  2005/12/31 13:41:28  glen
+- 1.279 (fixed ruby macros bootstrapping)
+
 Revision 1.48  2005/12/29 16:52:18  twittner
 - ver. 1.277, STBR
 
 Revision 1.47  2005/12/29 16:50:19  twittner
-- add %%ruby_ver_requires_eq and %%ruby_ver_mod_requires_eq
+- add %ruby_ver_requires_eq and %ruby_ver_mod_requires_eq
   (Requires: ruby-modules(ver) = major version of ruby)
 
 Revision 1.46  2005/12/21 21:54:13  glen
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm-build-macros.spec?r1=1.48&r2=1.49&f=u