From 48af895ef27be8ccc681e0df246ec3cba4b1bd83 Mon Sep 17 00:00:00 2001
From: dirkmueller <>
Date: Sep 16 2022 11:37:03 +0000
Subject: Update rpm to version 4.17.1.1 / rev 301 via SR 1002926


https://build.opensuse.org/request/show/1002926
by user dirkmueller + dimstar_suse
- update to rpm-4.17.1.1
  * Fix upstream branch setting in "%autosetup -S git"
  * Revert "Strip the target triplet GNU suffix more precisely."

- remove-translations.diff: convert deprecated egrep to grep -E
  (boo#1203092)

---

diff --git a/.files b/.files
index ca03be7..4548829 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index e39c1a5..263d3f0 100644
--- a/.rev
+++ b/.rev
@@ -2369,4 +2369,17 @@ See bugzilla 1167537 for the gory details.</comment>
     <comment>Automatic submission by obs-autosubmit</comment>
     <requestid>991573</requestid>
   </revision>
+  <revision rev="301" vrev="1">
+    <srcmd5>891bc4844e62a49895e3866f2e92b986</srcmd5>
+    <version>4.17.1.1</version>
+    <time>1663327907</time>
+    <user>dimstar_suse</user>
+    <comment>- update to rpm-4.17.1.1
+  * Fix upstream branch setting in &quot;%autosetup -S git&quot;
+  * Revert &quot;Strip the target triplet GNU suffix more precisely.&quot;
+
+- remove-translations.diff: convert deprecated egrep to grep -E
+  (boo#1203092)</comment>
+    <requestid>1002926</requestid>
+  </revision>
 </revisionlist>
diff --git a/python-rpm.spec b/python-rpm.spec
index b5b86c9..8f121d6 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 6289abc..8da0524 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 120000
index 0000000..ebc4c73
--- /dev/null
+++ b/rpm-4.17.1.1.tar.bz2
@@ -0,0 +1 @@
+/ipfs/bafybeih2skxixxbpjvzcvob34ba3sxv5hjn2vdbtwwy6spbbgv6h2we4a4
\ No newline at end of file
diff --git a/rpm-4.17.1.tar.bz2 b/rpm-4.17.1.tar.bz2
deleted file mode 120000
index d94c951..0000000
--- a/rpm-4.17.1.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeig72wfrhcxpndi7ncgz7ofagaruldkkhzmehxojncnkdntfjx6u54
\ No newline at end of file
diff --git a/rpm.changes b/rpm.changes
index 8561a4d..e8bec6e 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,4 +1,17 @@
 -------------------------------------------------------------------
+Mon Sep 12 08:15:22 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- 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 <andreas.stieger@gmx.de>
+
+- remove-translations.diff: convert deprecated egrep to grep -E
+  (boo#1203092)
+
+-------------------------------------------------------------------
 Thu Jul 21 16:11:22 CEST 2022 - mls@suse.de
 
 - update to rpm-4.17.1
diff --git a/rpm.spec b/rpm.spec
index a4e3263..f469f06 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