Accepting request 304914 from electronics

1

OBS-URL: https://build.opensuse.org/request/show/304914
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kicad?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2015-05-02 19:40:13 +00:00 committed by Git OBS Bridge
parent f72748d1fc
commit d81da12d6c
5 changed files with 28 additions and 10 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 25 23:27:53 UTC 2015 - jengelh@inai.de
- Do not conflict with self-provides
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 25 12:47:03 UTC 2014 - dmitry_r@opensuse.org Tue Feb 25 12:47:03 UTC 2014 - dmitry_r@opensuse.org

View File

@ -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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -28,18 +28,21 @@ Name: kicad
%endif %endif
Version: 20140120 Version: 20140120
Release: 0 Release: 0
License: GPL-2.0+
%if 0%{?with_gost} %if 0%{?with_gost}
Summary: EDA software suite for the creation of schematics and PCB with GOST support Summary: EDA software suite for the creation of schematics and PCB with GOST support
License: GPL-2.0+
Group: Productivity/Scientific/Electronics
%else %else
Summary: EDA software suite for the creation of schematics and PCB Summary: EDA software suite for the creation of schematics and PCB
%endif License: GPL-2.0+
Group: Productivity/Scientific/Electronics Group: Productivity/Scientific/Electronics
%endif
Url: http://kicad-pcb.org Url: http://kicad-pcb.org
# https://code.launchpad.net/~kicad-stable-committers/kicad/stable # https://code.launchpad.net/~kicad-stable-committers/kicad/stable
# revision 4027 # revision 4027
# bzr export -r [revision] kicad-[version].tar.bz2 lp:kicad/stable # bzr export -r [revision] kicad-[version].tar.bz2 lp:kicad/stable
Source: kicad-%{version}.tar.bz2 Source: kicad-%{version}.tar.bz2
Source9: pre_checkin.sh
Patch1: kikad-no-templates-install.patch Patch1: kikad-no-templates-install.patch
BuildRequires: boost-devel BuildRequires: boost-devel
@ -62,7 +65,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kicad-library Requires: kicad-library
Recommends: kicad-doc Recommends: kicad-doc
%if 0%{?with_gost} %if 0%{?with_gost}
Conflicts: kicad Conflicts: otherproviders(kicad)
Provides: kicad = %{version} Provides: kicad = %{version}
%endif %endif

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 25 23:27:53 UTC 2015 - jengelh@inai.de
- Do not conflict with self-provides
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 25 12:47:03 UTC 2014 - dmitry_r@opensuse.org Tue Feb 25 12:47:03 UTC 2014 - dmitry_r@opensuse.org

View File

@ -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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -28,18 +28,21 @@ Name: kicad
%endif %endif
Version: 20140120 Version: 20140120
Release: 0 Release: 0
License: GPL-2.0+
%if 0%{?with_gost} %if 0%{?with_gost}
Summary: EDA software suite for the creation of schematics and PCB with GOST support Summary: EDA software suite for the creation of schematics and PCB with GOST support
License: GPL-2.0+
Group: Productivity/Scientific/Electronics
%else %else
Summary: EDA software suite for the creation of schematics and PCB Summary: EDA software suite for the creation of schematics and PCB
%endif License: GPL-2.0+
Group: Productivity/Scientific/Electronics Group: Productivity/Scientific/Electronics
%endif
Url: http://kicad-pcb.org Url: http://kicad-pcb.org
# https://code.launchpad.net/~kicad-stable-committers/kicad/stable # https://code.launchpad.net/~kicad-stable-committers/kicad/stable
# revision 4027 # revision 4027
# bzr export -r [revision] kicad-[version].tar.bz2 lp:kicad/stable # bzr export -r [revision] kicad-[version].tar.bz2 lp:kicad/stable
Source: kicad-%{version}.tar.bz2 Source: kicad-%{version}.tar.bz2
Source9: pre_checkin.sh
Patch1: kikad-no-templates-install.patch Patch1: kikad-no-templates-install.patch
BuildRequires: boost-devel BuildRequires: boost-devel
@ -62,7 +65,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kicad-library Requires: kicad-library
Recommends: kicad-doc Recommends: kicad-doc
%if 0%{?with_gost} %if 0%{?with_gost}
Conflicts: kicad Conflicts: otherproviders(kicad)
Provides: kicad = %{version} Provides: kicad = %{version}
%endif %endif

2
pre_checkin.sh Normal file
View File

@ -0,0 +1,2 @@
#!/bin/sh
cp -f kicad.changes kicad-gost.changes