- provide %_package_i18n (testing)

- %with %without => %_with %_without to not conflict with current rpm macro

1 files changed, 14 insertions, 3 deletions

diff --git a/macros.in b/macros.in
index 8aa6c2c..34298fd 100644
--- a/macros.in
+++ b/macros.in
@@ -517,6 +517,17 @@ Provides: %{1} = %{version}-%{release}
 
 # Shorthand for %{defined with_...}
 # macros provided by rpm 4.4, but buggy :(
-%with()     %{expand:%%{?_with_%{1}:1}%%{!?_with_%{1}:0}}
-%without()  %{expand:%%{?_without_%{1}:1}%%{!?_without_%{1}:0}}
-
+%_with() %{expand: %%{?_with_%1:1} %%{!?_with_%1: %%{?_without_%1:0} %%{!?_without_%1: %%{?with_%1:%%{with_%1}} %%{!?with_%1: %%{?without_%1:!%%{without_%1}} %%{!?without_%1: %%{?2:%%2} %%{!?2:1} } } } } }
+%_without() !%{expand: %%{with %1 %{?2:%2}}}
+
+%_package_i18n(g:f:) \
+%%package -n %{?1:%{1}}%{?!1:%{name}}-i18n\
+Summary: Internationalization and locale data for %{?1:%{1}}%{?!1:%{name}}\
+License: %{license}\
+Group: %{?-g:%{-g*}}%{?!-g:%{group}}\
+\
+%%description -n %{?1:%{1}}%{?!1:%{name}}-i18n\
+Internationalization and locale data for %{?1:%{1}}%{?!1:%{name}}\
+\
+%%files -n %{?1:%{1}}%{?!1:%{name}}-i18n %{?-f:%{-f}}%{?!-f:-f %{?1:%{1}}%{?!1:%{name}}.lang}\
+%{nil}