- dependency exceptions macros added

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

diff --git a/rpm.macros b/rpm.macros
index a55a3960d109753c2da4726249acbd41b6632d3c..c3ac1e4188b2af384f3f5a89568b00a7d6efc1ed 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -2,9 +2,9 @@
 %configure { \
  if [ -n "$LINGUAS" ]; then unset LINGUAS; fi; \
  LDFLAGS="${LDFLAGS:-%{!?debug: -s}}" ; export LDFLAGS ; \
- CFLAGS="${CFLAGS:-%optflags}%{?debug: -g -O0}" ; export CFLAGS ; \
- CXXFLAGS="${CXXFLAGS:-%optflags}%{?debug: -g -O0}" ; export CXXFLAGS ; \
- FFLAGS="${FFLAGS:-%optflags}%{?debug: -g -O0}" ; export FFLAGS ; \
+ 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} \
@@ -93,14 +93,6 @@ 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
 
@@ -157,3 +149,33 @@ echo "Compress man and info pages."; \
 
 %_source_payload        w9.gzdio
 %_binary_payload        w9.bzdio
+
+###################################################################
+# 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 }\
+%{__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}
+
+