Michael Schröder
765802d7a0
- dropped support for berkeley db - archive unpacking failures no longer leave garbage - unified built-in and user-define macro syntax and calling conventions - python generators and debuginfo extraction has been split into a separate upstream project - support for ed25519 signatures - easier rpm macro access in lua - new patches: * python-rpm-packaging.diff - modified patches: * usr-lib-sysimage-rpm.patch * localetag.diff * brp.diff * findlang.diff * macrosin.diff * rpmqpack.diff * build.diff * whatrequires-doc.diff * remove-brp-strips.diff * fileattrs.diff * langnoc.diff * find-lang-qt-qm.patch * findsupplements.diff * finddebuginfo.diff * finddebuginfo-absolute-links.diff * debugsubpkg.diff * debuglink.diff * debuginfo-mono.patch - dropped patches: OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=584
126 lines
4.2 KiB
Diff
126 lines
4.2 KiB
Diff
--- ./macros.in.orig 2021-09-23 19:54:19.515028659 +0000
|
|
+++ ./macros.in 2021-09-23 19:54:25.495016311 +0000
|
|
@@ -1150,6 +1150,7 @@ package or when debugging this package.\
|
|
# %files -f %{name}.lang
|
|
#
|
|
%find_lang %{_rpmconfigdir}/find-lang.sh %{buildroot}
|
|
+%no_lang_C --without-C
|
|
|
|
# Commands + opts to use for retrieving remote files
|
|
# Proxy opts can be set through --httpproxy/--httpport popt aliases,
|
|
--- ./scripts/find-lang.sh.orig 2021-09-23 19:54:19.507028675 +0000
|
|
+++ ./scripts/find-lang.sh 2021-09-23 19:54:25.495016311 +0000
|
|
@@ -75,6 +75,8 @@ MO=
|
|
MO_NAME=${NAMES[0]}.lang
|
|
ALL_NAME=#
|
|
NO_ALL_NAME=
|
|
+ONLY_C=#
|
|
+NO_C=#
|
|
while test $# -gt 0 ; do
|
|
case "${1}" in
|
|
--with-gnome )
|
|
@@ -118,6 +120,14 @@ while test $# -gt 0 ; do
|
|
NO_ALL_NAME=#
|
|
shift
|
|
;;
|
|
+ --with-only-C )
|
|
+ ONLY_C=
|
|
+ shift
|
|
+ ;;
|
|
+ --without-C )
|
|
+ NO_C=
|
|
+ shift
|
|
+ ;;
|
|
* )
|
|
if [ $MO_NAME != ${NAMES[$#]}.lang ]; then
|
|
NAMES[${#NAMES[@]}]=$MO_NAME
|
|
@@ -158,6 +168,8 @@ s:'"$TOP_DIR"'::
|
|
'"$ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
|
|
'"$NO_ALL_NAME$MO"'s:\(.*/locale/\)\([^/_]\+\)\(.*/'"$NAME"'\.mo$\):%lang(\2) \1\2\3:
|
|
s:^\([^%].*\)::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|
|
@@ -166,19 +178,23 @@ s:'"$TOP_DIR"'::
|
|
'"$NO_ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/_]\+\)\([^/]*\)\(/'"$NAME"'\)$:%lang(\2) %doc \1\2\3\4/:
|
|
'"$ALL_NAME$GNOME"'s:\(.*/share/help/\)\([^/_]\+\)\([^/]*\)\(/[a-zA-Z0-9.\_\-]\+\)$:%lang(\2) %doc \1\2\3\4/:
|
|
s:^\([^%].*\)::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|
|
find "$TOP_DIR" -type d|sed '
|
|
s:'"$TOP_DIR"'::
|
|
-'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%dir %doc \1:
|
|
+'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'$\):%lang(C) %dir %doc \1:
|
|
'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'/[a-zA-Z0-9.\_\-]/.\+\)::
|
|
'"$NO_ALL_NAME$GNOME"'s:\(.*/gnome/help/'"$NAME"'\/\)\([^/_]\+\):%lang(\2) %doc \1\2:
|
|
-'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+$\):%dir %doc \1:
|
|
+'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+$\):%lang(C) %dir %doc \1:
|
|
'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]/.\+\)::
|
|
'"$ALL_NAME$GNOME"'s:\(.*/gnome/help/[a-zA-Z0-9.\_\-]\+\/\)\([^/_]\+\):%lang(\2) %doc \1\2:
|
|
s:%lang(.*) .*/gnome/help/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+/.*::
|
|
s:^\([^%].*\)::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|
|
@@ -194,6 +210,8 @@ s:'"$TOP_DIR"'::
|
|
'"$NO_ALL_NAME$GNOME"'s:\(.*/omf/'"$NAME"'/'"$NAME"'-\([^/.]\+\)\.omf\):%lang(\2) \1:
|
|
'"$ALL_NAME$GNOME"'s:\(.*/omf/[a-zA-Z0-9.\_\-]\+/[a-zA-Z0-9.\_\-]\+-\([^/.]\+\)\.omf\):%lang(\2) \1:
|
|
s:^[^%].*::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|
|
@@ -234,6 +252,8 @@ s:'"$TOP_DIR"'::
|
|
'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\)::
|
|
'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:
|
|
s:^\([^%].*\)::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
fi
|
|
@@ -247,6 +267,8 @@ s:'"$TOP_DIR"'::
|
|
'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+/\)::
|
|
'"$ALL_NAME$KDE"'s:\(.*/HTML/\)\([^/_]\+\)\(.*/[a-zA-Z0-9.\_\-]\+$\):%lang(\2) \1\2\3:
|
|
s:^\([^%].*\)::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
fi
|
|
@@ -284,6 +306,8 @@ s:'"$TOP_DIR"'::
|
|
'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\+[_@].*\)\.qm$\):%lang(\2) \1:
|
|
'"$ALL_NAME$QT"'s:^\([^%].*/[^/]\+_\([a-zA-Z]\+\)\.qm$\):%lang(\2) \1:
|
|
s:^[^%].*::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|
|
@@ -292,6 +316,8 @@ s:'"$TOP_DIR"'::
|
|
'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/\)::
|
|
'"$ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+$\):%lang(\2) \1*:
|
|
s:^\([^%].*\)::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|
|
@@ -299,6 +325,8 @@ find "$TOP_DIR" -type f -o -type l|sed -
|
|
s:'"$TOP_DIR"'::
|
|
'"$NO_ALL_NAME$MAN"'s:\(.*/man/\([^/_]\+\).*/man[a-z0-9]\+/'"$NAME"'\.[a-z0-9].*\):%lang(\2) \1*:
|
|
s:^\([^%].*\)::
|
|
+'"$ONLY_C"'/%lang(C)/!d
|
|
+'"$NO_C"'/%lang(C)/d
|
|
s:%lang(C) ::
|
|
/^$/d' >> $MO_NAME_NEW
|
|
|