- few more

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index e391a7f96e0446e3ea5af030a3d54918116c4216..b6f613aeb2cac9266f2ca33a97c1ca875cf4bbad 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -6,13 +6,38 @@
 %rpmldflags    %{!?debug:-s}
 
 #-----------------------------------------------------------------
-%configure { \
+%configure2_13 { \
  if [ -n "$LINGUAS" ]; then unset LINGUAS; fi; \
  LDFLAGS="${LDFLAGS:-%rpmldflags}" ; export LDFLAGS ; \
  CFLAGS="${CFLAGS:-%rpmcflags}" ; export CFLAGS ; \
  CXXFLAGS="${CXXFLAGS:-%rpmcflags}" ; export CXXFLAGS ; \
  FFLAGS="${FFLAGS:-%rpmcflags}" ; export FFLAGS ; \
- ./configure %{_target_platform} \
+ ./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} \
@@ -85,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")
 
@@ -100,6 +131,9 @@ done \
 # Example files, programs, scripts...
 %_examplesdir  /usr/src/examples
 
+# The directory holding Linux kernel sources
+%_kernelsrcdir /usr/src/linux
+
 # If non-empty "debug" macro defined, add "dbg" suffix to release number
 %_rpmfilename          %%{NAME}-%%{VERSION}-%%{RELEASE}%{?debug:dbg}.%%{ARCH}.rpm
 
@@ -157,8 +191,23 @@ echo "Compress man and info pages."; \
 ###################################################################
 # 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 \
@@ -174,7 +223,16 @@ rm -f %{_builddir}/__rpm_*\
 %{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}
 
 
@@ -183,5 +241,3 @@ rm -f %{_builddir}/__rpm_*\
 #%_noautoreqdep                %{nil}
 #%_noautoprovfiles     %{nil}
 #%_noautoprov          %{nil}
-
-