Hello community, here is the log from the commit of package kicad for openSUSE:Factory checked in at 2015-05-02 21:40:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kicad (Old) and /work/SRC/openSUSE:Factory/.kicad.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kicad" Changes: -------- --- /work/SRC/openSUSE:Factory/kicad/kicad-gost.changes 2014-02-26 06:58:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kicad.new/kicad-gost.changes 2015-05-02 21:40:14.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 25 23:27:53 UTC 2015 - [email protected] + +- Do not conflict with self-provides + +------------------------------------------------------------------- kicad.changes: same change New: ---- pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kicad-gost.spec ++++++ --- /var/tmp/diff_new_pack.N07Uzj/_old 2015-05-02 21:40:15.000000000 +0200 +++ /var/tmp/diff_new_pack.N07Uzj/_new 2015-05-02 21:40:15.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package kicad +# spec file for package kicad-gost # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,18 +28,21 @@ %endif Version: 20140120 Release: 0 -License: GPL-2.0+ %if 0%{?with_gost} Summary: EDA software suite for the creation of schematics and PCB with GOST support +License: GPL-2.0+ +Group: Productivity/Scientific/Electronics %else Summary: EDA software suite for the creation of schematics and PCB -%endif +License: GPL-2.0+ Group: Productivity/Scientific/Electronics +%endif Url: http://kicad-pcb.org # https://code.launchpad.net/~kicad-stable-committers/kicad/stable # revision 4027 # bzr export -r [revision] kicad-[version].tar.bz2 lp:kicad/stable Source: kicad-%{version}.tar.bz2 +Source9: pre_checkin.sh Patch1: kikad-no-templates-install.patch BuildRequires: boost-devel @@ -62,7 +65,7 @@ Requires: kicad-library Recommends: kicad-doc %if 0%{?with_gost} -Conflicts: kicad +Conflicts: otherproviders(kicad) Provides: kicad = %{version} %endif ++++++ kicad.spec ++++++ --- /var/tmp/diff_new_pack.N07Uzj/_old 2015-05-02 21:40:15.000000000 +0200 +++ /var/tmp/diff_new_pack.N07Uzj/_new 2015-05-02 21:40:15.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package kicad +# spec file for package kicad-gost # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,18 +28,21 @@ %endif Version: 20140120 Release: 0 -License: GPL-2.0+ %if 0%{?with_gost} Summary: EDA software suite for the creation of schematics and PCB with GOST support +License: GPL-2.0+ +Group: Productivity/Scientific/Electronics %else Summary: EDA software suite for the creation of schematics and PCB -%endif +License: GPL-2.0+ Group: Productivity/Scientific/Electronics +%endif Url: http://kicad-pcb.org # https://code.launchpad.net/~kicad-stable-committers/kicad/stable # revision 4027 # bzr export -r [revision] kicad-[version].tar.bz2 lp:kicad/stable Source: kicad-%{version}.tar.bz2 +Source9: pre_checkin.sh Patch1: kikad-no-templates-install.patch BuildRequires: boost-devel @@ -62,7 +65,7 @@ Requires: kicad-library Recommends: kicad-doc %if 0%{?with_gost} -Conflicts: kicad +Conflicts: otherproviders(kicad) Provides: kicad = %{version} %endif ++++++ pre_checkin.sh ++++++ #!/bin/sh cp -f kicad.changes kicad-gost.changes
