/[packages]/updates/infra_2/rpm/current/SPECS/rpm.spec
ViewVC logotype

Diff of /updates/infra_2/rpm/current/SPECS/rpm.spec

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 267693 by tv, Wed Jun 27 23:01:08 2012 UTC revision 267694 by rtp, Wed Jul 4 15:32:17 2012 UTC
# Line 52  Line 52 
52  %define libver          4.10  %define libver          4.10
53  %define libmajor        3  %define libmajor        3
54  %define libmajorsign    1  %define libmajorsign    1
55  %define release         %mkrel %{?snapver:0.%{snapver}.}2  %define release         %mkrel %{?snapver:0.%{snapver}.}3
56  %define librpmname      %mklibname rpm  %{libmajor}  %define librpmname      %mklibname rpm  %{libmajor}
57  %define librpmnamedevel %mklibname -d rpm  %define librpmnamedevel %mklibname -d rpm
58  %define librpmsign      %mklibname rpmsign %{libmajor}  %define librpmsign      %mklibname rpmsign %{libmajor}
# Line 181  Patch3002: mips_define_isa_macros.patch Line 181  Patch3002: mips_define_isa_macros.patch
181  Patch3003: rpm_arm_mips_isa_macros.patch  Patch3003: rpm_arm_mips_isa_macros.patch
182  Patch3004: rpm_add_armv5tl.patch  Patch3004: rpm_add_armv5tl.patch
183    
184    # when using fakechroot, make sure that testsuite pathes are against /
185    # and not full path
186    Patch3005: rpm-4.10-fix-testsuite-pathes.patch
187  #  #
188  # Fedora patches  # Fedora patches
189  # Patches 41xx are already in upstream and are 1xx in FC  # Patches 41xx are already in upstream and are 1xx in FC
# Line 481  fi Line 484  fi
484  %attr(   -, rpm, rpm) %{rpmdir}/platform/athlon-*  %attr(   -, rpm, rpm) %{rpmdir}/platform/athlon-*
485  %attr(   -, rpm, rpm) %{rpmdir}/platform/pentium*-*  %attr(   -, rpm, rpm) %{rpmdir}/platform/pentium*-*
486  %attr(   -, rpm, rpm) %{rpmdir}/platform/geode-*  %attr(   -, rpm, rpm) %{rpmdir}/platform/geode-*
487  %endif  %else
488  %ifarch %{ix86}  %exclude %{rpmdir}/platform/i*86-linux/macros
489  %exclude %{rpmdir}/platform/amd64-linux/macros  %exclude %{rpmdir}/platform/athlon-linux/macros
490  %exclude %{rpmdir}/platform/ia32e-linux/macros  %exclude %{rpmdir}/platform/pentium*-linux/macros
491  %exclude %{rpmdir}/platform/x86_64-linux/macros  %exclude %{rpmdir}/platform/geode-linux/macros
492  %endif  %endif
493  %ifarch x86_64  %ifarch x86_64
494  %attr(   -, rpm, rpm) %{rpmdir}/platform/amd64-*  %attr(   -, rpm, rpm) %{rpmdir}/platform/amd64-*
495  %attr(   -, rpm, rpm) %{rpmdir}/platform/x86_64-*  %attr(   -, rpm, rpm) %{rpmdir}/platform/x86_64-*
496  %attr(   -, rpm, rpm) %{rpmdir}/platform/ia32e-*  %attr(   -, rpm, rpm) %{rpmdir}/platform/ia32e-*
497    %else
498    %exclude %{rpmdir}/platform/amd64-linux/macros
499    %exclude %{rpmdir}/platform/ia32e-linux/macros
500    %exclude %{rpmdir}/platform/x86_64-linux/macros
501  %endif  %endif
502  %ifarch %arm  %ifarch %arm
503  %attr(   -, rpm, rpm) %{rpmdir}/platform/arm*  %attr(   -, rpm, rpm) %{rpmdir}/platform/arm*
Legend:
Removed from v.267693  
changed lines
  Added in v.267694
  ViewVC Help
Powered by ViewVC 1.1.30