diff --git a/python-rpm.spec b/python-rpm.spec index 254d8d3..e424ad9 100644 --- a/python-rpm.spec +++ b/python-rpm.spec @@ -21,7 +21,7 @@ %global with_python 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-rpm -Version: 4.17.1 +Version: 4.17.1.1 Release: 0 Summary: Python Bindings for Manipulating RPM Packages License: GPL-2.0-or-later diff --git a/remove-translations.diff b/remove-translations.diff index fbdd9cc..a714974 100644 --- a/remove-translations.diff +++ b/remove-translations.diff @@ -1,12 +1,14 @@ ---- scripts/find-lang.sh.orig 2018-01-31 13:25:25.229266078 +0000 -+++ scripts/find-lang.sh 2018-01-31 13:26:15.128133281 +0000 -@@ -119,6 +119,23 @@ fi +Index: scripts/find-lang.sh +=================================================================== +--- scripts/find-lang.sh.orig ++++ scripts/find-lang.sh +@@ -134,6 +134,23 @@ fi MO_NAME_NEW=$MO_NAME.tmp.$$ rm -f $MO_NAME_NEW +# remove languages we do not yet support - but give out statistics +test -d "$TOP_DIR/usr/share/locale/" && find "$TOP_DIR/usr/share/locale/" -maxdepth 1 -type d | sed 's:'"$TOP_DIR"/usr/share/locale/'::; /^$/d' | while read dir; do -+ if ! rpm -ql filesystem | egrep -q "/usr/share/locale/$dir"$; then ++ if ! rpm -ql filesystem | grep -E -q "/usr/share/locale/$dir"$; then + find $TOP_DIR/usr/share/locale/$dir -name *.mo | sed 's:'"$TOP_DIR"'::' | while read file; do + echo -n "removing translation $file: " + msgunfmt "$TOP_DIR/$file" | msgfmt --statistics -o /dev/null - @@ -15,7 +17,7 @@ + fi +done +test -d "$TOP_DIR/usr/share/help/" && find $TOP_DIR/usr/share/help/ -maxdepth 1 -type d | sed 's:'"$TOP_DIR"/usr/share/help/'::; /^$/d' | while read dir; do -+ if ! rpm -ql filesystem | egrep -q "/usr/share/help/$dir"$; then ++ if ! rpm -ql filesystem | grep -E -q "/usr/share/help/$dir"$; then + echo "removing help translation /usr/share/help/$dir" + rm -rf $TOP_DIR/usr/share/help/$dir + fi diff --git a/rpm-4.17.1.1.tar.bz2 b/rpm-4.17.1.1.tar.bz2 new file mode 100644 index 0000000..8bb830e --- /dev/null +++ b/rpm-4.17.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8752057c779658cc5988d4bd096fc1e49b5a5db57cbbdd08705d6b55ca6df352 +size 4477410 diff --git a/rpm-4.17.1.tar.bz2 b/rpm-4.17.1.tar.bz2 deleted file mode 100644 index 13da427..0000000 --- a/rpm-4.17.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c11b793466e7258851ff82bd65c8ffd8c2dbbc70acc869a5d34150549926e5d -size 4642016 diff --git a/rpm.changes b/rpm.changes index f40ea9c..8c24f07 100644 --- a/rpm.changes +++ b/rpm.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Sep 12 08:15:22 UTC 2022 - Dirk Müller + +- update to rpm-4.17.1.1 + * Fix upstream branch setting in "%autosetup -S git" + * Revert "Strip the target triplet GNU suffix more precisely." + +------------------------------------------------------------------- +Sun Sep 4 10:05:12 UTC 2022 - Andreas Stieger + +- remove-translations.diff: convert deprecated egrep to grep -E + (boo#1203092) + ------------------------------------------------------------------- Thu Jul 21 16:11:22 CEST 2022 - mls@suse.de diff --git a/rpm.spec b/rpm.spec index 7d9c297..39d5672 100644 --- a/rpm.spec +++ b/rpm.spec @@ -58,7 +58,7 @@ Requires: /usr/bin/awk Summary: The RPM Package Manager License: GPL-2.0-or-later Group: System/Packages -Version: 4.17.1 +Version: 4.17.1.1 Release: 0 URL: https://rpm.org/ #Git-Clone: https://github.com/rpm-software-management/rpm