Djam/rpmtools
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rpmtools.git synced 2025-02-23 19:02:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix dropping of media_info tag in the merge option

Browse source
This commit is contained in:
Denis Silakov 2014-09-18 09:09:31 -04:00
parent efa89a2dbc
commit 5b189d1874
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpmtools-6.1-genhdlist2-merge-option.patch
View file

@ -112,7 +112,7 @@ diff -Naur rpmtools-6.1.orig/genhdlist2 rpmtools-6.1/genhdlist2
+ else {
+ my $clear_name = $name;
+ $clear_name =~ s/$xml_info_suffix//;
+ os.system("sed -i '/<\\/media_info>/d' $media_info_dir/$clear_name") == 0 or die("Failed to drop leading tag from $clear_name");
+ os.system("sed -i 's/<\\/media_info>//' $media_info_dir/$clear_name") == 0 or die("Failed to drop leading tag from $clear_name");
+ os.system("$xml_info_filter -dc -S $xml_info_suffix $media_info_dir/$name.tmp >> $media_info_dir/$clear_name" ) == 0 or die("Failed to concat $name.tmp with $clear_name");
+ }
+ unlink "$media_info_dir/$name.tmp";

4
rpmtools.spec
View file

@ -1,12 +1,12 @@
Summary: Various RPM command-line tools
Name: rpmtools
Version: 6.1
Release: 13
Release: 14
Source0: %{name}-%{version}.tar.xz
# (tpg) from Mageia
# http://svnweb.mageia.org/soft?view=revision&revision=6438
Patch0: rpmtools-6.1-use-external-gzip.patch
# Patch1: rpmtools-6.1-genhdlist2-merge-option.patch
Patch1: rpmtools-6.1-genhdlist2-merge-option.patch
License: GPLv2+
Group: System/Configuration/Packaging
URL: http://svn.mandriva.com/cgi-bin/viewvc.cgi/soft/rpm/rpmtools/