merge patched-dgit/sid into dgit/sid

1 files changed, 29 insertions, 0 deletions

diff --git a/createrepomddeps b/createrepomddeps
index fad84e5..fe89a57 100755
--- a/createrepomddeps
+++ b/createrepomddeps
@@ -1,5 +1,25 @@
 #!/usr/bin/perl -w
 
+################################################################
+#
+# Copyright (c) 1995-2014 SUSE Linux Products GmbH
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program (see the file COPYING); if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+#
+################################################################
+
 BEGIN {
   unshift @INC, ($::ENV{'BUILD_DIR'} || '/usr/lib/build');
 }
@@ -359,6 +379,15 @@ sub printasbuildcachefile(@)
     $deps = deps2string(@{$pkg->{'requires'}});
     print "R:$id$deps\n";
 
+    if (@{$pkg->{'conflicts'} || []}) {
+      $deps = deps2string(@{$pkg->{'conflicts'}});
+      print "C:$id$deps\n";
+    }
+    if (@{$pkg->{'obsoletes'} || []}) {
+      $deps = deps2string(@{$pkg->{'obsoletes'}});
+      print "O:$id$deps\n";
+    }
+
     my $tag = sprintf("%s-%s-%s %s",
       $pkg->{'name'},
       $pkg->{'ver'},