Drop bunch of macro definitions needlessly duplicated with rpm
Specifically, the following are gone from here now: %_prefix, %_sysconfdir, %_infodir, %_mandir, %_defaultdocdir, %_configure, %makeinstall, %debug_package, %_use_internal_dependency_generator, %_missing_doc_files_terminate_build, %_unpackaged_files_terminate_build
This commit is contained in:
parent
24cd400d7c
commit
20c7e01657
53
macros
53
macros
@ -11,13 +11,8 @@
|
||||
# ---- configure macros. note that most of these are inherited
|
||||
# from the defaults.
|
||||
#
|
||||
%_prefix /usr
|
||||
%_sysconfdir /etc
|
||||
%_localstatedir /var
|
||||
%_infodir %{_prefix}/share/info
|
||||
%_mandir %{_prefix}/share/man
|
||||
|
||||
%_defaultdocdir %{_prefix}/share/doc
|
||||
%_pkgdocdir %{_docdir}/%{name}
|
||||
%_docdir_fmt %%{NAME}
|
||||
|
||||
@ -31,7 +26,6 @@
|
||||
#
|
||||
%_configure_gnuconfig_hack 1
|
||||
%_configure_libtool_hardening_hack 1
|
||||
%_configure ./configure
|
||||
%configure \
|
||||
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
|
||||
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
|
||||
@ -62,23 +56,6 @@
|
||||
--mandir=%{_mandir} \\\
|
||||
--infodir=%{_infodir}
|
||||
|
||||
%makeinstall \
|
||||
%{__make} \\\
|
||||
prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\
|
||||
exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \\\
|
||||
bindir=%{?buildroot:%{buildroot}}%{_bindir} \\\
|
||||
sbindir=%{?buildroot:%{buildroot}}%{_sbindir} \\\
|
||||
sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir} \\\
|
||||
datadir=%{?buildroot:%{buildroot}}%{_datadir} \\\
|
||||
includedir=%{?buildroot:%{buildroot}}%{_includedir} \\\
|
||||
libdir=%{?buildroot:%{buildroot}}%{_libdir} \\\
|
||||
libexecdir=%{?buildroot:%{buildroot}}%{_libexecdir} \\\
|
||||
localstatedir=%{?buildroot:%{buildroot}}%{_localstatedir} \\\
|
||||
sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \\\
|
||||
mandir=%{?buildroot:%{buildroot}}%{_mandir} \\\
|
||||
infodir=%{?buildroot:%{buildroot}}%{_infodir} \\\
|
||||
install
|
||||
|
||||
# Maximum number of CPU's to use when building, 0 for unlimited.
|
||||
%_smp_ncpus_max 16
|
||||
%_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
|
||||
@ -127,44 +104,14 @@
|
||||
%{__os_install_post}\
|
||||
%{nil}
|
||||
|
||||
|
||||
# Template for debug information sub-package.
|
||||
# NOTE: This is a copy from rpm to get the ifnarch noarch fix, it can be removed later
|
||||
%debug_package \
|
||||
%ifnarch noarch\
|
||||
%global __debug_package 1\
|
||||
%package debuginfo \
|
||||
Summary: Debug information for package %{name}\
|
||||
Group: Development/Debug\
|
||||
AutoReqProv: 0\
|
||||
%description debuginfo\
|
||||
This package provides debug information for package %{name}.\
|
||||
Debug information is useful when developing applications that use this\
|
||||
package or when debugging this package.\
|
||||
%files debuginfo -f debugfiles.list\
|
||||
%defattr(-,root,root)\
|
||||
%endif\
|
||||
%{nil}
|
||||
|
||||
%install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\
|
||||
%%install\
|
||||
%{nil}
|
||||
|
||||
#
|
||||
# use internal dep generator?
|
||||
%_use_internal_dependency_generator 1
|
||||
|
||||
#
|
||||
# Should missing %doc files terminate a build?
|
||||
%_missing_doc_files_terminate_build 1
|
||||
#
|
||||
# Should missing buildids terminate a build?
|
||||
%_missing_build_ids_terminate_build 1
|
||||
|
||||
#
|
||||
# Should unpackaged files in a build root terminate a build?
|
||||
%_unpackaged_files_terminate_build 1
|
||||
|
||||
#
|
||||
## Should python bytecompilation errors terminate a build?
|
||||
%_python_bytecompile_errors_terminate_build 1
|
||||
|
@ -142,6 +142,9 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
|
||||
%{_rpmconfigdir}/macros.d/macros.kmp
|
||||
|
||||
%changelog
|
||||
* Sun Apr 27 2014 Ville Skyttä <ville.skytta@iki.fi>
|
||||
- Drop bunch of macro definitions needlessly duplicated with rpm
|
||||
|
||||
* Tue Apr 15 2014 Panu Matilainen <pmatilai@redhat.com> - 18-1
|
||||
- Temporarily bring back find-requires and -provides scripts to rrc-side
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user