projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| a70fc0af ER |
1 | --- rpm-4.4.9/macros.in 2008-08-12 23:07:34.371259643 +0300 |
| 2 | +++ rpm-4.5/macros.in 2008-09-03 16:47:30.861766714 +0300 | |
| 090e8fb5 | 3 | @@ -192,7 +192,7 @@ |
| 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}.\ | |
| 12 | @@ -242,6 +242,6 @@ | |
| 13 | ||
| 14 | # Directory where temporary files can be created. | |
| 15 | -%_tmppath %(echo "${TMPDIR:-/tmp}") | |
| 16 | -%tmpdir %{_tmppath} | |
| 17 | +%_tmppath %{expand:%%global _tmppath %(echo "${TMPDIR:-/tmp}")}%_tmppath | |
| 18 | +%tmpdir %{expand:%%global tmpdir %(echo "${TMPDIR:-/tmp}")}%tmpdir | |
| 19 | ||
| 20 | # Path to top of build area. | |
| 21 | @@ -271,6 +271,9 @@ | |
| 22 | # | |
| 23 | #%distribution | |
| 24 | ||
| 25 | +# PLD Linux Release | |
| 26 | +%pld_release ac | |
| 27 | + | |
| 28 | # Configurable distribution URL, same as DistURL: tag in a specfile. | |
| 29 | # The URL will be used to supply reliable information to tools like | |
| 30 | # rpmfind. | |
| 31 | @@ -1156,6 +1159,7 @@ | |
| 32 | %_infodir %{_prefix}/share/info | |
| 33 | %_mandir %{_prefix}/share/man | |
| 34 | %_localedir %{_datadir}/locale | |
| 35 | +%_x_libraries /usr/X11R6/%{_lib} | |
| 36 | ||
| 37 | #============================================================================== | |
| 38 | # ---- config.guess platform macros. | |
| 39 | @@ -1468,6 +1472,9 @@ | |
| 40 | # -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed. | |
| 41 | ||
| 42 | %debugcflags -O0 -g -Wall | |
| 43 | +%debugcppflags %{nil} | |
| 44 | +%optldflags -Wl,--as-needed | |
| 45 | +%optcppflags %{nil} | |
| 46 | ||
| 47 | # Warning: those macros are overwritten by macros.build, | |
| 48 | # left here for compatibility | |
| a70fc0af ER |
49 | @@ -1497,7 +1504,7 @@ |
| 50 | # | |
| 51 | # Note: Used if _use_internal_dependency_generator is non-zero. The | |
| 52 | # helper is also used by %{_rpmhome}/rpmdeps --provides | |
| 53 | -%__mimetype_provides %{_rpmhome}/mimetypedeps.sh --provides | |
| 54 | +#%__mimetype_provides %{_rpmhome}/mimetypedeps.sh --provides | |
| 55 | ||
| 56 | # \endverbatim | |
| 57 | #*/ |