/[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 394238 by tv, Sun Feb 3 12:41:29 2013 UTC revision 441832 by tv, Mon Jun 10 14:01:21 2013 UTC
# Line 47  Line 47 
47  %define __find_requires %{rpmdir}/%{_real_vendor}/find-requires %{?buildroot:%{buildroot}} %{?_target_cpu:%{_target_cpu}}  %define __find_requires %{rpmdir}/%{_real_vendor}/find-requires %{?buildroot:%{buildroot}} %{?_target_cpu:%{_target_cpu}}
48  %define __find_provides %{rpmdir}/%{_real_vendor}/find-provides  %define __find_provides %{rpmdir}/%{_real_vendor}/find-provides
49    
50  #define snapver         beta1  %define snapver         rc1
51  %define rpmversion      4.11.0.1  %define rpmversion      4.11.1
52  %define srcver          %{rpmversion}%{?snapver:-%{snapver}}  %define srcver          %{rpmversion}%{?snapver:-%{snapver}}
53  %define libver          4.10  %define libver          4.10
54  %define libmajor        3  %define libmajor        3
# Line 131  Patch114: rpm-4.9.0-read-macros_d-dot-ma Line 131  Patch114: rpm-4.9.0-read-macros_d-dot-ma
131  #Patch124: rpm-4.6.0-rc1-speedup-by-not-checking-same-files-with-different-paths-through-symlink.patch  #Patch124: rpm-4.6.0-rc1-speedup-by-not-checking-same-files-with-different-paths-through-symlink.patch
132    
133  # [from SuSE] handle "Suggests" via RPMTAG_SUGGESTSNAME  # [from SuSE] handle "Suggests" via RPMTAG_SUGGESTSNAME
134  Patch133: rpm-4.10.0-weakdeps.patch  Patch133: rpm-4.11.1-weakdeps.patch
135  Patch134: extcond.diff  Patch134: extcond.diff
136    
137  # (from Turbolinux) remove a wrong check in case %_topdir is /RPM (ie when it is short)  # (from Turbolinux) remove a wrong check in case %_topdir is /RPM (ie when it is short)
# Line 175  Patch2003: rpm-4.4.2.3-rc1-transmeta-cru Line 175  Patch2003: rpm-4.4.2.3-rc1-transmeta-cru
175  Patch2006: rpm-4.10.0-setup-rubygems.patch  Patch2006: rpm-4.10.0-setup-rubygems.patch
176    
177  # (tv) fix tests:  # (tv) fix tests:
178  Patch2100: rpm-4.10.0-fix-testsuite.diff  Patch2100: rpm-4.11.1-fix-testsuite.diff
179    
180  Patch3000: mips_macros.patch  Patch3000: mips_macros.patch
181  Patch3002: mips_define_isa_macros.patch  Patch3002: mips_define_isa_macros.patch
# Line 184  Patch3004: rpm_add_armv5tl.patch Line 184  Patch3004: rpm_add_armv5tl.patch
184    
185  # when using fakechroot, make sure that testsuite pathes are against /  # when using fakechroot, make sure that testsuite pathes are against /
186  # and not full path  # and not full path
187  Patch3005: rpm-4.10-fix-testsuite-pathes.patch  Patch3005: rpm-4.11.1-fix-testsuite-pathes.patch
188  #  #
189  # Fedora patches  # Fedora patches
190  # Patches 41xx are already in upstream and are 1xx in FC  # Patches 41xx are already in upstream and are 1xx in FC
Legend:
Removed from v.394238  
changed lines
  Added in v.441832
  ViewVC Help
Powered by ViewVC 1.1.30