Author: glen Date: Wed Mar 7 17:13:30 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- install find-lang script in %install
- add (disabled) %{error} patch
- ignore missing .mo files
---- Files affected:
SPECS:
rpm.spec (1.555.2.189 -> 1.555.2.190)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.189 SPECS/rpm.spec:1.555.2.190
--- SPECS/rpm.spec:1.555.2.189 Mon Mar 5 14:22:37 2007
+++ SPECS/rpm.spec Wed Mar 7 18:13:25 2007
@@ -74,6 +74,7 @@
Patch16: %{name}-php-deps.patch
Patch17: %{name}-ldconfig-always.patch
Patch18: %{name}-perl_req.patch
+Patch19: %{name}-error-fatal.patch
Patch20: %{name}-magic-usesystem.patch
Patch21: %{name}-dontneedutils.patch
Patch22: %{name}-provides-dont-obsolete.patch
@@ -254,8 +255,8 @@
Group: Libraries
Requires: beecrypt >= %{beecrypt_ver}
Requires: db >= %{reqdb_ver}
-%{?with_selinux:Requires: libselinux >= 1.18}
%{?with_system_libmagic:Requires: libmagic >= 1.15-2}
+%{?with_selinux:Requires: libselinux >= 1.18}
Requires: popt >= %{reqpopt_ver}
Obsoletes: rpm-libs
# avoid SEGV caused by mixed db versions
@@ -639,6 +640,7 @@
%patch16 -p1
%patch17 -p1
%patch18 -p1
+#%patch19 -p1
sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
#cp -f platform.in macros.pld.in # what for?
echo '%%define __perl_provides %%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
@@ -648,7 +650,6 @@
echo '%%define __php_requires /usr/lib/rpm/php.req' >> macros.php
echo '%%define __mono_provides /usr/lib/rpm/mono-find-provides' > macros.mono
echo '%%define __mono_requires /usr/lib/rpm/mono-find-requires' >> macros.mono
-install %{SOURCE5} scripts/find-lang.sh
install %{SOURCE9} scripts/php.prov.in
install %{SOURCE10} scripts/php.req.in
install %{SOURCE12} scripts/perl.prov
@@ -797,6 +798,7 @@
install %{SOURCE13} $RPM_BUILD_ROOT%{_rpmlibdir}/user_group.sh
install scripts/find-php* $RPM_BUILD_ROOT%{_rpmlibdir}
install scripts/php.{prov,req} $RPM_BUILD_ROOT%{_rpmlibdir}
+install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/find-lang.sh
install %{SOURCE14} $RPM_BUILD_ROOT/etc/sysconfig/rpm
install %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/builder
@@ -925,9 +927,11 @@
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-for f in
$RPM_BUILD_ROOT%{_datadir}/locale/{en_RN,eu_ES,gl,hu,ro,wa,zh,zh_CN.GB2312}/LC_MESSAGES/rpm.mo
; do
+for f in
$RPM_BUILD_ROOT%{_datadir}/locale/{en_RN,eu_ES,gl,hu,ro,wa,zh,zh_CN.GB2312}/LC_MESSAGES/rpm.mo;
do
+ [ -f "$f" ] || continue
[ "`file $f | sed -e 's/.*,//' -e 's/message.*//'`" -le 1 ] && rm -f $f
done
+
%find_lang %{name}
rm -rf manual
@@ -1171,6 +1175,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.555.2.190 2007/03/07 17:13:25 glen
+- install find-lang script in %install
+- add (disabled) %{error} patch
+- ignore missing .mo files
+
Revision 1.555.2.189 2007/03/05 13:22:37 arekm
- rel 41; cpuinfo and iconv patch do work for me
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.189&r2=1.555.2.190&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
