- rpm-devel Requires: gzip, tar

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 278097572f44f8403974ec02d23ee92f5f32a2d3..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} \
@@ -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")
 
@@ -118,11 +121,10 @@ 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
 #
@@ -131,7 +133,7 @@ echo "Compress man and info pages."; \
 %{!?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