typo

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index c3ac1e4188b2af384f3f5a89568b00a7d6efc1ed..284dfc3e20d8dc4a9f6de548f30e83fd72d8bd63 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1,11 +1,43 @@
 #-----------------------------------------------------------------
-%configure { \
+# CFLAGS and LDFLAGS used to build
+
+%debugcflags   -O0 -g
+%rpmcflags     %{?debug:%debugcflags}%{!?debug:%optflags}
+%rpmldflags    %{!?debug:-s}
+
+#-----------------------------------------------------------------
+%configure2_13 { \
  if [ -n "$LINGUAS" ]; then unset LINGUAS; fi; \
- LDFLAGS="${LDFLAGS:-%{!?debug: -s}}" ; export LDFLAGS ; \
- CFLAGS="${CFLAGS:-%{!?debug:%optflags}%{?debug: -g -O0}}" ; export CFLAGS ; \
- CXXFLAGS="${CXXFLAGS:-%{!?debug:%optflags}%{?debug: -g -O0}}" ; export CXXFLAGS ; \
- FFLAGS="${FFLAGS:-%{!?debug:%optflags}%{?debug: -g -O0}}" ; export FFLAGS ; \
- ./configure %{_target_platform} \
+ LDFLAGS="${LDFLAGS:-%rpmldflags}" ; export LDFLAGS ; \
+ CFLAGS="${CFLAGS:-%rpmcflags}" ; export CFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%rpmcflags}" ; export CXXFLAGS ; \
+ FFLAGS="${FFLAGS:-%rpmcflags}" ; export FFLAGS ; \
+ ./configure \
+       --host=%{_target_platform} \
+       --prefix=%{_prefix} \
+       --exec-prefix=%{_exec_prefix} \
+       --bindir=%{_bindir} \
+       --sbindir=%{_sbindir} \
+       --sysconfdir=%{_sysconfdir} \
+       --datadir=%{_datadir} \
+       --includedir=%{_includedir} \
+       --libdir=%{_libdir} \
+       --libexecdir=%{_libexecdir} \
+       --localstatedir=%{_localstatedir} \
+       --sharedstatedir=%{_sharedstatedir} \
+       --mandir=%{_mandir} \
+       --infodir=%{_infodir} \
+}
+
+#----------------------------------------------------------------
+%configure {./configure \
+       LDFLAGS="${LDFLAGS:-%rpmldflags}" \
+       CFLAGS="${CFLAGS:-%rpmcflags}" \
+       CXXFLAGS="${CXXFLAGS:-%rpmcflags}" \
+       FFLAGS="${FFLAGS:-%rpmcflags}" \
+       %{?__cc:CC=%{__cc}} \
+       %{?__cxx:CXX=%{__cxx}} \
+       --build=%{_target_platform} \
        --prefix=%{_prefix} \
        --exec-prefix=%{_exec_prefix} \
        --bindir=%{_bindir} \
@@ -78,12 +110,18 @@ done \
 # Location of autoconf macros
 %_aclocaldir   %(aclocal --print-ac-dir)
 
+# Location of pkgconfig files
+%_pkgconfigdir /usr/lib/pkgconfig
+
 # Location of top applink dir
 %_applnkdir      /usr/X11R6/share/applnk
 
 # Location pixmaps for applnk/desktop files
 %_pixmapsdir   /usr/X11R6/share/pixmaps
 
+# Location of fonts directories
+%_fontsdir     /usr/share/fonts
+
 # Current date
 %date          %(LC_ALL="C" date +"%a %b %d %Y")
 
@@ -138,23 +176,35 @@ echo "Compress man and info pages."; \
        fi; } \
 } }
 
+%_source_payload        w9.gzdio
+%_binary_payload        w9.bzdio
+
 #-----------------------------------------------------------------
 # post %install sequence:
+# - autodeps exceptions
 # - compress all man and info pages,
 # - strip all ELF executables and ELF shared objects if not %debug.
-#
-%__spec_install_post { \
-%{__spec_install_post_strip} \
-%{__spec_install_post_compress_docs} }
-
-%_source_payload        w9.gzdio
-%_binary_payload        w9.bzdio
 
 ###################################################################
 # Requires/Provides automation
 # exceptions system by Jacek Konieczny <jajcus@pld.org.pl>
-%__spec_install_pre    %{___build_pre}\
-rm -f %{_builddir}/__rpm_*\
+%__spec_prep_pre \
+_autoreqprov=n \
+%{?_noautoreqfiles:_autoreqprov=y}\
+%{?_noautoreq:_autoreqprov=y}\
+%{?_noautoreqdep:_autoreqprov=y}\
+%{?_noautoprovfiles:_autoreqprov=y}\
+%{?_noautoprov:_autoreqprov=y}\
+if [ "$_autoreqprov" = "y" ] ; then \
+    if [ -f %{_builddir}/__rpm_lock ] ; then \
+       echo "Some package using \%_noauto*  macros is already being built" >&2 \
+       echo "If it is not true delete %{_builddir}/__rpm_lock" >&2 \
+       exit 1 \
+    else \
+       rm -f %{_builddir}/__rpm_*\
+       touch %{_builddir}/__rpm_lock \
+    fi \
+fi \
 %{nil}
 
 %__spec_install_post \
@@ -163,12 +213,23 @@ rm -f %{_builddir}/__rpm_*\
 %{?_noautoreqdep:for f in %{_noautoreqdep} ; do echo "$f" >> %{_builddir}/__rpm_noautoreqdep ; done }\
 %{?_noautoprovfiles:for f in %{_noautoprovfiles} ; do echo %{?buildroot:%{buildroot}}$f >> %{_builddir}/__rpm_noautoprovfiles ; done }\
 %{?_noautoprov:for f in %{_noautoprov} ; do echo "$f" >> %{_builddir}/__rpm_noautoprov ; done }\
+%{__spec_install_post_strip}\
+%{__spec_install_post_compress_docs}\
 %{__arch_install_post}\
 %{__os_install_post}\
 %{nil}
 
 %__spec_clean_pre      %{___build_pre}\
-rm -f %{_builddir}/__rpm_*\
+_autoreqprov=n \
+%{?_noautoreqfiles:_autoreqprov=y}\
+%{?_noautoreq:_autoreqprov=y}\
+%{?_noautoreqdep:_autoreqprov=y}\
+%{?_noautoprovfiles:_autoreqprov=y}\
+%{?_noautoprov:_autoreqprov=y}\
+%{?_noautoreqfiles:_autoreqprov=y}\
+if [ "$_autoreqprov" = "y" ] ; then \
+       rm -f %{_builddir}/__rpm_* \
+fi \
 %{nil}