/[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 255920 by dmorgan, Thu Apr 19 16:09:05 2012 UTC revision 255921 by tv, Tue Jun 5 18:04:37 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.9.1.3  %define rpmversion      4.10.0
51  %define srcver          %{rpmversion}%{?snapver:-%{snapver}}  %define srcver          %{rpmversion}%{?snapver:-%{snapver}}
52  %define libver          4.9  %define libver          4.9
53  %define libmajor        2  %define libmajor        3
54  %define libmajorsign    0  %define libmajorsign    1
55  %define release         %mkrel %{?snapver:0.%{snapver}.}2  %define release         %mkrel %{?snapver:0.%{snapver}.}0.2
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 98  Patch31:       rpm-4.9.0-syslog.patch Line 98  Patch31:       rpm-4.9.0-syslog.patch
98    
99  # part of Backport from 4.2.1 provides becoming obsoletes bug (fpons)  # part of Backport from 4.2.1 provides becoming obsoletes bug (fpons)
100  # (is it still needed?)  # (is it still needed?)
101  Patch49:        rpm-4.9.0-provides-obsoleted.patch  #Patch49:       rpm-4.9.0-provides-obsoleted.patch
102    
103  # - force /usr/lib/rpm/mageia/rpmrc instead of /usr/lib/rpm/<vendor>/rpmrc  # - force /usr/lib/rpm/mageia/rpmrc instead of /usr/lib/rpm/<vendor>/rpmrc
104  # - read /usr/lib/rpm/mageia/rpmpopt (not only /usr/lib/rpm/rpmpopt)  # - read /usr/lib/rpm/mageia/rpmpopt (not only /usr/lib/rpm/rpmpopt)
# Line 118  Patch70:       rpm-4.9.1-bb-shortcircuit.patch Line 118  Patch70:       rpm-4.9.1-bb-shortcircuit.patch
118    
119  # don't conflict for doc files  # don't conflict for doc files
120  # (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)
121  Patch83: rpm-4.9.0-no-doc-conflicts.patch  #BETA Patch83: rpm-4.9.0-no-doc-conflicts.patch
122    
123  # Fix http://qa.mandriva.com/show_bug.cgi?id=19392  # Fix http://qa.mandriva.com/show_bug.cgi?id=19392
124  # (is this working??)  # (is this working??)
125  Patch84: rpm-4.4.2.2-rpmqv-ghost.patch  Patch84: rpm-4.4.2.2-rpmqv-ghost.patch
126    
127  # Fix diff issue when buildroot contains some "//"  # Fix diff issue when buildroot contains some "//"
128  Patch111: rpm-check-file-trim-double-slash-in-buildroot.patch  #Patch111: rpm-check-file-trim-double-slash-in-buildroot.patch
129    
130  # [Dec 2008] macrofiles from rpmrc does not overrides MACROFILES anymore  # [Dec 2008] macrofiles from rpmrc does not overrides MACROFILES anymore
131  Patch114: rpm-4.9.0-read-macros_d-dot-macros.patch  Patch114: rpm-4.9.0-read-macros_d-dot-macros.patch
# Line 138  Patch114: rpm-4.9.0-read-macros_d-dot-ma Line 138  Patch114: rpm-4.9.0-read-macros_d-dot-ma
138  #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
139    
140  # [from SuSE] handle "Suggests" via RPMTAG_SUGGESTSNAME  # [from SuSE] handle "Suggests" via RPMTAG_SUGGESTSNAME
141  Patch133: rpm-4.9.1.1-weakdeps.patch  Patch133: rpm-4.10.0-weakdeps.patch
142  Patch134: extcond.diff  Patch134: extcond.diff
143    
144  # (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 150  Patch137: rpm-4.9.1.1-headerIconv.patch Line 150  Patch137: rpm-4.9.1.1-headerIconv.patch
150  # without this patch, "#%define foo bar" is surprisingly equivalent to "%define foo bar"  # without this patch, "#%define foo bar" is surprisingly equivalent to "%define foo bar"
151  # with this patch, "#%define foo bar" is a fatal error  # with this patch, "#%define foo bar" is a fatal error
152  # Bug still valid => Send upstream for review.  # Bug still valid => Send upstream for review.
153  Patch145: rpm-forbid-badly-commented-define-in-spec.patch  #Patch145: rpm-forbid-badly-commented-define-in-spec.patch
154    
155  # cf http://wiki.mandriva.com/en/Rpm_filetriggers  # cf http://wiki.mandriva.com/en/Rpm_filetriggers
156  # Will be allowed to be dropped when "Collection" won't be experimental anymore.  # Will be allowed to be dropped when "Collection" won't be experimental anymore.
# Line 167  Patch152: rpm-4.6.0-rc1-fix-nss-detectio Line 167  Patch152: rpm-4.6.0-rc1-fix-nss-detectio
167    
168  #Patch157: introduce-_after_setup-which-is-called-after-setup.patch  #Patch157: introduce-_after_setup-which-is-called-after-setup.patch
169  #Patch158: introduce-_patch-and-allow-easy-override-when-the-p.patch  #Patch158: introduce-_patch-and-allow-easy-override-when-the-p.patch
170  Patch159: introduce-apply_patches-and-lua-var-patches_num.patch  #Patch159: introduce-apply_patches-and-lua-var-patches_num.patch
171    
172  Patch1007: rpm-4.6.0-rc3-xz-support.patch  Patch1007: rpm-4.6.0-rc3-xz-support.patch
173    
# Line 178  Patch1007: rpm-4.6.0-rc3-xz-support.patc Line 178  Patch1007: rpm-4.6.0-rc3-xz-support.patc
178  # Exposes packagecolor tag and adds new tags from rpm5 as it otherwise will  # Exposes packagecolor tag and adds new tags from rpm5 as it otherwise will
179  # break when these unknown tags might be found in the rpmdb. Notice that this  # break when these unknown tags might be found in the rpmdb. Notice that this
180  # will only make rpm recognize these, not implement actual support for them..  # will only make rpm recognize these, not implement actual support for them..
181  Patch1009: rpm-4.9.1.2-rpm5-tags.patch  #Patch1009: rpm-4.9.1.2-rpm5-tags.patch
182    
183  # Turbolinux patches  # Turbolinux patches
184  # Crusoe CPUs say that their CPU family is "5" but they have enough features for i686.  # Crusoe CPUs say that their CPU family is "5" but they have enough features for i686.
# Line 192  Patch2003: rpm-4.4.2.3-rc1-transmeta-cru Line 192  Patch2003: rpm-4.4.2.3-rc1-transmeta-cru
192  # display characters which you expected.  # display characters which you expected.
193  Patch2005: rpm-4.9.0-buildlang.patch  Patch2005: rpm-4.9.0-buildlang.patch
194    
195  Patch2006: rpm-4.8.1-setup-rubygems.patch  #Patch2006: rpm-4.8.1-setup-rubygems.patch
196    
197    # (tv) fix tests on non selinux systems:
198    #BETA Patch2100: rpm-4.9.90-fix-test.diff
199    
200  Patch3000: mips_macros.patch  Patch3000: mips_macros.patch
201  Patch3001: fix_stack_protector_check.patch  Patch3001: fix_stack_protector_check.patch
202  Patch3002: mips_define_isa_macros.patch  #Patch3002: mips_define_isa_macros.patch
203  Patch3003: rpm_arm_mips_isa_macros.patch  #Patch3003: rpm_arm_mips_isa_macros.patch
204  Patch3004: rpm_add_armv5tl.patch  #Patch3004: rpm_add_armv5tl.patch
205  Patch3005: rpm-4.9.x-kill-libio.patch  #Patch3005: rpm-4.9.x-kill-libio.patch
   
 # see: http://rpm.org/gitweb?p=rpm.git;a=commit;h=1684b696111cca7a3b96bf22f8168baab2a2c5e6  
 Patch4000: rpm-4.9.1.3-fix-stabs-debuginfo-error.patch  
206    
207  #  #
208  # Fedora patches  # Fedora patches
209  # Patches 41xx are already in upstream and are 1xx in FC  # Patches 41xx are already in upstream and are 1xx in FC
210  #  #
 # RH bug:   https://bugzilla.redhat.com/show_bug.cgi?id=752897  
 # upstream commit: http://rpm.org/gitweb?p=rpm.git;a=commitdiff;h=d8cd36058b528f56bd579204426143be1e1eac6d  
 # RH patch: http://pkgs.fedoraproject.org/gitweb/?p=rpm.git;a=commitdiff;h=e8efccb3d4664335b1f14e2b5a08121fa9eed2a1  
 # RH announce: http://www.mail-archive.com/package-announce@lists.fedoraproject.org/msg38883.html  
 Patch4102: rpm-4.9.x-mpsize.patch  
 # fix memory corruption on rpmdb size estimation (#766260)  
 # (might help mga#4918):  
 Patch4103: rpm-4.9.x-rpmdb-dsi.patch  
 # fix couple of memleaks in python bindings (RH#782147)  
 Patch4104: rpm-4.9.x-python-memleaks.patch  
 # fix regression in verify output formatting (RH#797964)  
 Patch4105: rpm-4.9.x-verify-output.patch  
 # dont process spec include in false branch of if (RH#782970)  
 Patch4106: rpm-4.9.x-include-cond.patch  
 # only warn on missing excluded files on build (RH#745629)  
 Patch4107: rpm-4.9.x-exclude-warn.patch  
 # dont free up file info sets on test transactions  
 Patch4108: rpm-4.9.x-tstest-fileinfo.patch  
211    
212  License:        GPLv2+  License:        GPLv2+
213  BuildRequires:  autoconf  BuildRequires:  autoconf
# Line 274  Requires(pre):         rpm-helper Line 256  Requires(pre):         rpm-helper
256  Requires(pre):          coreutils  Requires(pre):          coreutils
257  Requires(postun):       rpm-helper  Requires(postun):       rpm-helper
258    
259  Conflicts: perl-URPM < 3.38.4-1.1.mga2  Conflicts: perl-URPM < 3.41-1.mga3
260    
261  %description  %description
262  RPM is a powerful command line driven package management system capable of  RPM is a powerful command line driven package management system capable of
# Line 611  fi Line 593  fi
593  %rpmattr        %{_prefix}/lib/rpm/check-prereqs  %rpmattr        %{_prefix}/lib/rpm/check-prereqs
594  %rpmattr        %{_prefix}/lib/rpm/check-rpaths  %rpmattr        %{_prefix}/lib/rpm/check-rpaths
595  %rpmattr        %{_prefix}/lib/rpm/check-rpaths-worker  %rpmattr        %{_prefix}/lib/rpm/check-rpaths-worker
596  %rpmattr        %{_prefix}/lib/rpm/javadeps  #rpmattr        %{_prefix}/lib/rpm/javadeps
597  %rpmattr        %{_prefix}/lib/rpm/libtooldeps.sh  %rpmattr        %{_prefix}/lib/rpm/libtooldeps.sh
598  %rpmattr        %{_prefix}/lib/rpm/macros.perl  %rpmattr        %{_prefix}/lib/rpm/macros.perl
599  %rpmattr        %{_prefix}/lib/rpm/macros.php  %rpmattr        %{_prefix}/lib/rpm/macros.php
# Line 628  fi Line 610  fi
610  #%rpmattr       %{_prefix}/lib/rpm/trpm  #%rpmattr       %{_prefix}/lib/rpm/trpm
611  %rpmattr        %{_prefix}/lib/rpm/pythondeps.sh  %rpmattr        %{_prefix}/lib/rpm/pythondeps.sh
612    
613    %{_prefix}/lib/rpm/platform/alpha*/macros
614    %{_prefix}/lib/rpm/platform/arm*/macros
615    %{_prefix}/lib/rpm/platform/*-linux/macros
616    
617    
618  %{_mandir}/man8/rpmbuild.8*  %{_mandir}/man8/rpmbuild.8*
619  %{_mandir}/man8/rpmdeps.8*  %{_mandir}/man8/rpmdeps.8*
620    
Legend:
Removed from v.255920  
changed lines
  Added in v.255921
  ViewVC Help
Powered by ViewVC 1.1.30