Hello community,
here is the log from the commit of package inst-source-utils for
openSUSE:Factory checked in at 2014-02-28 16:22:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/inst-source-utils (Old)
and /work/SRC/openSUSE:Factory/.inst-source-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inst-source-utils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/inst-source-utils/inst-source-utils.changes
2013-09-23 09:32:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.inst-source-utils.new/inst-source-utils.changes
2014-02-28 16:22:23.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Feb 25 15:36:18 CET 2014 - r...@suse.de
+
+- fix typo in last change
+
+-------------------------------------------------------------------
+Wed Feb 19 17:51:38 CET 2014 - r...@suse.de
+
+- update create_package_descr: also recognize new rpm tags
+ for Suggests and Enhances (thanks to mls for the patch)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ inst-source-utils.spec ++++++
--- /var/tmp/diff_new_pack.9iXBpV/_old 2014-02-28 16:22:25.000000000 +0100
+++ /var/tmp/diff_new_pack.9iXBpV/_new 2014-02-28 16:22:25.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package inst-source-utils
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ inst-source-utils.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/inst-source-utils/usr/bin/create_package_descr
new/inst-source-utils/usr/bin/create_package_descr
--- old/inst-source-utils/usr/bin/create_package_descr 2013-09-20
11:57:18.000000000 +0200
+++ new/inst-source-utils/usr/bin/create_package_descr 2014-02-25
15:36:17.000000000 +0100
@@ -298,7 +298,10 @@
1156, 1157, 1158,
1159, 1160, 1161,
1027, 1116, 1117, 1118, 1030, 1028,
1095, 1096,
- 1014, 1016, 1006, 1009, 1044, 1004,
1005, 1011, 1124);
+ 1014, 1016, 1006, 1009, 1044, 1004,
1005, 1011, 1124,
+ 5046, 5047, 5048, 5049, 5050, 5051,
+ 5052, 5053, 5054, 5055, 5056, 5057,
+ );
# skip delta rpms (if PAYLOADFORMAT eq drpm)
next if ($res{1124}[0] && $res{1124}[0] eq "drpm");
@@ -308,8 +311,15 @@
RPMQ::rpmq_add_flagsvers(\%res, 1047, 1112, 1113); # provides
RPMQ::rpmq_add_flagsvers(\%res, 1090, 1114, 1115); # obsoletes
RPMQ::rpmq_add_flagsvers(\%res, 1054, 1053, 1055); # conflicts
- RPMQ::rpmq_add_flagsvers(\%res, 1156, 1158, 1157); # suggests
- RPMQ::rpmq_add_flagsvers(\%res, 1159, 1161, 1160); # enhances
+
+ RPMQ::rpmq_add_flagsvers(\%res, 1156, 1158, 1157) if $res{1156}; #
oldsuggests
+ RPMQ::rpmq_add_flagsvers(\%res, 1159, 1161, 1160) if $res{1159}; #
oldenhances
+
+ RPMQ::rpmq_add_flagsvers(\%res, 5046, 5048, 5047) if $res{5046}; #
recommends
+ RPMQ::rpmq_add_flagsvers(\%res, 5049, 5051, 5050) if $res{5049}; # suggests
+ RPMQ::rpmq_add_flagsvers(\%res, 5052, 5054, 5053) if $res{5052}; #
supplements
+ RPMQ::rpmq_add_flagsvers(\%res, 5055, 5057, 5056) if $res{5055}; # enhances
+
my $rpm_name = $res{1000}[0];
if ( $IGNORE_PACKAGE{$rpm_name} && $IGNORE_PACKAGE{$rpm_name} eq "yes" ) {
$ignored_packages .= " $rpm_name";
@@ -421,10 +431,14 @@
WriteMEntry( $pkg_main, "Prv", @{$res{1047}} );
WriteMEntry( $pkg_main, "Con", @{$res{1054}} );
WriteMEntry( $pkg_main, "Obs", @{$res{1090}} );
- WriteMEntry( $pkg_main, "Rec", filter_strong(\%res, 1156, 1158));
- WriteMEntry( $pkg_main, "Sug", filter_weak(\%res, 1156, 1158));
- WriteMEntry( $pkg_main, "Sup", filter_strong(\%res, 1159, 1161));
- WriteMEntry( $pkg_main, "Enh", filter_weak(\%res, 1159, 1161));
+ WriteMEntry( $pkg_main, "Rec", @{$res{5046}} ) if $res{5046};
+ WriteMEntry( $pkg_main, "Rec", filter_strong(\%res, 1156, 1158)) if
!$res{5046} && $res{1156};
+ WriteMEntry( $pkg_main, "Sug", @{$res{5049}} ) if $res{5049};
+ WriteMEntry( $pkg_main, "Sug", filter_weak(\%res, 1156, 1158)) if
!$res{5049} && $res{1156};
+ WriteMEntry( $pkg_main, "Sup", @{$res{5052}} ) if $res{5052};
+ WriteMEntry( $pkg_main, "Sup", filter_strong(\%res, 1159, 1161)) if
!$res{5052} && $res{1159};
+ WriteMEntry( $pkg_main, "Enh", @{$res{5055}} ) if $res{5055};
+ WriteMEntry( $pkg_main, "Enh", filter_weak(\%res, 1159, 1161)) if
!$res{5055} && $res{1159};
WriteSEntry( $pkg_main, "Grp", $res{1016}[0] );
WriteSEntry( $pkg_main, "Lic", $res{1014}[0] );
WriteSEntry( $pkg_main, "Vnd", $res{1011}[0] ) if $add_vendor;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
