/[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 260027 by fwang, Tue Jun 12 12:18:43 2012 UTC revision 262316 by tv, Wed Jun 20 18:34:37 2012 UTC
# Line 52  Line 52 
52  %define libver          4.9  %define libver          4.9
53  %define libmajor        3  %define libmajor        3
54  %define libmajorsign    1  %define libmajorsign    1
55  %define release         %mkrel %{?snapver:0.%{snapver}.}0.3  %define release         %mkrel %{?snapver:0.%{snapver}.}0.8
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 91  Patch17:       rpm-4.4.2.2-gendiff-improved.pa Line 91  Patch17:       rpm-4.4.2.2-gendiff-improved.pa
91  #  #
92  # (nb: the exit code for pretrans/posttrans & trigger/triggerun/triggerpostun  # (nb: the exit code for pretrans/posttrans & trigger/triggerun/triggerpostun
93  #       scripts is ignored with or without this patch)  #       scripts is ignored with or without this patch)
94    # Needed for urpmi testsuite:
95  Patch22:        rpm-4.9.0-non-pre-scripts-dont-fail.patch  Patch22:        rpm-4.9.0-non-pre-scripts-dont-fail.patch
96    
97  # (fredl) add loging facilities through syslog  # (fredl) add loging facilities through syslog
# Line 139  Patch134: extcond.diff Line 140  Patch134: extcond.diff
140  # might be technically possible but debugedit currently does not even try to."  # might be technically possible but debugedit currently does not even try to."
141  Patch135: rpm-4.9.0-fix-debugedit.patch  Patch135: rpm-4.9.0-fix-debugedit.patch
142    
 # convert data in the header to a specific encoding which used in the selected locale.  
 # Not that usefull, everything should be UTF-8  
 Patch137: rpm-4.9.1.1-headerIconv.patch  
   
143  # 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"
144  # with this patch, "#%define foo bar" is a fatal error  # with this patch, "#%define foo bar" is a fatal error
145  # Bug still valid => Send upstream for review.  # Bug still valid => Send upstream for review.
# Line 159  Patch146: rpm-4.9.1.1-filetriggers.patch Line 156  Patch146: rpm-4.9.1.1-filetriggers.patch
156  # (nb: see the patch for more info about this issue)  # (nb: see the patch for more info about this issue)
157  #Patch151: rpm-4.6.0-rc1-protect-against-non-robust-futex.patch  #Patch151: rpm-4.6.0-rc1-protect-against-non-robust-futex.patch
158    
 Patch152: rpm-4.6.0-rc1-fix-nss-detection.patch  
   
159  #Patch157: introduce-_after_setup-which-is-called-after-setup.patch  #Patch157: introduce-_after_setup-which-is-called-after-setup.patch
160  #Patch158: introduce-_patch-and-allow-easy-override-when-the-p.patch  #Patch158: introduce-_patch-and-allow-easy-override-when-the-p.patch
161  Patch159: introduce-apply_patches-and-lua-var-patches_num.patch  Patch159: introduce-apply_patches-and-lua-var-patches_num.patch
# Line 171  Patch1007: rpm-4.6.0-rc3-xz-support.patc Line 166  Patch1007: rpm-4.6.0-rc3-xz-support.patc
166  # as this breaks stuff that installs files to $DOCDIR during %%install  # as this breaks stuff that installs files to $DOCDIR during %%install
167  #Patch1008: rpm-4.6.0-rc3-no_rm_-rf_DOCDIR.patch  #Patch1008: rpm-4.6.0-rc3-no_rm_-rf_DOCDIR.patch
168    
 # Exposes packagecolor tag and adds new tags from rpm5 as it otherwise will  
 # break when these unknown tags might be found in the rpmdb. Notice that this  
 # will only make rpm recognize these, not implement actual support for them..  
 Patch1009: rpm-4.10.0-rpm5-tags.patch  
   
169  # Turbolinux patches  # Turbolinux patches
170  # 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.
171  Patch2003: rpm-4.4.2.3-rc1-transmeta-crusoe-is-686.patch  Patch2003: rpm-4.4.2.3-rc1-transmeta-crusoe-is-686.patch
172    
 # The following patch isn't needed for Mandriva, but Turbolinux has it and it can't hurt much  
 #  
 # This patch fixes the problem when the post-scripts launched by rpm-build.  
 # The post-scripts launched by rpm-build works in LANG environment. If LANG is  
 # other locale except C, then some commands launched by post-scripts will not  
 # display characters which you expected.  
 Patch2005: rpm-4.9.0-buildlang.patch  
   
173  Patch2006: rpm-4.10.0-setup-rubygems.patch  Patch2006: rpm-4.10.0-setup-rubygems.patch
174    
175  # (tv) fix tests on non selinux systems:  # (tv) fix tests:
176  #BETA Patch2100: rpm-4.9.90-fix-test.diff  Patch2100: rpm-4.10.0-fix-testsuite.diff
177    
178  Patch3000: mips_macros.patch  Patch3000: mips_macros.patch
179  Patch3001: fix_stack_protector_check.patch  Patch3001: fix_stack_protector_check.patch
# Line 364  autoreconf Line 346  autoreconf
346  %if %builddebug  %if %builddebug
347  RPM_OPT_FLAGS=-g  RPM_OPT_FLAGS=-g
348  %endif  %endif
349    export CPPFLAGS="$CPPFLAGS `pkg-config --cflags nss`"
350  CFLAGS="$RPM_OPT_FLAGS -fPIC" CXXFLAGS="$RPM_OPT_FLAGS -fPIC" \  CFLAGS="$RPM_OPT_FLAGS -fPIC" CXXFLAGS="$RPM_OPT_FLAGS -fPIC" \
351      %configure2_5x \      %configure2_5x \
352          --enable-nls \          --enable-nls \
# Line 467  fi Line 450  fi
450  %attr(0755, rpm, rpm) %{_bindir}/rpmdb  %attr(0755, rpm, rpm) %{_bindir}/rpmdb
451  %attr(0755, rpm, rpm) %{_bindir}/rpmkeys  %attr(0755, rpm, rpm) %{_bindir}/rpmkeys
452  %attr(0755, rpm, rpm) %{_bindir}/rpmgraph  %attr(0755, rpm, rpm) %{_bindir}/rpmgraph
 %attr(0755, rpm, rpm) %{_bindir}/rpmsign  
453  %attr(0755, rpm, rpm) %{_bindir}/rpmquery  %attr(0755, rpm, rpm) %{_bindir}/rpmquery
454  %attr(0755, rpm, rpm) %{_bindir}/rpmverify  %attr(0755, rpm, rpm) %{_bindir}/rpmverify
455    

Legend:
Removed from v.260027  
changed lines
  Added in v.262316

  ViewVC Help
Powered by ViewVC 1.1.30