diff --git a/rpmtools-6.1-genhdlist2-merge-option.patch b/rpmtools-6.1-genhdlist2-merge-option.patch index 7ead1c7..6cbb402 100644 --- a/rpmtools-6.1-genhdlist2-merge-option.patch +++ b/rpmtools-6.1-genhdlist2-merge-option.patch @@ -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"; diff --git a/rpmtools.spec b/rpmtools.spec index ebcf8d0..13fedb9 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -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/