/[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 329045 by tv, Sun Dec 9 14:01:09 2012 UTC revision 332065 by tv, Mon Dec 17 16:16:58 2012 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 rpmversion      4.10.2  %define snapver         beta1
51    %define rpmversion      4.11.0
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 109  Patch70:       rpm-4.9.1-bb-shortcircuit.patch Line 110  Patch70:       rpm-4.9.1-bb-shortcircuit.patch
110    
111  # don't conflict for doc files  # don't conflict for doc files
112  # (to be able to install lib*-devel together with lib64*-devel even if they have conflicting manpages)  # (to be able to install lib*-devel together with lib64*-devel even if they have conflicting manpages)
113  Patch83: rpm-4.10.0-no-doc-conflicts.patch  Patch83: rpm-4.11.0-no-doc-conflicts.patch
114    
115  # Fix http://qa.mandriva.com/show_bug.cgi?id=19392  # Fix http://qa.mandriva.com/show_bug.cgi?id=19392
116  # (is this working??)  # (is this working??)
# Line 177  Patch2006: rpm-4.10.0-setup-rubygems.pat Line 178  Patch2006: rpm-4.10.0-setup-rubygems.pat
178  Patch2100: rpm-4.10.0-fix-testsuite.diff  Patch2100: rpm-4.10.0-fix-testsuite.diff
179    
180  Patch3000: mips_macros.patch  Patch3000: mips_macros.patch
 Patch3001: fix_stack_protector_check.patch  
181  Patch3002: mips_define_isa_macros.patch  Patch3002: mips_define_isa_macros.patch
182  Patch3003: rpm_arm_mips_isa_macros.patch  Patch3003: rpm_arm_mips_isa_macros.patch
183  Patch3004: rpm_add_armv5tl.patch  Patch3004: rpm_add_armv5tl.patch
# Line 189  Patch3005: rpm-4.10-fix-testsuite-pathes Line 189  Patch3005: rpm-4.10-fix-testsuite-pathes
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
191  #  #
 # (cg) Fedora patch to enable a new check used in the 'filesystem' package for usrmove  
 Patch3500: rpm-4.9.1.2-rpmlib-filesystem-check.patch  
192  # (tv) Compressed debuginfo support (UPSTREAM):  # (tv) Compressed debuginfo support (UPSTREAM):
193  Patch3501: rpm-4.10.0-dwz-debuginfo.patch  Patch3501: rpm-4.10.0-dwz-debuginfo.patch
194  # (tv) Mini debuginfo support (UPSTREAM):  # (tv) Mini debuginfo support (UPSTREAM):
# Line 198  Patch3502: rpm-4.10.0-minidebuginfo.patc Line 196  Patch3502: rpm-4.10.0-minidebuginfo.patc
196    
197  # (tv) merge mga stuff from rpm-setup:  # (tv) merge mga stuff from rpm-setup:
198  Patch4000: rpm-4.10.0-find-debuginfo__mga-cfg.diff  Patch4000: rpm-4.10.0-find-debuginfo__mga-cfg.diff
199  # (tv) enhance debugedit message (UPSTREAM):  # (tv) fix unknow macro option error message:
200  Patch4001: fix-debugedit-log.diff  Patch4004: 0001-display-the-actual-unknown-option-instead-of.patch
 # (tv) upstream fix for RPMDBI_LABEL (UPSTREAM):  
 Patch4002: nvra-prep.diff  
 # (tv) fix 4.10.2 building:  
 Patch4003: rpm-4.10.2-build-fix.diff  
201    
202    
203  License:        GPLv2+  License:        GPLv2+

Legend:
Removed from v.329045  
changed lines
  Added in v.332065

  ViewVC Help
Powered by ViewVC 1.1.30