X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.macros;h=1d335229790dcb4c5a1c7246ab2b39ac7edc405e;hb=ac8fb9bb9f04ce59fb5c047b65eb9a40e3c74eca;hp=b0c20a9a561985a37b321a9a3937e51102490b17;hpb=950d2f7498f567363fefe337a0d458e0410683ad;p=packages%2Frpm-build-macros.git

diff --git a/rpm.macros b/rpm.macros
index b0c20a9..1d33522 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -1,11 +1,10 @@
 #-----------------------------------------------------------------
 %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 ; \
- unset LINGUAS || : ; \
  ./configure %{_target_platform} \
  	--prefix=%{_prefix} \
 	--exec-prefix=%{_exec_prefix} \
@@ -19,7 +18,8 @@
 	--localstatedir=%{_localstatedir} \
 	--sharedstatedir=%{_sharedstatedir} \
 	--mandir=%{_mandir} \
-	--infodir=%{_infodir} }
+	--infodir=%{_infodir} \
+}
 
 #------------------------------------------------------------------------------
 # The GNUconfigure macro does the following:
@@ -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")
 
@@ -101,5 +104,56 @@ done \
 # If non-empty "debug" macro defined, add "dbg" suffix to release number
 %_rpmfilename		%%{NAME}-%%{VERSION}-%%{RELEASE}%{?debug:dbg}.%%{ARCH}.rpm
 
-# remove .comment and .note from ELFs 
-%__spec_install_post   %{?debug:#}if [ -x /usr/lib/rpm/remove-unneeded-elf-sections ] ; then /usr/lib/rpm/remove-unneeded-elf-sections %{buildroot}; fi
+#-----------------------------------------------------------------
+# find and gzip all files in %{_mandir} and %{infodir}
+#
+# Requires: xargs, find
+#
+#%no_install_post_compress_docs	1
+%__spec_install_post_compress_docs { \
+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; \
+} }
+
+#-----------------------------------------------------------------
+# Strip executable binaries and shared object files
+#
+# Requires: find, awk, strip, cut, xargs
+#
+#%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:
+# - compress all man and info pages,
+# - strip all ELF executables and ELF shared objects if not %debug.
+#
+%__spec_install_post { \
+%{__spec_install_post_strip} \
+%{__spec_install_post_compress_docs} }
+
+%_source_payload        w9.gzdio
+%_binary_payload        w9.bzdio