- rpm-devel Requires: gzip, tar

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index eaa33eae16da6181cee7ddc95dca3c5790b2db88..b97eeda130a4e21b0d6d9951b7972c2478744c1f 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1,10 +1,10 @@
 #-----------------------------------------------------------------
 %configure { \
  if [ -n "$LINGUAS" ]; then unset LINGUAS; fi; \
- LDFLAGS="${LDFLAGS}%{!?debug: -s}" ; export LDFLAGS ; \
- CFLAGS="${CFLAGS:-%optflags}%{?debug: -g -O}" ; export CFLAGS ; \
- CXXFLAGS="${CXXFLAGS:-%optflags}%{?debug: -g -O}" ; export CXXFLAGS ; \
- FFLAGS="${FFLAGS:-%optflags}%{?debug: -g -O}" ; export FFLAGS ; \
+ 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} \
        --prefix=%{_prefix} \
        --exec-prefix=%{_exec_prefix} \
@@ -72,15 +72,18 @@ else \
     ); \
   fi \
 done \
-  %{-C:${_mydir}}%{!-C:.}/%{configure}
+  %{-C:${_mydir}}%{!-C:.}/%{configure} \
   %{-C:cd ${_mydir}; unset _mydir}
 
 # Location of autoconf macros
 %_aclocaldir   %(aclocal --print-ac-dir)
 
-# Fixed location of top applink dir
+# Location of top applink dir
 %_applnkdir      /usr/X11R6/share/applnk
 
+# Location pixmaps for applnk/desktop files
+%_pixmapsdir   /usr/X11R6/share/pixmaps
+
 # Current date
 %date          %(LC_ALL="C" date +"%a %b %d %Y")
 
@@ -106,26 +109,42 @@ done \
 #
 # Requires: xargs, find
 #
+#%no_install_post_compress_docs        1
 %__spec_install_post_compress_docs { \
-%{verbose:set -x}%{!verbose:exec > /dev/null}; \
-if [ -d "$RPM_BUILD_ROOT%{_mandir}" ]; then \
-       find "$RPM_BUILD_ROOT%{_mandir}" -type f -print | xargs %{__gzip} -9nf; \
-fi; \
-if [ -d "$RPM_BUILD_ROOT%{_infodir}" ]; then \
-       find $RPM_BUILD_ROOT%{_infodir} -type f -print | xrgs %{__gzip} -9nf; \
-fi; \
-}
+echo "Compress man and info pages."; \
+%{!?no_install_post_compress_docs: \
+       %{?verbose:set -x;} \
+       for i in /usr/share/man /usr/X11R6/man /usr/share/info; do \
+               if [ -d "$RPM_BUILD_ROOT$i" ]; then \
+                       find "$RPM_BUILD_ROOT$i" -name \*.bz2 -print | xargs -r %{__bzip2} -df; \
+                       find "$RPM_BUILD_ROOT$i" -name \*.gz -print | xargs -r %{__gzip} -dnf; \
+                       find "$RPM_BUILD_ROOT$i" -type f -print | xargs -r %{__gzip} -9nf; \
+               fi; \
+       done; \
+} }
 
 #-----------------------------------------------------------------
-# find and gzip all files in %{_mandir} and %{infodir}
+# Strip executable binaries and shared object files
 #
-# Requires: find, awk, strip
+# Requires: find, awk, strip, cut, xargs
 #
-%__spec_install_post_strip { \
-%{?debug:#}if [ -x /usr/lib/rpm/remove-unneeded-elf-sections ]; then \
-       /usr/lib/rpm/remove-unneeded-elf-sections %{buildroot}; \
-fi; \
-}
+#%no_install_post_strip        1
+%__spec_install_post_strip {%{!?debug: \
+%{!?no_install_post_strip: \
+       %{?verbose:set -x;} \
+       echo "Strip 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" ]; then \
+               strip --remove-section=.note  --remove-section=.comment $elfexelist; \
+       fi; \
+       if [ -n "$elfsharedlist" ]; then \
+               strip --strip-unneeded --remove-section=.note  --remove-section=.comment $elfsharedlist; \
+       fi; } \
+} }
 
 #-----------------------------------------------------------------
 # post %install sequence:
@@ -133,6 +152,8 @@ fi; \
 # - strip all ELF executables and ELF shared objects if not %debug.
 #
 %__spec_install_post { \
-#%{__spec_install_post_strip} \
-#%{__spec_install_post_compress_docs} \
-}
+%{__spec_install_post_strip} \
+%{__spec_install_post_compress_docs} }
+
+%_source_payload        w9.gzdio
+%_binary_payload        w9.bzdio