- ver 1.744

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

diff --git a/rpm.macros b/rpm.macros
index b97afe276863676e045baa2dbac5aa48cc677b71..59712fa5c6a303ee60628af7805d42a59b71c086 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -40,11 +40,7 @@
 %__ninja_common_opts   -v %{?_smp_mflags}
 
 %__gettextize { \
-       if grep -qs 'AM_GNU_GETTEXT.*external' configure.{ac,in} ; then \
-               gettextize --copy --force --no-changelog; \
-       else \
-               gettextize --copy --force --no-changelog --intl; \
-       fi; \
+       gettextize --copy --force --no-changelog; \
        if [ ! -f po/Makevars ]; then \
                cp -f po/Makevars{.template,}; \
        fi; \
@@ -433,6 +429,11 @@ LC_ALL=C.UTF-8 %{__meson} \
 %__true_false() %{expand:%%{?with_%{1}:true}%%{!?with_%{1}:false}}
 %__true_false_not() %{expand:%%{?with_%{1}:false}%%{!?with_%{1}:true}}
 
+# for use with cmake:
+# Usage: cmake_on_off BCOND_NAME [OPTION_NAME]
+# BuildRequires: rpmbuild(macros) >= 1.742
+%cmake_on_off() -D%{?2}%{!?2:%{1}}:BOOL=%{expand:%%{?with_%{1}:ON}%%{!?with_%{1}:OFF}}
+
 #-----------------------------------------------------------------
 
 # overload to insert debuginfo package
@@ -616,7 +617,7 @@ Provides: %{1} = %{?epoch:%{epoch}:}%{?version:%{version}}%{?release:-%{release}
 %{!?debug:set +x;} \
 if [ -d "$RPM_BUILD_ROOT" ]; then \
        if [ -d $RPM_BUILD_ROOT/lib/modules ]; then \
-               modulelist=$(find $RPM_BUILD_ROOT/lib/modules -name '*o' -type f -print); \
+               modulelist=$(find $RPM_BUILD_ROOT/lib/modules \( -name '*.o' -o -name '*.ko' \) -type f -print); \
                if [ "$modulelist" ]; then \
                        modulecount=$(echo "$modulelist" | wc -l); \
                        printf "Stripping %d kernel modules..." $modulecount; \