RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Matthew Dawkins Root: /v/rpm/cvs Email: mdawk...@rpm5.org Module: rpm Date: 08-May-2012 02:31:37 Branch: rpm-5_4 Handle: 2012050800313601 Modified files: (Branch: rpm-5_4) rpm CHANGES rpm/macros mandriva.in Log: applied mdv patch rpm-5.4.4-merge-manbo-macros.patch Submitted by: mdawkins Summary: Revision Changes Path 1.3501.2.276+2 -0 rpm/CHANGES 1.7.2.12 +53 -0 rpm/macros/mandriva.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/CHANGES ============================================================================ $ cvs diff -u -r1.3501.2.275 -r1.3501.2.276 CHANGES --- rpm/CHANGES 8 May 2012 00:28:49 -0000 1.3501.2.275 +++ rpm/CHANGES 8 May 2012 00:31:36 -0000 1.3501.2.276 @@ -1,5 +1,7 @@ 5.4.8 -> 5.4.9: + - mdawkins: applied mdv patch rpm-5.4.4-merge-manbo-macros.patch - mdawkins: applied mdv patch rpm-5.4.4-use-xz-payload.patch + - macros mandriva.in: - mdawkins: applied mdv patch rpm-5.4.4-find_lang-handle-man-pages-already-compressed.patch - mdawkins: applied mdv patch rpm-5.4.4-find_lang-support-multiple-names.patch - mdawkins: applied mdv patch rpm-5.4.4-find_lang-with-html.patch @@ . patch -p0 <<'@@ .' Index: rpm/macros/mandriva.in ============================================================================ $ cvs diff -u -r1.7.2.11 -r1.7.2.12 mandriva.in --- rpm/macros/mandriva.in 8 May 2012 00:28:50 -0000 1.7.2.11 +++ rpm/macros/mandriva.in 8 May 2012 00:31:37 -0000 1.7.2.12 @@ -79,6 +79,13 @@ %_loop_detection_loglevel 4 + +%_sysconfdir /etc +%_defaultdocdir %{_datadir}/doc +%_localstatedir %{_var} +%_logdir %{_var}/log +%_libexecdir %{_libdir} + # mdvbz#62741 # standard systemd directories %_systemdrootdir /lib/systemd @@ -115,4 +122,50 @@ # use XZ to compress binary packages: %_binary_payload w5.xzdio +%_enable_debug_packages 1 + + +# Default extension to use (for info files) +%_extension .xz + + +%__install_info /sbin/install-info + +%_install_info() if [[ -f %{_infodir}/%{1}%{_extension} ]]; then %{__install_info} %{_infodir}/%{1}%{_extension} --dir=%{_infodir}/dir; fi \ +%{nil} +# (nb: keep the "alone on its line ';'") +%_remove_install_info() if [ "$1" = "0" ]; then if [[ -f %{_infodir}/%{1}%{_extension} ]]; then %{__install_info} %{_infodir}/%{1}%{_extension} --dir=%{_infodir}/dir --remove ; fi; fi \ +%{nil} + + +# Macro: %{mklibname <name> [<major> [<minor>]] [-s] [-d]} +# - %{mklibname test} => lib64test, on a lib64 platform +# - %{mklibname test 1 -d} => libtest1-devel +# - %{mklibname test 1 -d 0 -s} => libtest1_0-static-devel +%mklibname(ds) %{_lib}%{1}%{?2:%{2}}%{?3:_%{3}}%{-s:-static}%{-d:-devel} + +%debugcflags %{?_enable_debug_packages:-g -frecord-gcc-switches -Wstrict-aliasing=2} + +# common compilation flags + +%_fortify_cflags -Wp,-D_FORTIFY_SOURCE=2 + +# cf http://wiki.mandriva.com/en/Development/Packaging/Problems#format_not_a_string_literal_and_no_format_arguments +%Werror_cflags -Wformat -Werror=format-security + +%_ssp_cflags -fstack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags} +%__common_cflags -O2 %{debugcflags} -pipe %{Werror_cflags} %{?_fortify_cflags} +%__common_cflags_with_ssp %{__common_cflags} %{?_ssp_cflags} + +# Servers opt flags. +# Also set the env variables for backward compatibility (#32050). +%serverbuild %define _serverbuild_flags -fstack-protector-all \ +export CFLAGS="%optflags -fPIE"; export CXXFLAGS="%optflags -fPIE"; export RPM_OPT_FLAGS="%optflags -fPIE" \ +%{nil} + +# Hardened Servers opt flags. +%serverbuild_hardened %define _hardened_flags -Wl,-z,now -pie \ +%serverbuild \ +%{nil} + %{load:/etc/rpm/macros.d/*.macros} @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org