projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| 35e62e3f ER |
1 | --- rpm-4.5/macros.in 2008-09-03 16:47:30.861766714 +0300 |
| 2 | +++ rpm-4.5/macros.in 2010-08-23 13:22:02.633790949 +0300 | |
| 3 | @@ -198,7 +198,7 @@ | |
| 090e8fb5 | 4 | Summary: Debug information for package %{name}\ |
| 5 | Summary(pl.UTF-8): Informacje dla debuggera dla pakietu %{name}\ | |
| 6 | Group: Development/Debug\ | |
| 7 | -Requires: filesystem-debuginfo >= 3.0-16\ | |
| 8 | +Requires: filesystem-debuginfo >= 2.0-7\ | |
| 9 | AutoReqProv: 0\ | |
| 10 | %description debuginfo\ | |
| 11 | This package provides debug information for package %{name}.\ | |
| 35e62e3f ER |
12 | @@ -243,8 +243,8 @@ |
| 13 | %_srcrpmdir %{_topdir}/SRPMS | |
| 090e8fb5 | 14 | |
| 15 | # Directory where temporary files can be created. | |
| 16 | -%_tmppath %(echo "${TMPDIR:-/tmp}") | |
| 17 | -%tmpdir %{_tmppath} | |
| 18 | +%_tmppath %{expand:%%global _tmppath %(echo "${TMPDIR:-/tmp}")}%_tmppath | |
| 19 | +%tmpdir %{expand:%%global tmpdir %(echo "${TMPDIR:-/tmp}")}%tmpdir | |
| 20 | ||
| 21 | # Path to top of build area. | |
| 35e62e3f ER |
22 | %_topdir %(echo $HOME)/rpm |
| 23 | @@ -277,6 +277,9 @@ | |
| 090e8fb5 | 24 | # |
| 25 | #%distribution | |
| 26 | ||
| 27 | +# PLD Linux Release | |
| 28 | +%pld_release ac | |
| 29 | + | |
| 30 | # Configurable distribution URL, same as DistURL: tag in a specfile. | |
| 31 | # The URL will be used to supply reliable information to tools like | |
| 32 | # rpmfind. | |
| 35e62e3f | 33 | @@ -1178,6 +1181,7 @@ |
| 090e8fb5 | 34 | %_infodir %{_prefix}/share/info |
| 35 | %_mandir %{_prefix}/share/man | |
| 36 | %_localedir %{_datadir}/locale | |
| 37 | +%_x_libraries /usr/X11R6/%{_lib} | |
| 38 | ||
| 39 | #============================================================================== | |
| 40 | # ---- config.guess platform macros. | |
| 35e62e3f ER |
41 | @@ -1478,10 +1482,13 @@ |
| 42 | #----------------------------------------------------------------- | |
| 43 | # CFLAGS and LDFLAGS used to build | |
| 44 | ||
| 45 | -%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-3 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}} | |
| 46 | +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}} | |
| 090e8fb5 | 47 | # -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed. |
| 48 | ||
| 49 | %debugcflags -O0 -g -Wall | |
| 50 | +%debugcppflags %{nil} | |
| 51 | +%optldflags -Wl,--as-needed | |
| 52 | +%optcppflags %{nil} | |
| 53 | ||
| 54 | # Warning: those macros are overwritten by macros.build, | |
| 55 | # left here for compatibility | |
| a70fc0af ER |
56 | @@ -1497,7 +1504,7 @@ |
| 57 | # | |
| 58 | # Note: Used if _use_internal_dependency_generator is non-zero. The | |
| 59 | # helper is also used by %{_rpmhome}/rpmdeps --provides | |
| 60 | -%__mimetype_provides %{_rpmhome}/mimetypedeps.sh --provides | |
| 61 | +#%__mimetype_provides %{_rpmhome}/mimetypedeps.sh --provides | |
| 62 | ||
| 63 | # \endverbatim | |
| 64 | #*/ |