Move %_fixperms to main macro config

- Fixing broken permissions in sources isn't exactly platform/vendor
  specific in nature (at least Suse adds this this to their own "platform"
  separately, kinda proving the point)
- Kick out the remaining unused RH-pecific platform.in section

diff --git a/macros.in b/macros.in
index a279995..702421e 100644 (file)
--- a/macros.in
+++ b/macros.in
@@ -660,6 +660,9 @@ print (t)\
 %__arch_install_post   %{nil}
 %__os_install_post     %{___build_post}
 
+# Macro to fix broken permissions in sources
+%_fixperms      %{__chmod} -Rf @FIXPERMS@
+
 #==============================================================================
 # ---- Scriptlet template templates.
 #      Global defaults used for building scriptlet templates.

diff --git a/platform.in b/platform.in
index faae9f1..384f415 100644 (file)
--- a/platform.in
+++ b/platform.in
@@ -65,18 +65,6 @@
     %{__os_install_post}\
 %{nil}
 
-@redhat@#---------------------------------------------------------------------
-@redhat@#      Expanded at end of %prep
-@redhat@#
-@redhat@%_fixperms     %{__chmod} -Rf @FIXPERMS@
-@redhat@#---------------------------------------------------------------------
-@redhat@#      Always use %defattr(-,root,root) in %files (added in rpm-4.0.4)
-@redhat@#
-@redhat@#%files(n:f:)  %%files%{?-f: -f %{-f*}}%{?-n: -n %{-n*}} %{?1}\
-@redhat@#%defattr(-,root,root,-)\
-@redhat@#%{nil}
-
-
 @apple@#---------------------------------------------------------------------
 @apple@#       Apple Darwin vendor specific macros
 @apple@#