SPECS (AC-branch): rpm-build-macros.spec - HEAD merge

[glen]

Author: glen                         Date: Tue Jul  3 22:15:05 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge

---- Files affected:
SPECS:
   rpm-build-macros.spec (1.112.2.3 -> 1.112.2.4) 

---- Diffs:

================================================================
Index: SPECS/rpm-build-macros.spec
diff -u SPECS/rpm-build-macros.spec:1.112.2.3 SPECS/rpm-build-macros.spec:1.112.2.4
--- SPECS/rpm-build-macros.spec:1.112.2.3	Wed Jul  4 00:10:34 2007
+++ SPECS/rpm-build-macros.spec	Wed Jul  4 00:15:00 2007
@@ -14,12 +14,13 @@
 Requires:	findutils >= 1:4.2.26
 Provides:	rpmbuild(macros) = %{rpm_macros_rev}
 Obsoletes:	rpm-macros
-BuildArch:	noarch
+Conflicts:	gettext-devel < 0.11
 # for _x_libraries macro
 Conflicts:	rpm < 4.4.2-27.1
 # php-config --sysconfdir
 Conflicts:	php-devel < 4:5.2.0-3
 Conflicts:	php4-devel < 3:4.4.4-10
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_rpmlibdir %{_prefix}/lib/rpm
@@ -62,8 +63,26 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.112.2.4  2007/07/03 22:15:00  glen
+- HEAD merge
+
 Revision 1.112.2.3  2007/07/03 22:10:34  glen
 - update macros to 1.387; keeping ac-kernel macros
+
+Revision 1.125  2007/06/17 10:06:25  qboosh
+- should be gettext-devel
+
+Revision 1.124  2007/06/17 10:05:59  qboosh
+- gettext 0.10 is no longer supported, Conflicts added
+
+Revision 1.123  2007/06/14 21:09:20  arekm
+- up to 1.386; fix __gettextize macro
+
+Revision 1.122  2007/06/03 17:49:39  qboosh
+- 1.384 (only *.info* are compressed in %{_infodir}
+
+Revision 1.121  2007/04/09 16:08:44  qboosh
+- 1.382 (pass FCFLAGS for Fortran > 77)
 
 Revision 1.112.2.2  2007/05/22 20:25:18  glen
 - rel 2
================================================================

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