Hello community, here is the log from the commit of package wodim for openSUSE:Factory checked in at 2013-04-19 17:25:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wodim (Old) and /work/SRC/openSUSE:Factory/.wodim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wodim", Maintainer is "nadvor...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/wodim/wodim.changes 2013-04-19 10:04:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wodim.new/wodim.changes 2013-04-19 17:25:25.000000000 +0200 @@ -2,12 +1,0 @@ -Thu Apr 18 10:49:03 UTC 2013 - co...@suse.com - -- switch _service to localonly - -------------------------------------------------------------------- -Tue Apr 2 18:55:55 UTC 2013 - jeng...@inai.de - -- Dissolve Obsoletes cycle between cdrkit (source package "wodim") - and cdrtools. Add proper Conflicts instead. -- Use more robust make install call; kill redundant %clean section - -------------------------------------------------------------------- Old: ---- cdrkit-1.1.11.tar.gz New: ---- _service:download_url:cdrkit-1.1.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wodim.spec ++++++ --- /var/tmp/diff_new_pack.RFM1Hq/_old 2013-04-19 17:25:27.000000000 +0200 +++ /var/tmp/diff_new_pack.RFM1Hq/_new 2013-04-19 17:25:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package wodim # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -16,14 +16,15 @@ # + Name: wodim Version: 1.1.11 -Release: 0 +Release: 2 Summary: Tool for Writing CDRs -License: GPL-2.0 -Group: Productivity/Multimedia/CD/Record +License: GPL-2.0 Url: http://cdrkit.org/ +Group: Productivity/Multimedia/CD/Record Source0: http://cdrkit.org/releases/cdrkit-%{version}.tar.gz Source1: scan_scsi.linux Source2: cdinfo.c @@ -49,6 +50,8 @@ BuildRequires: perl BuildRequires: zlib-devel Requires: permissions +Provides: cdrecord = %{version} +Obsoletes: cdrecord < %{version} Requires(post): permissions Requires(post): /bin/cp @@ -57,21 +60,26 @@ DVD media on a DVD-Recorder. %package -n cdrkit-devel-static +License: GPL-2.0 Summary: Tool for Writing CDRs - Files Mandatory for Development Group: Development/Libraries/Other +Provides: cdrecord-devel = %{version} +Provides: cdrtools-devel = %{version} Provides: wodim-devel = %{version} +Obsoletes: cdrecord-devel < %{version} +Obsoletes: cdrtools-devel < %{version} Obsoletes: wodim-devel < %{version} %description -n cdrkit-devel-static This package contains cdrkit libraries mandatory for development. %package -n genisoimage +License: GPL-2.0 Summary: A Program for Creating CDs in Linux Group: Productivity/Multimedia/CD/Record Recommends: zisofs-tools -# A handful of cdrtools programs, such as isovfy(1), -# exist in genisoimage as well. -Conflicts: mkisofs +Provides: mkisofs = %{version} +Obsoletes: mkisofs < %{version} %description -n genisoimage Genisoimage is a pre-mastering program that generates an iso9660 @@ -80,35 +88,35 @@ that can be written to a block device. %package -n icedax +License: GPL-2.0 Summary: A CD-Audio Grabbing tool Group: Productivity/Multimedia/CD/Grabbers Requires: vorbis-tools -# A handful of cdrtools programs, such as cdda2ogg(1), -# exist in icedax as well. -Conflicts: cdda2wav +Provides: cdda2wav = %{version} +Obsoletes: cdda2wav < %{version} %description -n icedax The common CD-audio grabbing tool for Linux. The sources are now contained in the wodim source archive. %package -n cdrkit-cdrtools-compat +License: GPL-2.0 Summary: Tool for Writing CDRs - cdrtools Compatibility Package Group: Productivity/Multimedia/CD/Record Requires: genisoimage = %{version}-%{release} Requires: icedax = %{version}-%{release} Requires: wodim = %{version}-%{release} -Conflicts: cdda2wav -Conflicts: cdrecord -Conflicts: mkisofs -%description -n cdrkit-cdrtools-compat -This package contains these symlinks: +%description -n 'cdrkit-cdrtools-compat' +This package contains these compatibility symlinks: cdrecord -> wodim mkisofs -> genisoimage cdda2wav -> icedax -Install this package if you want to use the cdrkit programs -using cdrtools program names. +Install this package if you can't use the cdrkit programs directly. +#Requires: genisoimage = %%{version-%%{release} +#Requires: icedax = %%{version-%%{release} +#Requires: wodim = %%{version-%%{release} %prep %setup -q -n cdrkit-%{version} %patch0 @@ -136,7 +144,7 @@ %install cd build -make install DESTDIR="%buildroot" +%make_install cd .. # Fix perl version requirement @@ -208,6 +216,9 @@ %fdupes -s %{buildroot} +%clean +rm -rf %{buildroot} + %verifyscript %verify_permissions -e %{_bindir}/wodim ++++++ _service ++++++ --- /var/tmp/diff_new_pack.RFM1Hq/_old 2013-04-19 17:25:27.000000000 +0200 +++ /var/tmp/diff_new_pack.RFM1Hq/_new 2013-04-19 17:25:27.000000000 +0200 @@ -1,12 +1,12 @@ <?xml version="1.0" ?> <services> - <service name="download_url" mode="localonly"> + <service name="download_url"> <param name="protocol">http</param> <param name="host">cdrkit.org</param> <param name="path">/releases/cdrkit-1.1.11.tar.gz</param> </service> - <service name="verify_file" mode="localonly"> - <param name="file">cdrkit-1.1.11.tar.gz</param> + <service name="verify_file"> + <param name="file">_service:download_url:cdrkit-1.1.11.tar.gz</param> <param name="verifier">sha256</param> <param name="checksum">d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da</param> </service> -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
