- change in %%configure - don't add -s to LDFLAGS if LDFLAGS!=""

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

diff --git a/rpm.macros b/rpm.macros
index 42223125c7dcd9ae0e8b5d4b0b518d530617d4c4..1d335229790dcb4c5a1c7246ab2b39ac7edc405e 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------
 %configure { \
  if [ -n "$LINGUAS" ]; then unset LINGUAS; fi; \
- LDFLAGS="${LDFLAGS}%{!?debug: -s}" ; export LDFLAGS ; \
+ 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 ; \
@@ -78,9 +78,12 @@ done \
 # 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,10 +109,10 @@ done \
 #
 # Requires: xargs, find
 #
-#%install_post_no_compress_docs        1
+#%no_install_post_compress_docs        1
 %__spec_install_post_compress_docs { \
 echo "Compress man and info pages."; \
-%{!?install_no_post_compress_docs: \
+%{!?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 \
@@ -118,20 +121,19 @@ echo "Compress man and info pages."; \
                        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, cut, xargs
 #
-#%install_post_no_strip        1
+#%no_install_post_strip        1
 %__spec_install_post_strip {%{!?debug: \
-%{!?install_no_post_strip: \
+%{!?no_install_post_strip: \
        %{?verbose:set -x;} \
        echo "Strip executable binaries and shared object files."; \
-       filelist=`find $RPM_BUILD_ROOT -type f`; \
+       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 | \
@@ -142,8 +144,7 @@ echo "Compress man and info pages."; \
        if [ -n "$elfsharedlist" ]; then \
                strip --strip-unneeded --remove-section=.note  --remove-section=.comment $elfsharedlist; \
        fi; } \
-} \
-}
+} }
 
 #-----------------------------------------------------------------
 # post %install sequence:
@@ -152,8 +153,7 @@ echo "Compress man and info pages."; \
 #
 %__spec_install_post { \
 %{__spec_install_post_strip} \
-%{__spec_install_post_compress_docs} \
-}
+%{__spec_install_post_compress_docs} }
 
 %_source_payload        w9.gzdio
 %_binary_payload        w9.bzdio