/[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 25211 by tmb, Wed Jan 19 22:23:53 2011 UTC revision 25212 by blino, Thu Jan 20 01:48:03 2011 UTC
# Line 31  Line 31 
31  %define mklibname(ds)  %{_lib}%{1}%{?2:%{2}}%{?3:_%{3}}%{-s:-static}%{-d:-devel}  %define mklibname(ds)  %{_lib}%{1}%{?2:%{2}}%{?3:_%{3}}%{-s:-static}%{-d:-devel}
32  %endif  %endif
33    
34  #define lc_distro %(echo %{distribution} | tr "A-Z" "a-z")  %define lc_distro %(echo %{distribution} | tr "A-Z" "a-z")
 # FIXME: force distro to mageia to get rid of rpm-manbo-setup*  
 %define lc_distro mageia  
35    
36  %if %{?distsuffix:0}%{?!distsuffix:1}  %if %{?distsuffix:0}%{?!distsuffix:1}
37  %define distsuffix .mga  %define distsuffix .mga
# Line 57  Line 55 
55  %define rpmversion      4.6.1  %define rpmversion      4.6.1
56  %define srcver          %rpmversion  %define srcver          %rpmversion
57  %define libver          4.6  %define libver          4.6
58  %define release         %mkrel 9  %define release         %mkrel 10
59  %define librpmname      %mklibname rpm  %{libver}  %define librpmname      %mklibname rpm  %{libver}
60  %define librpmnamedevel %mklibname -d rpm  %define librpmnamedevel %mklibname -d rpm
61    
# Line 101  Patch31:       rpm-4.6.0-rc1-syslog.patch Line 99  Patch31:       rpm-4.6.0-rc1-syslog.patch
99  # (is it still needed?)  # (is it still needed?)
100  Patch49:        rpm-4.6.0-rc1-provides-obsoleted.patch  Patch49:        rpm-4.6.0-rc1-provides-obsoleted.patch
101    
102    # - force /usr/lib/rpm/manbo/rpmrc instead of /usr/lib/rpm/<vendor>/rpmrc
103    # - read /usr/lib/rpm/manbo/rpmpopt (not only /usr/lib/rpm/rpmpopt)
104    Patch64:    rpm-4.6.0-rc2-manbo-rpmrc-rpmpopt.patch
105    
106  # In original rpm, -bb --short-circuit does not work and run all stage  # In original rpm, -bb --short-circuit does not work and run all stage
107  # From popular request, we allow to do this  # From popular request, we allow to do this
108  # http://qa.mandriva.com/show_bug.cgi?id=15896  # http://qa.mandriva.com/show_bug.cgi?id=15896
Legend:
Removed from v.25211  
changed lines
  Added in v.25212
  ViewVC Help
Powered by ViewVC 1.1.30