platform.in

This commit is contained in:
Дмитрий Левин 2002-12-07 22:32:14 +00:00
parent 4c633f6322
commit b36d2a4ad9
3 changed files with 85 additions and 36 deletions

View File

@ -601,6 +601,19 @@
#%{___build_post}\
#%{nil}
%__spec_prep_custom_pre %{nil}
%__spec_prep_custom_post %{nil}
%__spec_build_custom_pre %{nil}
%__spec_build_custom_post %{nil}
%__spec_install_custom_pre %{nil}
%__spec_install_custom_post %{nil}
%__spec_autodep_custom_pre %{nil}
%__spec_autodep_custom_post %{nil}
%__spec_clean_custom_pre %{nil}
%__spec_clean_custom_post %{nil}
%__spec_rmbuild_custom_pre %{nil}
%__spec_rmbuild_custom_post %{nil}
#==============================================================================
# ---- Scriptlet templates.
# Macro(s) that expand to a command and script that is executed.
@ -609,9 +622,15 @@
%__spec_prep_shell %{___build_shell}
%__spec_prep_args %{___build_args}
%__spec_prep_cmd %{___build_cmd}
%__spec_prep_pre %{___build_pre}
%__spec_prep_pre\
%{___build_pre}\
%{__spec_prep_custom_pre}\
%{nil}
%__spec_prep_body %{___build_body}
%__spec_prep_post %{___build_post}
%__spec_prep_post\
%{___build_post}\
%{__spec_prep_custom_post}\
%{nil}
%__spec_prep_template #!%{__spec_prep_shell}\
%{__spec_prep_pre}\
%{nil}
@ -623,9 +642,15 @@
%__spec_build_shell %{___build_shell}
%__spec_build_args %{___build_args}
%__spec_build_cmd %{___build_cmd}
%__spec_build_pre %{___build_pre}
%__spec_build_pre\
%{___build_pre}\
%{__spec_build_custom_pre}\
%{nil}
%__spec_build_body %{___build_body}
%__spec_build_post %{___build_post}
%__spec_build_post\
%{___build_post}\
%{__spec_build_custom_post}\
%{nil}
%__spec_build_template #!%{__spec_build_shell}\
%{__spec_build_pre}\
%{nil}
@ -637,11 +662,15 @@
%__spec_install_shell %{___build_shell}
%__spec_install_args %{___build_args}
%__spec_install_cmd %{___build_cmd}
%__spec_install_pre %{___build_pre}
%__spec_install_pre\
%{___build_pre}\
%{__spec_install_custom_pre}\
%{nil}
%__spec_install_body %{___build_body}
%__spec_install_post\
%{__arch_install_post}\
%{__os_install_post}\
%{__spec_install_custom_post}\
%{nil}
%__spec_install_template #!%{__spec_install_shell}\
%{__spec_install_pre}\
@ -651,15 +680,21 @@
#%{__spec_install_post}\
#%{nil}
#%__spec_autodep_shell %{___build_shell}
#%__spec_autodep_args %{___build_args}
#%__spec_autodep_cmd %{___build_cmd}
#%__spec_autodep_pre %{___build_pre}
#%__spec_autodep_body %{___build_body}
#%__spec_autodep_post %{___build_post}
#%__spec_autodep_template #!%{__spec_autodep_shell}\
#%{__spec_autodep_pre}\
#%{nil}
%__spec_autodep_shell %{___build_shell}
%__spec_autodep_args %{___build_args}
%__spec_autodep_cmd %{___build_cmd}
%__spec_autodep_pre\
%{___build_pre}\
%{__spec_autodep_custom_pre}\
%{nil}
%__spec_autodep_body %{___build_body}
%__spec_autodep_post\
%{___build_post}\
%{__spec_autodep_custom_post}\
%{nil}
%__spec_autodep_template #!%{__spec_autodep_shell}\
%{__spec_autodep_pre}\
%{nil}
#%{__spec_autodep_body}\
#%{__spec_autodep_post}\
@ -668,9 +703,15 @@
%__spec_clean_shell %{___build_shell}
%__spec_clean_args %{___build_args}
%__spec_clean_cmd %{___build_cmd}
%__spec_clean_pre %{___build_pre}
%__spec_clean_pre\
%{___build_pre}\
%{__spec_clean_custom_pre}\
%{nil}
%__spec_clean_body %{___build_body}
%__spec_clean_post %{___build_post}
%__spec_clean_post\
%{___build_post}\
%{__spec_clean_custom_post}\
%{nil}
%__spec_clean_template #!%{__spec_clean_shell}\
%{__spec_clean_pre}\
%{nil}
@ -682,9 +723,15 @@
%__spec_rmbuild_shell %{___build_shell}
%__spec_rmbuild_args %{___build_args}
%__spec_rmbuild_cmd %{___build_cmd}
%__spec_rmbuild_pre %{___build_pre}
%__spec_rmbuild_pre\
%{___build_pre}\
%{__spec_rmbuild_custom_pre}\
%{nil}
%__spec_rmbuild_body %{___build_body}
%__spec_rmbuild_post %{___build_post}
%__spec_rmbuild_post\
%{___build_post}\
%{__spec_rmbuild_custom_post}\
%{nil}
%__spec_rmbuild_template #!%{__spec_rmbuild_shell}\
%{__spec_rmbuild_pre}\
%{nil}

