From 1e102c75ca926881dcc95893e41c1a812d994cb0d3aa5f0c8cb81054dd842d11 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 14 Feb 2012 08:50:25 +0000 Subject: [PATCH] Accepting request 104374 from devel:openSUSE:Factory:patch-license patch license to follow spdx.org standard OBS-URL: https://build.opensuse.org/request/show/104374 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libcdio?expand=0&rev=25 --- libcdio-mini.spec | 44 ++++++++++++++++++++------------------------ libcdio.spec | 44 ++++++++++++++++++++------------------------ 2 files changed, 40 insertions(+), 48 deletions(-) diff --git a/libcdio-mini.spec b/libcdio-mini.spec index 8592d50..20ca7dd 100644 --- a/libcdio-mini.spec +++ b/libcdio-mini.spec @@ -1,7 +1,7 @@ # # spec file for package libcdio-mini # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libcdio-mini # WARNING: Do not edit this auto generated file. @@ -24,15 +22,21 @@ Name: libcdio-mini # You want standard build unless you will work-around build dependency on itself. %define STANDARD_BUILD 0 %define _name libcdio -BuildRequires: gcc-c++ libtool pkg-config popt-devel +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: popt-devel %if %STANDARD_BUILD -BuildRequires: libcddb-devel libcdio-devel ncurses-devel vcdimager-devel +BuildRequires: libcddb-devel +BuildRequires: libcdio-devel +BuildRequires: ncurses-devel +BuildRequires: vcdimager-devel #!BuildIgnore: libcdio-mini-devel # Only for regression testing: #BuildRequires: cdparanoia %endif Version: 0.82 -Release: 10 +Release: 0 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: %define libcdio_name 12 %define libcdio_paranoia_name 0 @@ -41,9 +45,9 @@ Release: 10 %define libiso9660_name 7 %define libudf_name 0 Url: http://savannah.gnu.org/projects/libcdio -Group: Productivity/Multimedia/Other -License: GPLv2+ Summary: Temporary Build Staging Package of CD-ROM Access Library +License: GPL-2.0+ +Group: Productivity/Multimedia/Other Source: http://ftp.gnu.org/gnu/libcdio/%{_name}-%{version}.tar.bz2 Source1: %{_name}_spec-prepare.sh Source2: baselibs.conf @@ -70,9 +74,8 @@ Authors: Rocky Bernstein %package -n libcdio12-mini -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: Temporary Build Staging Package of CD-ROM Access Library +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -95,9 +98,8 @@ Authors: Rocky Bernstein %package -n libcdio_cdda0-mini -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: Temporary Build Staging Package of CD-ROM Access Library +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -117,9 +119,8 @@ Authors: Rocky Bernstein %package -n libcdio_paranoia0-mini -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: Temporary Build Staging Package of CD-ROM Access Library +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -139,9 +140,8 @@ Authors: Rocky Bernstein %package -n libcdio++0-mini -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: Temporary Build Staging Package of CD-ROM Access Library +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -161,9 +161,8 @@ Authors: Rocky Bernstein %package -n libiso9660-7-mini -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: Temporary Build Staging Package of CD-ROM Access Library +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -183,9 +182,8 @@ Authors: Rocky Bernstein %package -n libudf0-mini -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: Temporary Build Staging Package of CD-ROM Access Library +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -205,9 +203,8 @@ Authors: Rocky Bernstein %package utils -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: Temporary Build Staging Package of CD-ROM Access Library +Group: Productivity/Multimedia/Other PreReq: %install_info_prereq %description utils @@ -223,9 +220,8 @@ Authors: Rocky Bernstein %package devel -License: GPLv2+ -Group: Development/Languages/C and C++ Summary: Temporary Build Staging Package of CD-ROM access library +Group: Development/Languages/C and C++ Requires: libcdio12-mini = %{version} libcdio_cdda0-mini = %{version} libcdio_paranoia0-mini = %{version} libcdio++0-mini = %{version} libiso9660-7-mini = %{version} libudf0-mini = %{version} glibc-devel %if %STANDARD_BUILD == 0 Provides: %{_name}-devel = %{version} diff --git a/libcdio.spec b/libcdio.spec index c8ef30a..4d88123 100644 --- a/libcdio.spec +++ b/libcdio.spec @@ -1,7 +1,7 @@ # # spec file for package libcdio # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: libcdio # WARNING: After editing this file please call Re or rpmbuild to update spec file: @@ -24,15 +22,21 @@ Name: libcdio # You want standard build unless you will work-around build dependency on itself. %define STANDARD_BUILD 1 %define _name libcdio -BuildRequires: gcc-c++ libtool pkg-config popt-devel +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: popt-devel %if %STANDARD_BUILD -BuildRequires: libcddb-devel libcdio-devel ncurses-devel vcdimager-devel +BuildRequires: libcddb-devel +BuildRequires: libcdio-devel +BuildRequires: ncurses-devel +BuildRequires: vcdimager-devel #!BuildIgnore: libcdio-mini-devel # Only for regression testing: #BuildRequires: cdparanoia %endif Version: 0.82 -Release: 10 +Release: 0 # WARNING: After changing versions please call Re or rpmbuild to auto-update spec file: %define libcdio_name 12 %define libcdio_paranoia_name 0 @@ -41,9 +45,9 @@ Release: 10 %define libiso9660_name 7 %define libudf_name 0 Url: http://savannah.gnu.org/projects/libcdio -Group: Productivity/Multimedia/Other -License: GPLv2+ Summary: CD-ROM Access Library +License: GPL-2.0+ +Group: Productivity/Multimedia/Other Source: http://ftp.gnu.org/gnu/libcdio/%{_name}-%{version}.tar.bz2 Source1: %{_name}_spec-prepare.sh Source2: baselibs.conf @@ -70,9 +74,8 @@ Authors: Rocky Bernstein %package -n libcdio12 -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: CD-ROM Access Library +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -95,9 +98,8 @@ Authors: Rocky Bernstein %package -n libcdio_cdda0 -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: CD-ROM Access Library +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -117,9 +119,8 @@ Authors: Rocky Bernstein %package -n libcdio_paranoia0 -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: CD-ROM Access Library +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -139,9 +140,8 @@ Authors: Rocky Bernstein %package -n libcdio++0 -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: CD-ROM Access Library +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -161,9 +161,8 @@ Authors: Rocky Bernstein %package -n libiso9660-7 -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: CD-ROM Access Library +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -183,9 +182,8 @@ Authors: Rocky Bernstein %package -n libudf0 -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: CD-ROM Access Library +Group: Productivity/Multimedia/Other # bug437293 %ifarch ppc64 Obsoletes: libcdio-64bit @@ -205,9 +203,8 @@ Authors: Rocky Bernstein %package utils -License: GPLv2+ -Group: Productivity/Multimedia/Other Summary: CD-ROM Access Library +Group: Productivity/Multimedia/Other PreReq: %install_info_prereq %description utils @@ -223,9 +220,8 @@ Authors: Rocky Bernstein %package devel -License: GPLv2+ -Group: Development/Languages/C and C++ Summary: CD-ROM access library +Group: Development/Languages/C and C++ Requires: libcdio12 = %{version} libcdio_cdda0 = %{version} libcdio_paranoia0 = %{version} libcdio++0 = %{version} libiso9660-7 = %{version} libudf0 = %{version} glibc-devel %if %STANDARD_BUILD == 0 Provides: %{_name}-devel = %{version}