projects / packages / rpm.git / blame
| Commit | Line | Data |
|---|---|---|
| 589118b5 | 1 | --- ./macros.in~ 2005-10-30 16:24:30.000000000 +0200 |
| 2 | +++ ./macros.in 2005-10-30 16:24:32.000000000 +0200 | |
| e493253e ER |
3 | @@ -223,7 +223,7 @@ |
| 4 | %_tmppath %{_var}/tmp | |
| 5 | ||
| 6 | # Path to top of build area. | |
| 7 | -%_topdir %{_usrsrc}/redhat | |
| 8 | +%_topdir %(echo $HOME)/rpm | |
| 9 | ||
| 10 | # The path to the unzip executable (legacy, use %{__unzip} instead). | |
| 11 | %_unzipbin %{__unzip} | |
| 589118b5 | 12 | @@ -1276,5 +1276,18 @@ |
| e493253e | 13 | # |
| 589118b5 | 14 | %find_lang @RPMCONFIGDIR@/find-lang.sh %{buildroot} |
| 538a3775 | 15 | |
| 589118b5 | 16 | +# PLD rpm macros |
| 17 | +%_enable_debug_packages 0 | |
| 18 | + | |
| 19 | +#----------------------------------------------------------------- | |
| 20 | +# CFLAGS and LDFLAGS used to build | |
| 21 | + | |
| 22 | +%debuginfocflags %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -ggdb}%{expand:%%undefine __dic_%{?_enable_debug_packages}} | |
| 23 | + | |
| 24 | +%debugcflags -O0 -g -Wall | |
| 25 | +%rpmcflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags} | |
| 26 | +%rpmcxxflags %{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags} | |
| 27 | +%rpmldflags %{nil} | |
| 28 | + | |
| 29 | # \endverbatim | |
| 30 | #*/ | |
| 31 | --- rpm-4.4.2/macros.in~ 2006-01-17 20:55:45.000000000 +0200 | |
| 32 | +++ rpm-4.4.2/macros.in 2006-01-17 20:57:51.000000000 +0200 | |
| 538a3775 | 33 | @@ -1157,36 +1157,6 @@ |
| 34 | %{-C:cd ${_mydir}; unset _mydir} | |
| 35 | ||
| 36 | #------------------------------------------------------------------------------ | |
| 37 | -# Useful perl macros (from Artur Frysiak <wiget@t17.ds.pwr.wroc.pl>) | |
| 38 | -# | |
| 39 | -# For example, these can be used as (from ImageMagick.spec from PLD site) | |
| 40 | -# [...] | |
| 41 | -# BuildPrereq: perl | |
| 42 | -# [...] | |
| 43 | -# %package perl | |
| 44 | -# Summary: libraries and modules for access to ImageMagick from perl | |
| 45 | -# Group: Development/Languages/Perl | |
| 46 | -# Requires: %{name} = %{version} | |
| 47 | -# %requires_eq perl | |
| 48 | -# [...] | |
| 49 | -# %install | |
| 50 | -# rm -fr $RPM_BUILD_ROOT | |
| 51 | -# install -d $RPM_BUILD_ROOT/%{perl_sitearch} | |
| 52 | -# [...] | |
| 53 | -# %files perl | |
| 54 | -# %defattr(644,root,root,755) | |
| 55 | -# %{perl_sitearch}/Image | |
| 56 | -# %dir %{perl_sitearch}/auto/Image | |
| 57 | -# | |
| 58 | -%requires_eq() %(echo '%*' | LC_ALL="C" xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") | |
| 59 | -%perl_sitearch %(eval "`%{__perl} -V:installsitearch`"; echo $installsitearch) | |
| 60 | -%perl_sitelib %(eval "`%{__perl} -V:installsitelib`"; echo $installsitelib) | |
| 61 | -%perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch) | |
| 62 | -%perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib) | |
| 63 | -%perl_archlib %(eval "`%{__perl} -V:installarchlib`"; echo $installarchlib) | |
| 64 | -%perl_privlib %(eval "`%{__perl} -V:installprivlib`"; echo $installprivlib) | |
| 65 | - | |
| 66 | -#------------------------------------------------------------------------------ | |
| 67 | # arch macro for all Intel i?86 compatibile processors | |
| 68 | # (Note: This macro (and it's analogues) will probably be obsoleted when | |
| 69 | # rpm can use regular expressions against target platforms in macro | |
| 589118b5 | 70 | --- rpm-4.4.2/macros.in~ 2006-02-05 18:16:32.000000000 +0200 |
| 71 | +++ rpm-4.4.2/macros.in 2006-02-05 18:19:54.000000000 +0200 | |
| 72 | @@ -1019,6 +1019,7 @@ | |
| 73 | %_oldincludedir /usr/include | |
| 74 | %_infodir %{_prefix}/info | |
| 75 | %_mandir %{_prefix}/man | |
| 76 | +%_x_libraries /usr/X11R6/%{_lib} | |
| e493253e | 77 | |
| 589118b5 | 78 | #============================================================================== |
| 79 | # ---- config.guess platform macros. |