View File

@ -102,11 +102,6 @@
@RPMCONFIGDIR@/brp-%{_vendor} \
%{nil}
%__spec_install_post\
%{__arch_install_post}\
%{__os_install_post}\
%{nil}
@redhat@#---------------------------------------------------------------------
@redhat@# Expanded at end of %prep
@redhat@#
@ -187,7 +182,7 @@
@alt@#---------------------------------------------------------------------
@alt@# ALT Linux vendor specific macros.
@alt@# Contact rpm@alt-linux.org for details.
@alt@# Contact rpm@packages.altlinux.org for details.
@alt@#
@alt@%distribution ALT Linux
@alt@%vendor ALT Linux Team
@ -255,16 +250,6 @@
@alt@ cd %{u2p:%_builddir}\
@alt@%nil
@alt@
@alt@%__spec_autodep_shell %{___build_shell}
@alt@%__spec_autodep_args %{___build_args}
@alt@%__spec_autodep_cmd %{___build_cmd}
@alt@%__spec_autodep_pre %{___build_pre}
@alt@%__spec_autodep_body %{___build_body}
@alt@%__spec_autodep_post %{___build_post}
@alt@%__spec_autodep_template #!%{__spec_autodep_shell}\
@alt@%{__spec_autodep_pre}\
@alt@%{nil}
@alt@
@alt@%__spec_install_pre \
@alt@%{___build_pre} \
@alt@%clean_buildroot \

View File

@ -6,7 +6,7 @@
Name: %rpm_name
Version: %rpm_version
Release: alt11
Release: alt12
%define ifdef() %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
%define get_dep() %(rpm -q --qf '%%{NAME} >= %%|SERIAL?{%%{SERIAL}:}|%%{VERSION}-%%{RELEASE}' %1 2>/dev/null)
@ -35,6 +35,7 @@ Url: http://www.rpm.org/
Source: %srcname.tar.bz2
Provides: %_sysconfdir/%name/macros.d
Provides: /usr/sbin/update-alternatives
PreReq: lib%name = %version-%release
PreReq: alt-gpgkeys, sh-utils, grep, perl-base, fileutils, gawk, textutils, mktemp, shadow-utils
@ -95,6 +96,7 @@ Requires: gzip >= 1.3.3-alt2
Requires: tar >= 1.13.22-alt1
Requires: textutils >= 2.0.17-alt1
Requires: %_bindir/subst
Requires: /usr/sbin/update-alternatives
%package build-topdir
Summary: RPM package installation and build directory tree
@ -415,7 +417,7 @@ fi
%rpmattr %_bindir/gendiff
%_bindir/rpmbuild
%_bindir/relative
%rpmattr %dir %_libdir/%name
%rpmdirattr %_libdir/%name
%_libdir/%name/rpmt
%rpmattr %_libdir/%name/rpmb
%rpmattr %_libdir/%name/brp-*
@ -479,6 +481,21 @@ fi
%endif #with contrib
%changelog
* Sun Nov 10 2002 Dmitry V. Levin <ldv@altlinux.org> 4.0.4-alt12
- macros:
+ Removed some obsolete macros.
+ %%___build_pre: moved to platform;
+ Added warning about misspelled architecture.
- platform:
+ %%___build_pre: moved from macros.
+ Adjusted %%_configure_target macro,
now uses both --build and --host options.
+ Adjusted %%clean_buildroot,
now used "%%__chmod -R u+rwX".
+ Added CCACHE_CXX support.
- Fixed permissions on %_libdir/%name in -build subpackage
(thanks to Ivan Zakharyaschev).
* Mon Nov 04 2002 Dmitry V. Levin <ldv@altlinux.org> 4.0.4-alt11
- Fixed error handling in shell scripts.
- platform: updated %%optflags_kernel for gcc-3.2.