From f1cb8ffb9f76b87c5b91021d715c9c610d491f63 Mon Sep 17 00:00:00 2001 From: ensc Date: Tue, 23 Feb 2010 08:50:33 +0000 Subject: [PATCH] - require the various subpackages explicitly for -devel; the ld linker scripts broke rpm's autodetection (#567400) - removed -devel Requires: which are covered by pkgconfig autodeps - added %%{?_isa} annotations --- xmlrpc-c.spec | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec index a119bdb..2fb8e20 100644 --- a/xmlrpc-c.spec +++ b/xmlrpc-c.spec @@ -6,7 +6,7 @@ Summary: A lightweight RPC library based on XML and HTTP Name: xmlrpc-c Version: 1.21.00 -Release: %release_func 1400.%svnrev +Release: %release_func 1401.%svnrev # See COPYING for details. # The Python 1.5.2 license used by a few files is just BSD. License: BSD and MIT @@ -35,25 +35,25 @@ BuildRequires: curl-devel libxml2-devel readline-devel ncurses-devel %package c++ Summary: C++ libraries for xmlrpc-c Group: System Environment/Libraries -Requires: %name = %version-%release +Requires: %name%{?_isa} = %version-%release %package client Summary: C client libraries for xmlrpc-c Group: System Environment/Libraries -Requires: %name = %version-%release +Requires: %name%{?_isa} = %version-%release %package client++ Summary: C++ client libraries for xmlrpc-c Group: System Environment/Libraries -Requires: %name = %version-%release +Requires: %name%{?_isa} = %version-%release %package devel Summary: Development files for xmlrpc-c based programs Group: Development/Libraries -Requires: %name = %version-%release -Requires: %name-c++ = %version-%release -Requires: libxml2-devel curl-devel -Requires: pkgconfig +Requires: %name%{?_isa} = %version-%release +Requires: %name-c++%{?_isa} = %version-%release +Requires: %name-client%{?_isa} = %version-%release +Requires: %name-client++%{?_isa} = %version-%release %package apps Summary: Sample XML-RPC applications @@ -231,6 +231,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 23 2010 Enrico Scholz - 1.21.00-1401.1851 +- require the various subpackages explicitly for -devel; the ld linker + scripts broke rpm's autodetection (#567400) +- removed -devel Requires: which are covered by pkgconfig autodeps +- added %%{?_isa} annotations + * Sun Feb 21 2010 Enrico Scholz - 1.21.00-1400.1851 - made linker scripts more 'ldconfig' friendly