Sanitize python object -> tag number exception handling

[platform/upstream/rpm.git] / platform.in

diff --git a/platform.in b/platform.in
index ed4f148..4a23a9e 100644 (file)
--- a/platform.in
+++ b/platform.in
@@ -33,21 +33,16 @@
 %_oldincludedir                @oldincludedir@
 %_infodir              @infodir@
 %_mandir               @mandir@
-%_initrddir            %{_sysconfdir}/rc.d/init.d
+%_initddir             %{_sysconfdir}/rc.d/init.d
+# Deprecated misspelling, present for backwards compatibility.
+%_initrddir            %{_initddir}
 
-%_defaultdocdir                @DEFAULTDOCDIR@
+%_defaultdocdir                %{_datadir}/doc
 
 %_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
        && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
        [ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
 
-@MULTILIBSTART@
-#---------------------------------------------------------------------
-#      Multilibs
-%_multilibno           @MULTILIBNO@
-%_multilibpatt         (/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\\.([oa]|la|so[0-9.]*)$
-@MULTILIBEND@
-
 #==============================================================================
 # ---- Build policy macros.
 #
@@ -58,10 +53,10 @@
 %__arch_install_post   @ARCH_INSTALL_POST@
 
 %__os_install_post    \
-    @RPMCONFIGDIR@/brp-compress \
-    @RPMCONFIGDIR@/brp-strip \
-    @RPMCONFIGDIR@/brp-strip-static-archive \
-    @RPMCONFIGDIR@/brp-strip-comment-note \
+    %{_rpmconfigdir}/brp-compress \
+    %{_rpmconfigdir}/brp-strip \
+    %{_rpmconfigdir}/brp-strip-static-archive \
+    %{_rpmconfigdir}/brp-strip-comment-note \
 %{nil}
 
 %__spec_install_post\
@@ -76,8 +71,6 @@
 @redhat@%__id_u                @__ID_U@
 @redhat@%__chown_Rhf   @__CHOWN_RHF@
 @redhat@%__chgrp_Rhf   @__CHGRP_RHF@
-@redhat@%_fixowner     [ `%{__id_u}` = '0' ] && %{__chown_Rhf} root
-@redhat@%_fixgroup     [ `%{__id_u}` = '0' ] && %{__chgrp_Rhf} @ROOT_GROUP@
 @redhat@%_fixperms     %{__chmod} -Rf @FIXPERMS@
 @redhat@#---------------------------------------------------------------------
 @redhat@#      Always use %defattr(-,root,root) in %files (added in rpm-4.0.4)
@@ -110,7 +103,7 @@
 @mandrake@# XXX A copy of brp-mandrake, please. I'd suggest break down by
 @mandrake@#     functionality rather than vendor <shrug>.
 @mandrake@%__os_install_post    \
-@mandrake@    @RPMCONFIGDIR@/brp-mandrake \
+@mandrake@    %{_rpmconfigdir}/brp-mandrake \
 @mandrake@%{nil}
 @mandrake@
 @mandrake@# make