X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.macros;h=d8e3554aeb051087ac1afb66f79f34d724399c7d;hp=886dd6f43fab01b8b090406763fa973b50790e51;hb=701a3ad5236bc03ea66626e58021851162908cb1;hpb=75c4753ff9c5bfb8deb6ce27a548ee4b98eff43c

diff --git a/rpm.macros b/rpm.macros
index 886dd6f..d8e3554 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -1,12 +1,19 @@
+#-----------------------------------------------------------------
+# CFLAGS and LDFLAGS used to build
+
+%debugcflags	-O0 -g
+%rpmcflags	%{?debug:%debugcflags}%{!?debug:%optflags}
+%rpmldflags	%{!?debug:-s}
+
 #-----------------------------------------------------------------
 %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 ; \
- unset LINGUAS || : ; \
- ./configure %{_target_platform} \
+ LDFLAGS="${LDFLAGS:-%rpmldflags}" ; export LDFLAGS ; \
+ CFLAGS="${CFLAGS:-%rpmcflags}" ; export CFLAGS ; \
+ CXXFLAGS="${CXXFLAGS:-%rpmcflags}" ; export CXXFLAGS ; \
+ FFLAGS="${FFLAGS:-%rpmcflags}" ; export FFLAGS ; \
+ ./configure \
+	--host=%{_target_platform} \
  	--prefix=%{_prefix} \
 	--exec-prefix=%{_exec_prefix} \
 	--bindir=%{_bindir} \
@@ -19,7 +26,8 @@
 	--localstatedir=%{_localstatedir} \
 	--sharedstatedir=%{_sharedstatedir} \
 	--mandir=%{_mandir} \
-	--infodir=%{_infodir} }
+	--infodir=%{_infodir} \
+}
 
 #------------------------------------------------------------------------------
 # The GNUconfigure macro does the following:
@@ -72,15 +80,24 @@ 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 pkgconfig files
+%_pkgconfigdir	/usr/lib/pkgconfig
+
+# Location of top applink dir
 %_applnkdir      /usr/X11R6/share/applnk
 
+# Location pixmaps for applnk/desktop files
+%_pixmapsdir	/usr/X11R6/share/pixmaps
+
+# Location of fonts directories
+%_fontsdir	/usr/share/fonts
+
 # Current date
 %date 		%(LC_ALL="C" date +"%a %b %d %Y")
 
@@ -90,20 +107,88 @@ done \
 # Example files, programs, scripts...
 %_examplesdir	/usr/src/examples
 
-# Find-requires and directories excluded from auto-req
-%_noautoreqdir		%{_defaultdocdir} %{_examplesdir}
-%_noautoreqdep		%{nil}
-#%__find_requires_pre	/usr/lib/rpm/find-requires-pre %{_noautoreqdir}
-#%__find_requires_core	/usr/lib/rpm/find-requires
-#%__find_requires_post	/usr/lib/rpm/find-requires-post
-#%__find_requires	%{__find_requires_pre} | %{__find_requires_core} | %{__find_requires_post}
-
 # 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\
- %{__arch_install_post}\
- %{__os_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; } \
+} }
+
+%_source_payload        w9.gzdio
+%_binary_payload        w9.bzdio
+
+#-----------------------------------------------------------------
+# post %install sequence:
+# - autodeps exceptions
+# - compress all man and info pages,
+# - strip all ELF executables and ELF shared objects if not %debug.
+
+###################################################################
+# Requires/Provides automation
+# exceptions system by Jacek Konieczny <jajcus@pld.org.pl>
+%__spec_install_pre	%{___build_pre}\
+rm -f %{_builddir}/__rpm_*\
+%{nil}
+
+%__spec_install_post \
+%{?_noautoreqfiles:for f in %{_noautoreqfiles} ; do echo %{?buildroot:%{buildroot}}$f >> %{_builddir}/__rpm_noautoreqfiles ; done }\
+%{?_noautoreq:for f in %{_noautoreq} ; do echo "$f" >> %{_builddir}/__rpm_noautoreq ; done }\
+%{?_noautoreqdep:for f in %{_noautoreqdep} ; do echo "$f" >> %{_builddir}/__rpm_noautoreqdep ; done }\
+%{?_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_compress_docs}\
+%{__arch_install_post}\
+%{__os_install_post}\
 %{nil}
+
+%__spec_clean_pre	%{___build_pre}\
+rm -f %{_builddir}/__rpm_*\
+%{nil}
+
+
+#%_noautoreqfiles	"%{_defaultdocdir}.*" "%{_examplesdir}.*"
+#%_noautoreq		%{nil}
+#%_noautoreqdep		%{nil}
+#%_noautoprovfiles	%{nil}
+#%_noautoprov		%{nil}
+
+