packages: e2fsprogs/e2fsprogs.spec - skip_post_check_so libcom_err.so.2.1 o...

[glen]

Author: glen                         Date: Sat Jan 14 19:09:42 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- skip_post_check_so libcom_err.so.2.1 on ac (help appreciated to explain/resolve this)

---- Files affected:
packages/e2fsprogs:
   e2fsprogs.spec (1.239 -> 1.240) 

---- Diffs:

================================================================
Index: packages/e2fsprogs/e2fsprogs.spec
diff -u packages/e2fsprogs/e2fsprogs.spec:1.239 packages/e2fsprogs/e2fsprogs.spec:1.240
--- packages/e2fsprogs/e2fsprogs.spec:1.239	Mon Oct 17 21:49:51 2011
+++ packages/e2fsprogs/e2fsprogs.spec	Sat Jan 14 20:09:37 2012
@@ -49,7 +49,7 @@
 Summary(zh_TW.UTF-8):	用於管理 ext2 檔案系統的工具程式。
 Name:		e2fsprogs
 Version:	1.41.14
-Release:	2
+Release:	3
 License:	GPL v2 (with LGPL v2 and BSD parts)
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
@@ -69,7 +69,8 @@
 BuildRequires:	libblkid-devel
 BuildRequires:	libuuid-devel
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.426
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpmbuild(macros) >= 1.583
 BuildRequires:	texinfo
 BuildRequires:	texinfo-texi2dvi
 %if %{with allstatic}
@@ -102,6 +103,16 @@
 # changing CFLAGS in the middle confuses confcache
 %undefine       configure_cache
 
+# objdump -T /lib/libcom_err.so.2.1 | grep ___tls_get_addr
+# on ac it is:
+# 00000000      D  *UND*  00000000              ___tls_get_addr
+# on th it is:
+# 00000000      DF *UND*  00000000  GLIBC_2.3   ___tls_get_addr
+# yet on ac rpm-build-macros think it's unresolved symbol, but program still seem to work
+%if "%{pld_release}" == "ac"
+%define		skip_post_check_so	libcom_err.so.2.1
+%endif
+
 # for some reason known only to rpm there must be "\\|" not "\|" here
 %define		dietarch	%(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/')
 %define		dietlibdir	%{_prefix}/lib/dietlibc/lib-%{dietarch}
@@ -1007,6 +1018,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.240  2012/01/14 19:09:37  glen
+- skip_post_check_so libcom_err.so.2.1 on ac (help appreciated to explain/resolve this)
+
 Revision 1.239  2011/10/17 19:49:51  glen
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/e2fsprogs/e2fsprogs.spec?r1=1.239&r2=1.240&f=u