- typo (missing "}").

[packages/rpm-build-macros.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 806340676833a32ab927df240fe26348e91cf537..b54406fe852abb936a6d7a0c71f9929ad132d573 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -33,8 +33,9 @@
 # Build system path macros.
 #
 %__libtoolize           libtoolize --copy --force
-%__automake             automake -a -c -f --foreing %{!?debug:-Wall}
-%__autoconf             autoconf %{!?debug:-Wall}
+%__gettextize           gettextize --copy --force
+%__automake             automake -a -c -f --foreign
+%__autoconf             autoconf %{?debug:-Wall}
 
 #-----------------------------------------------------------------
 %configure2_13 { \
@@ -46,7 +47,7 @@
  CPPFLAGS="${CPPFLAGS:-}" ; export CPPFLAGS ; \
  %{?__cc:CC=%{__cc} ; export CC ; } \
  %{?__cxx:CXX=%{__cxx} ; export CXX ; } \
- ./configure \
+ %{?configuredir:%{configuredir}}%{?!configuredir:.}/configure \
        --host=%{_target_platform} \
        --prefix=%{_prefix} \
        --exec-prefix=%{_exec_prefix} \
@@ -69,7 +70,7 @@
        CFLAGS="${CFLAGS:-%rpmcflags}" \
        CXXFLAGS="${CXXFLAGS:-%rpmcflags}" \
        FFLAGS="${FFLAGS:-%rpmcflags}" \
-       CPPFLAGS="${CPPFLAGS:-%rpmcflags}" \
+       CPPFLAGS="${CPPFLAGS:-}" \
        %{?__cc:CC=%{__cc}} \
        %{?__cxx:CXX=%{__cxx}} \
        --build=%{_target_platform} \
@@ -133,6 +134,24 @@
 %_kernel_ver     %(echo %{__kernel_ver}%{!?_without_dist_kernel:-%{__kernel_rel}})
 %_kernel_ver_str %(echo %{_kernel_ver} | sed s/-/_/g)
 
+# sgml macros
+%xmlcat_add()            /usr/bin/xmlcatalog --noout --add nextCatalog \"\" %1 /etc/xml/catalog
+%xmlcat_del()            /usr/bin/xmlcatalog --noout --del %1 /etc/xml/catalog
+%xmlcat_add_rewrite      /usr/bin/xmlcatalog --noout --add rewriteSystem
+%xmlcat_create()          /usr/bin/xmlcatalog --noout --create %1
+%sgmlcat_add()           /usr/bin/install-catalog --add %1 %2 > /dev/null
+%sgmlcat_del()           /usr/bin/install-catalog --remove %1 %2 > /dev/null
+%docbook_sgmlcat_fix() { for l in \
+'' \
+'  -- default decl --' \
+'DTDDECL "-//OASIS//DTD DocBook XML V%2//EN" "../../xml.dcl"' \
+'  -- hacks for opensp --' \
+'SYSTEM "file://%{_datadir}/sgml/docbook/xml-dtd-%2/docbookx.dtd" "%{_datadir}/sgml/docbook/xml-dtd-%2/docbookx.dtd"' \
+'SYSTEM "http://www.oasis-open.org/docbook/xml/%2/docbookx.dtd"                  "%{_datadir}/sgml/docbook/xml-dtd-%2/docbookx.dtd"' \
+'' \
+; do echo $l; done >> %1 \
+}
+
 #-----------------------------------------------------------------
 # find and gzip all files in %{_mandir} and %{infodir}
 #
@@ -174,6 +193,40 @@ echo "Compress man and info pages."; \
                strip --strip-unneeded --remove-section=.note  --remove-section=.comment $elfsharedlist; \
        fi; } \
 } }
+#-----------------------------------------------------------------
+# remove all RPATH from executable binaries and shared object files
+#
+# Requires: find, awk, strip, cut, xargs
+#
+#%no_install_post_chrpath      1
+%__spec_install_post_chrpath {%{!?debug: \
+%{!?no_install_post_chrpath: \
+       %{?verbose:set -x;} \
+       echo "Remove RPATH from executable binaries and shared object files."; \
+       filelist=`find $RPM_BUILD_ROOT -type f ! -regex ".*ld-[0-9.]*so.*"`; \
+       elfexelist=`echo $filelist | xargs -r file | \
+               awk '/ELF.*executable/ {print $1}' | cut -d: -f1`; \
+       elfsharedlist=`echo $filelist | xargs -r file | \
+               awk '/LF.*shared object/ {print $1}' | cut -d: -f1`; \
+       if [ -n "$elfexelist$elfsharedlist" ]; then \
+               chrpath -d $elfexelist $elfsharedlist; \
+       fi; } \
+} }
+#-----------------------------------------------------------------
+# Find and gzip all kernel modules
+#
+# Requires: find
+#
+#%no_install_post_compress_modules  1
+%__spec_install_post_compress_modules { \
+echo "Compress kernel modules if any."; \
+%{!?no_install_post_compress_modules: \
+    %{?verbose:set -x;} \
+    if test -d $RPM_BUILD_ROOT/lib/modules ; then \
+       find $RPM_BUILD_ROOT/lib/modules -name \*.o -print | \
+       xargs -r %{__gzip} -9nf; \
+    fi; \
+} }
 
 %_source_payload        w9.gzdio
 %_binary_payload        w9.bzdio
@@ -215,7 +268,9 @@ fi \
 %{?_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_chrpath}\
 %{__spec_install_post_compress_docs}\
+%{__spec_install_post_compress_modules}\
 %{__arch_install_post}\
 %{nil}