pool/rpm
SHA256
3
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1002926 from Base:System

Browse Source 
- 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)

OBS-URL: https://build.opensuse.org/request/show/1002926
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=301
This commit is contained in:
Dominique Leuenberger 2022-09-16 11:31:47 +00:00 committed by Git OBS Bridge
commit 4ec05ccf28
6 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python-rpm.spec
View File

@ -21,7 +21,7 @@
%global with_python 1 %global with_python 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-rpm Name: python-rpm
Version: 4.17.1 Version: 4.17.1.1
Release: 0 Release: 0
Summary: Python Bindings for Manipulating RPM Packages Summary: Python Bindings for Manipulating RPM Packages
License: GPL-2.0-or-later License: GPL-2.0-or-later

12
remove-translations.diff
View File

@ -1,12 +1,14 @@
--- scripts/find-lang.sh.orig 2018-01-31 13:25:25.229266078 +0000 Index: scripts/find-lang.sh
+++ scripts/find-lang.sh 2018-01-31 13:26:15.128133281 +0000 ===================================================================
@@ -119,6 +119,23 @@ fi --- scripts/find-lang.sh.orig
+++ scripts/find-lang.sh
@@ -134,6 +134,23 @@ fi
MO_NAME_NEW=$MO_NAME.tmp.$$ MO_NAME_NEW=$MO_NAME.tmp.$$
rm -f $MO_NAME_NEW rm -f $MO_NAME_NEW
+# remove languages we do not yet support - but give out statistics +# 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 +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 + find $TOP_DIR/usr/share/locale/$dir -name *.mo | sed 's:'"$TOP_DIR"'::' | while read file; do
+ echo -n "removing translation $file: " + echo -n "removing translation $file: "
+ msgunfmt "$TOP_DIR/$file" | msgfmt --statistics -o /dev/null - + msgunfmt "$TOP_DIR/$file" | msgfmt --statistics -o /dev/null -
@ -15,7 +17,7 @@
+ fi + fi
+done +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 +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" + echo "removing help translation /usr/share/help/$dir"
+ rm -rf $TOP_DIR/usr/share/help/$dir + rm -rf $TOP_DIR/usr/share/help/$dir
+ fi + fi

3
rpm-4.17.1.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8752057c779658cc5988d4bd096fc1e49b5a5db57cbbdd08705d6b55ca6df352
size 4477410

3
rpm-4.17.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0c11b793466e7258851ff82bd65c8ffd8c2dbbc70acc869a5d34150549926e5d
size 4642016

13
rpm.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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 Thu Jul 21 16:11:22 CEST 2022 - mls@suse.de

2
rpm.spec
View File

@ -58,7 +58,7 @@ Requires: /usr/bin/awk
Summary: The RPM Package Manager Summary: The RPM Package Manager
License: GPL-2.0-or-later License: GPL-2.0-or-later
Group: System/Packages Group: System/Packages
Version: 4.17.1 Version: 4.17.1.1
Release: 0 Release: 0
URL: https://rpm.org/ URL: https://rpm.org/
#Git-Clone: https://github.com/rpm-software-management/rpm #Git-Clone: https://github.com/rpm-software-management/rpm