Changeset 1761

Timestamp:

Dec 23, 2010, 10:50:48 PM (14 years ago)

Author:

andersk

Message:

Use arch-specific dependencies in scripts-base

scripts requires both 32-bit and 64-bit versions of certain library
packages; enforce that they are installed.  Also remove the useless
dependencies on openafs and openafs-docs.

Location:

trunk/server/fedora/specs

Files:

• krb5.spec.patch (modified) (1 diff)
• scripts-base.spec (modified) (1 diff)

trunk/server/fedora/specs/krb5.spec.patch

@@ -23 +23 @@
  Summary: The shared libraries used by Kerberos 5
  Group: System Environment/Libraries
-+Provides: scripts-krb5-libs
++Provides: scripts-krb5-libs, scripts-krb5-libs%{?_isa}
  
  %description libs

trunk/server/fedora/specs/scripts-base.spec

@@ -9 +9 @@
 Source: %{name}.tar.gz 
 BuildRoot: %{_tmppath}/%(%{__id_u} -n)-%{name}-%{version}-root
-Requires: accountadm, execsys, scripts-kmod-openafs, scripts-krb5-libs, scripts-httpd, scripts-mod_ssl, openafs, scripts-openafs-client, scripts-openafs-authlibs, scripts-openafs-devel, scripts-openafs-krb5, openafs-docs, scripts-openssh-server, sql-signup, tokensys, whoisd, logview, nss-ldapd, php_scripts, zephyr, httpdmods, nss_nonlocal, scripts-389-ds
+%define all_archs() %1%{?_isa}, %{?__isa_name: %1(%{__isa_name}-32)}
+Requires: accountadm
+Requires: execsys
+Requires: scripts-kmod-openafs
+Requires: %{all_archs scripts-krb5-libs}
+Requires: scripts-httpd
+Requires: scripts-mod_ssl
+Requires: scripts-openafs-client
+Requires: scripts-openafs-authlibs
+Requires: scripts-openafs-devel
+Requires: scripts-openafs-krb5
+Requires: scripts-openssh-server
+Requires: sql-signup
+Requires: tokensys
+Requires: whoisd
+Requires: logview
+Requires: %{all_archs nss-pam-ldapd}
+Requires: php_scripts
+Requires: zephyr
+Requires: %{all_archs zephyr-libs}
+Requires: httpdmods
+Requires: %{all_archs nss_nonlocal}
+Requires: scripts-389-ds
 %define debug_package %{nil}