Author: glen Date: Tue Jul 15 00:35:47 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- ac compatible libtool macro
---- Files affected:
SPECS:
rpm-build-macros.spec (1.178 -> 1.179)
---- Diffs:
================================================================
Index: SPECS/rpm-build-macros.spec
diff -u SPECS/rpm-build-macros.spec:1.178 SPECS/rpm-build-macros.spec:1.179
--- SPECS/rpm-build-macros.spec:1.178 Tue Jul 1 13:44:03 2008
+++ SPECS/rpm-build-macros.spec Tue Jul 15 02:35:41 2008
@@ -1,5 +1,5 @@
# $Revision$, $Date$
-%define rpm_macros_rev 1.467
+%define rpm_macros_rev 1.468
%define find_lang_rev 1.32
Summary: PLD Linux RPM build macros
Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD
@@ -12,8 +12,9 @@
Source1: service_generator.sh
Source2: rpm-build.sh
Source3: rpm-find-lang
-Provides: rpmbuild(find_lang) = %{find_lang_rev}
+BuildRequires: rpm >= 4.4.9-56
Requires: findutils >= 1:4.2.26
+Provides: rpmbuild(find_lang) = %{find_lang_rev}
Provides: rpmbuild(macros) = %{rpm_macros_rev}
Obsoletes: rpm-macros
Conflicts: gettext-devel < 0.11
@@ -22,8 +23,10 @@
# php-config --sysconfdir
Conflicts: php-devel < 4:5.2.0-3
Conflicts: php4-devel < 3:4.4.4-10
+%if "%{pld_release}" != "ac"
# libtool --install
-Conflicts: libtool < 2:2.2
+Conflicts: libtool < 2:2.2
+%endif
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,11 +50,16 @@
: Update find_lang_rev define to $rev, and retry
exit 1
fi
+cp %{SOURCE0} .
+
+%if "%{pld_release}" == "ac"
+%{__sed} -i -e '/libtoolize --copy --force --install/s/ --install//' rpm.macros
+%endif
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_rpmlibdir},/etc/shrc.d}
-cp %{SOURCE0} $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
+cp rpm.macros $RPM_BUILD_ROOT%{_rpmlibdir}/macros.build
install %{SOURCE1} $RPM_BUILD_ROOT%{_rpmlibdir}/service_generator.sh
install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d/rpm-build.sh
install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
@@ -72,6 +80,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.179 2008/07/15 00:35:41 glen
+- ac compatible libtool macro
+
Revision 1.178 2008/07/01 11:44:03 arekm
- 1.467; no tabs/spaces in front of xorg deps
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm-build-macros.spec?r1=1.178&r2=1.179&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
