From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 12 Jun 2011 18:05:13 +0000 (+0000)
Subject: - added glibc-2.14 patch which adds some symbols no longer available from glibc ... 
X-Git-Tag: auto/th/libtirpc-0_2_2-2~3
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=c672b2a3187bdb91dd12ac5d6a7832e3d1ddc032;p=packages%2Flibtirpc.git

- added glibc-2.14 patch which adds some symbols no longer available from glibc (but still broken: this code relies on more symbols hidden in glibc 2.14)
- BR+R glibc >= 2.14

Changed files:
    libtirpc-glibc-2.14.patch -> 1.1
    libtirpc.spec -> 1.30
---

diff --git a/libtirpc-glibc-2.14.patch b/libtirpc-glibc-2.14.patch
new file mode 100644
index 0000000..28c4f4b
--- /dev/null
+++ b/libtirpc-glibc-2.14.patch
@@ -0,0 +1,14 @@
+--- libtirpc-0.2.2/src/Makefile.am.orig	2011-06-12 17:44:39.795059643 +0200
++++ libtirpc-0.2.2/src/Makefile.am	2011-06-12 19:50:08.598645068 +0200
+@@ -51,7 +51,10 @@
+         rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \
+         rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \
+         svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \
+-        auth_time.c auth_des.c authdes_prot.c des_crypt.c
++        auth_time.c auth_des.c authdes_prot.c
++
++## formerly in glibc
++libtirpc_la_SOURCES += des_crypt.c crypt_client.c key_call.c netname.c rpcdname.c
+ 
+ ## XDR
+ libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c
diff --git a/libtirpc.spec b/libtirpc.spec
index e2b7f91..0c18d20 100644
--- a/libtirpc.spec
+++ b/libtirpc.spec
@@ -17,9 +17,11 @@ Patch1:		%{name}-heimdal.patch
 Patch2:		%{name}-XDR_GETPOS.patch
 Patch3:		%{name}-rpc-des-prot.patch
 Patch4:		%{name}-nis.patch
+Patch5:		%{name}-glibc-2.14.patch
 URL:		http://sourceforge.net/projects/libtirpc/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	glibc >= 6:2.14
 %if %{with gssglue}
 BuildRequires:	libgssglue-devel >= 0.1
 %else
@@ -32,6 +34,7 @@ Requires:	libgssglue >= 0.1
 %else
 Requires:	heimdal-libs
 %endif
+Requires:	glibc >= 6:2.14
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # FIXME: this allows invalid (unresolved symbols) library to be installed.
@@ -67,6 +70,7 @@ Summary:	Development files for the TI-RPC library
 Summary(pl.UTF-8):	Pliki programistyczne biblioteki TI-RPC
 Group:		Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	glibc-devel >= 6:2.14
 %if %{with gssglue}
 Requires:	libgssglue-devel >= 0.1
 %else
@@ -100,6 +104,7 @@ Ten pakiet zawiera statyczną bibliotekę TI-RPC.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}
@@ -135,6 +140,9 @@ for i in $RPM_BUILD_ROOT%{_includedir}/tirpc/rpc/*.h; do
 	ln -s ../tirpc/rpc/$i $RPM_BUILD_ROOT%{_includedir}/rpc/$i
 done
 
+# obsoleted by pkgconfig
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libtirpc.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT