Hello community, here is the log from the commit of package wodim for openSUSE:Factory checked in at Mon Apr 11 10:19:58 CEST 2011.
-------- --- wodim/wodim.changes 2011-02-19 22:56:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/wodim/wodim.changes 2011-04-07 16:59:15.000000000 +0200 @@ -1,0 +2,27 @@ +Thu Apr 7 14:57:21 UTC 2011 - davejpla...@gmail.com + +- Fixed provides/requires to enable clean installation of cdrtools + and vice versa. + +------------------------------------------------------------------- +Mon Apr 4 19:32:55 UTC 2011 - asterios.dra...@gmail.com + +- Spec file updates: + * Added "libbz2-devel" in BuildRequires:. + * Added "permissions" package in Requires:. + * Moved mkhybrid to cdrkit-cdrtools-compat. + * Install also libedc.a library. + * Changed the installation path of header files (to be more compatible with + Fedora, at least for libusal). + * Changed wodim-devel package name to cdrkit-devel-static. + * Added "-DPIC -fPIC" in CFLAGS to built the static libraries. + * Added smp_mflags to make. + * Install config files in /etc. + * Updates in %post installation script of wodim according to openSUSE spec + file guidelines. + * Updates in %files sections. + * Minor other updates. +- Added a patch from upstream for icedax.1 to fix rpmlint warning "macro `wav,' + not defined". + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- icedax.1_macro_warning_fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wodim.spec ++++++ --- /var/tmp/diff_new_pack.vX05wc/_old 2011-04-11 10:02:28.000000000 +0200 +++ /var/tmp/diff_new_pack.vX05wc/_new 2011-04-11 10:02:28.000000000 +0200 @@ -15,38 +15,43 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: wodim Version: 1.1.11 -Release: 1 +Release: 2 Summary: Tool for Writing CDRs License: GPLv2 Url: http://cdrkit.org/ Group: Productivity/Multimedia/CD/Record -Source0: cdrkit-%{version}.tar.gz +Source0: http://cdrkit.org/releases/cdrkit-%{version}.tar.gz Source1: scan_scsi.linux Source2: cdinfo.c Source5: README.SUSE # PATCH-FIX-OPENSUSE cdrkit-1.1.9-cmake.patch -- -Patch1: cdrkit-1.1.9-cmake.patch +Patch0: cdrkit-1.1.9-cmake.patch # PATCH-FIX-OPENSUSE genisoimage-multi-extent.patch -- -Patch2: genisoimage-multi-extent.patch +Patch1: genisoimage-multi-extent.patch # PATCH-FIX-OPENSUSE cdrkit-1.1.9-zlib-check.patch -- Fix cmake scripts to detect zlib-devel -Patch4: cdrkit-1.1.9-zlib-check.patch +Patch2: cdrkit-1.1.9-zlib-check.patch # PATCH-FIX-OPENSUSE cdrkit-1.1.9-fix-buffer-overflows.patch -- Fix buffer overflow warnings -Patch5: cdrkit-1.1.9-fix-buffer-overflows.patch +Patch3: cdrkit-1.1.9-fix-buffer-overflows.patch +# PATCH-FIX-UPSTREAM icedax.1_macro_warning_fix.patch asterios.dra...@gmail.com -- Fix rpmlint warning "manual-page-warning: macro `wav,' not defined" (already fixed upstream) +Patch4: icedax.1_macro_warning_fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: fdupes BuildRequires: file-devel BuildRequires: gcc-c++ +BuildRequires: libbz2-devel BuildRequires: libcap-devel BuildRequires: perl BuildRequires: zlib-devel +Requires: permissions +Provides: cdrecord = %{version} +Obsoletes: cdrecord < %{version} Requires(post): permissions Requires(post): /bin/cp @@ -54,69 +59,27 @@ wodim is used to record data or audio CDs on a CD-Recorder or to write DVD media on a DVD-Recorder. - - -Authors: --------- - Joerg Jaspert (leader, release management) - Eduard Bloch (developer, patch integration) - Steve McIntyre (developer) - Peter Samuelson (developer, QA) - Christian Fromme (QA) - Joerg Schilling (original cdrecord) - -%package devel +%package -n cdrkit-devel-static License: GPLv2 Summary: Tool for Writing CDRs - Files Mandatory for Development Group: Development/Libraries/Other -Provides: cdrecord-devel -Obsoletes: cdrecord-devel +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 devel +%description -n cdrkit-devel-static This package contains cdrkit libraries mandatory for development. - - -Authors: --------- - Joerg Schilling <jo...@schily.isdn.cs.tu-berlin.de> - -%package -n cdrkit-cdrtools-compat -License: GPLv2 -Summary: Tool for Writing CDRs - cdrtools Compatibility Package -Group: Productivity/Multimedia/CD/Record -Requires: genisoimage -Requires: icedax -Requires: wodim -Provides: cdda2wav -Obsoletes: cdda2wav -Provides: cdrecord -Obsoletes: cdrecord -Provides: mkisofs -Obsoletes: mkisofs - -%description -n cdrkit-cdrtools-compat -This package contains these compatibility symlinks: cdrecord -> wodim -mkisofs -> genisoimage cdda2wav -> icedax - -Install this package if you can't use the cdrkit programs directly. - - - -Authors: --------- - Joerg Jaspert (leader, release management) - Eduard Bloch (developer, patch integration) - Steve McIntyre (developer) - Peter Samuelson (developer, QA) - Christian Fromme (QA) - Joerg Schilling (original cdrecord) - %package -n genisoimage License: GPLv2 Summary: A Program for Creating CDs in Linux Group: Productivity/Multimedia/CD/Record Recommends: zisofs-tools +Provides: mkisofs = %{version} +Obsoletes: mkisofs < %{version} %description -n genisoimage Genisoimage is a pre-mastering program that generates an iso9660 @@ -124,169 +87,187 @@ generates a binary image which corresponds to an iso9660 filesystem that can be written to a block device. - - -Authors: --------- - Eric Youngdale <e...@aib.com> - H. Peter Anvin <h...@yggdrasil.com> - John Brezak <bre...@ch.hp.com> - Paul Eggert <egg...@twinsun.com> - Peter van der Veen <pet...@qnx.com> - R.-D. Marzusch <marzu...@odiehh.hanse.de> - %package -n icedax License: GPLv2 Summary: A CD-Audio Grabbing tool Group: Productivity/Multimedia/CD/Grabbers Requires: vorbis-tools +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: GPLv2 +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} + +%description -n 'cdrkit-cdrtools-compat' +This package contains these compatibility symlinks: +cdrecord -> wodim +mkisofs -> genisoimage +cdda2wav -> icedax +Install this package if you can't use the cdrkit programs directly. - -Authors: --------- - Heiko <he...@colossus.escape.de> - +#Requires: genisoimage = %%{version-%%{release} +#Requires: icedax = %%{version-%%{release} +#Requires: wodim = %%{version-%%{release} %prep %setup -q -n cdrkit-%{version} +%patch0 %patch1 %patch2 +%patch3 -p1 %patch4 -%patch5 -p1 # Fix perl path find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g' -# Fix permissions -chmod 644 doc/icedax/tracknames.pl -# Rename in order to not conflict with doc/genisoimage/README in rpm doc section +# Fix permissions (no executables in doc files) +chmod 644 doc/icedax/tracknames.pl misc/burnstuff misc/rc.pp +# Rename in order to not conflict with doc/genisoimage/README when added in genisoimage rpm doc files mv genisoimage/diag/README genisoimage/diag/README.diag %build -export CFLAGS="%{optflags} -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing -DPIC -fPIC" export CXXFLAGS="$CFLAGS" -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -make VERBOSE=1 MANDIR=share/man + +mkdir build +cd build +cmake ../ -DCMAKE_INSTALL_PREFIX=%{_prefix} +make VERBOSE=1 MANDIR=share/man %{?_smp_mflags} gcc %{optflags} %{S:2} -o cdinfo +cd .. %install -%makeinstall +cd build +%make_install +cd .. # Fix perl version requirement perl -pi -e 's#^require v5.8.1;##g' %{buildroot}%{_bindir}/dirsplit # Install additional programs -install -pm 0755 cdinfo \ +install -pm 0755 build/cdinfo \ icedax/cdda2mp3.new \ icedax/inf2cdtext.pl \ %{S:1} \ %{buildroot}%{_bindir} install -pm 0755 3rd-party/geteltorito/geteltorito.pl %{buildroot}%{_bindir}/geteltorito -# Compatibility and other symlinks +# Compatibility symlinks ln -sf wodim %{buildroot}%{_bindir}/cdrecord ln -sf wodim %{buildroot}%{_bindir}/dvdrecord ln -sf readom %{buildroot}%{_bindir}/readcd ln -sf icedax %{buildroot}%{_bindir}/cdda2wav +ln -sf genisoimage %{buildroot}%{_bindir}/mkhybrid ln -sf genisoimage %{buildroot}%{_bindir}/mkisofs +ln -sf wodim.1%{ext_man} %{buildroot}%{_mandir}/man1/cdrecord.1%{ext_man} +ln -sf readom.1%{ext_man} %{buildroot}%{_mandir}/man1/readcd.1%{ext_man} +ln -sf icedax.1%{ext_man} %{buildroot}%{_mandir}/man1/cdda2wav.1%{ext_man} +ln -sf genisoimage.1%{ext_man} %{buildroot}%{_mandir}/man1/mkisofs.1%{ext_man} -ln -sf genisoimage %{buildroot}%{_bindir}/mkhybrid +# Other symlinks ln -sf icedax %{buildroot}%{_bindir}/list_audio_tracks - -# Compatibility and other symlinks -ln -sf wodim.1.gz %{buildroot}%{_mandir}/man1/cdrecord.1.gz -ln -sf readom.1.gz %{buildroot}%{_mandir}/man1/readcd.1.gz -ln -sf icedax.1.gz %{buildroot}%{_mandir}/man1/cdda2wav.1.gz -ln -sf genisoimage.1.gz %{buildroot}%{_mandir}/man1/mkisofs.1.gz - -ln -sf cdda2ogg.1.gz %{buildroot}%{_mandir}/man1/cdda2mp3.1.gz +ln -sf cdda2ogg.1%{ext_man} %{buildroot}%{_mandir}/man1/cdda2mp3.1%{ext_man} # Install libraries +cd build install -dm 0755 %{buildroot}%{_libdir} -install -pm 0644 libhfs_iso/libhfs_iso.a \ +install -pm 0644 libedc/libedc.a \ + libhfs_iso/libhfs_iso.a \ libparanoia/libparanoia.a \ librols/librols.a \ libunls/libunls.a \ libusal/libusal.a \ %{buildroot}%{_libdir} +cd .. # Install headers rm -rf %{buildroot}%{_includedir} -mkdir -p %{buildroot}%{_includedir}/wodim -cp -a include/*.h %{buildroot}%{_includedir}/wodim -cp -a libusal/*.h %{buildroot}%{_includedir}/wodim -cp -a libusal/usal %{buildroot}%{_includedir}/wodim +mkdir -p %{buildroot}%{_includedir}/cdrkit +cp -a include/*.h %{buildroot}%{_includedir}/cdrkit +cp -a libusal/usal %{buildroot}%{_includedir}/ +cp -a libusal/*.h %{buildroot}%{_includedir}/usal/ # it seems to depend on the cmake version if xconfig.h lands in ./ or in ./include/ # I don't know why, a cmake expert should fix that. Work around it for now. +cd build if test -e xconfig.h; then # old cmake 2.6 - cp -a xconfig.h %{buildroot}%{_includedir}/wodim + cp -a xconfig.h %{buildroot}%{_includedir}/cdrkit elif ! test -e include/xconfig.h; then # new cmake 2.8 echo "error: xconfig.h not found!" false fi +cd .. + +# Install config files +install -dm 0755 %{buildroot}%{_sysconfdir} +install -pm 0644 netscsid/netscsid.dfl %{buildroot}%{_sysconfdir}/netscsid.conf +install -pm 0644 wodim/wodim.dfl %{buildroot}%{_sysconfdir}/wodim.conf # README.SUSE cp %{S:5} . # Missing man page. Do symlink like in Debian. -ln -sf wodim.1.gz %{buildroot}%{_mandir}/man1/netscsid.1.gz +ln -sf wodim.1%{ext_man} %{buildroot}%{_mandir}/man1/netscsid.1%{ext_man} %fdupes -s %{buildroot} %clean rm -rf %{buildroot} -%post -%run_permissions -if [ -f /etc/default/cdrecord -a ! -e /etc/wodim.conf ]; then - cp /etc/default/cdrecord /etc/wodim.conf -fi %verifyscript -%verify_permissions -e /usr/bin/wodim +%verify_permissions -e %{_bindir}/wodim + +%post +%if 0%{?set_permissions:1} > 0 + %{set_permissions wodim} +%else + %{run_permissions} +%endif %files %defattr(-,root,root,-) %doc ABOUT COPYING Changelog FAQ FORK START TODO %doc doc/ANNOUNCEMENTs/ doc/READMEs/ doc/wodim/ +%doc misc/burnstuff misc/make_di...@2.sh misc/rc.pp %doc README.SUSE -%doc %{_mandir}/man1/netscsid.1.gz -%doc %{_mandir}/man1/readom.1.gz -%doc %{_mandir}/man1/wodim.1.gz +%config(noreplace) %{_sysconfdir}/netscsid.conf +%config(noreplace) %{_sysconfdir}/wodim.conf %{_bindir}/cdinfo %{_bindir}/readom -%verify(not mode) %attr(755,root,root) %{_bindir}/wodim +%verify(not mode) %attr(0755,root,root) %{_bindir}/wodim %attr(0555,root,root) %{_sbindir}/netscsid - -%files devel -%defattr(-,root,root,-) -%{_includedir}/wodim/ -%{_libdir}/lib*.a +%doc %{_mandir}/man1/netscsid.1%{ext_man} +%doc %{_mandir}/man1/readom.1%{ext_man} +%doc %{_mandir}/man1/wodim.1%{ext_man} %files -n cdrkit-cdrtools-compat %defattr(-,root,root,-) %{_bindir}/cdda2wav %{_bindir}/cdrecord %{_bindir}/dvdrecord +%{_bindir}/mkhybrid %{_bindir}/mkisofs %{_bindir}/readcd -%doc %{_mandir}/man1/cdda2wav.1.gz -%doc %{_mandir}/man1/cdrecord.1.gz -%doc %{_mandir}/man1/mkisofs.1.gz -%doc %{_mandir}/man1/readcd.1.gz +%doc %{_mandir}/man1/cdda2wav.1%{ext_man} +%doc %{_mandir}/man1/cdrecord.1%{ext_man} +%doc %{_mandir}/man1/mkisofs.1%{ext_man} +%doc %{_mandir}/man1/readcd.1%{ext_man} + +%files -n cdrkit-devel-static +%defattr(-,root,root,-) +%{_includedir}/cdrkit/ +%{_includedir}/usal/ +%{_libdir}/lib*.a %files -n genisoimage %defattr(-,root,root,-) -%doc doc/genisoimage/* 3rd-party/geteltorito/README.geteltorito genisoimage/diag/README.diag -%doc %{_mandir}/man1/devdump.1.gz -%doc %{_mandir}/man1/dirsplit.1.gz -%doc %{_mandir}/man1/genisoimage.1.gz -%doc %{_mandir}/man1/isodebug.1.gz -%doc %{_mandir}/man1/isodump.1.gz -%doc %{_mandir}/man1/isoinfo.1.gz -%doc %{_mandir}/man1/isovfy.1.gz -%doc %{_mandir}/man5/genisoimagerc.5.gz +%doc doc/genisoimage/* +%doc 3rd-party/geteltorito/README.geteltorito genisoimage/diag/README.diag %{_bindir}/devdump %{_bindir}/dirsplit %{_bindir}/genisoimage @@ -295,17 +276,18 @@ %{_bindir}/isodump %{_bindir}/isoinfo %{_bindir}/isovfy -%{_bindir}/mkhybrid +%doc %{_mandir}/man1/devdump.1%{ext_man} +%doc %{_mandir}/man1/dirsplit.1%{ext_man} +%doc %{_mandir}/man1/genisoimage.1%{ext_man} +%doc %{_mandir}/man1/isodebug.1%{ext_man} +%doc %{_mandir}/man1/isodump.1%{ext_man} +%doc %{_mandir}/man1/isoinfo.1%{ext_man} +%doc %{_mandir}/man1/isovfy.1%{ext_man} +%doc %{_mandir}/man5/genisoimagerc.5%{ext_man} %files -n icedax %defattr(-,root,root,-) %doc doc/icedax/* -%doc %{_mandir}/man1/cdda2mp3.1.gz -%doc %{_mandir}/man1/cdda2ogg.1.gz -%doc %{_mandir}/man1/icedax.1.gz -%doc %{_mandir}/man1/list_audio_tracks.1.gz -%doc %{_mandir}/man1/pitchplay.1.gz -%doc %{_mandir}/man1/readmult.1.gz %{_bindir}/cdda2mp3 %{_bindir}/cdda2mp3.new %{_bindir}/cdda2ogg @@ -315,5 +297,11 @@ %{_bindir}/pitchplay %{_bindir}/readmult %{_bindir}/scan_scsi.linux +%doc %{_mandir}/man1/cdda2mp3.1%{ext_man} +%doc %{_mandir}/man1/cdda2ogg.1%{ext_man} +%doc %{_mandir}/man1/icedax.1%{ext_man} +%doc %{_mandir}/man1/list_audio_tracks.1%{ext_man} +%doc %{_mandir}/man1/pitchplay.1%{ext_man} +%doc %{_mandir}/man1/readmult.1%{ext_man} %changelog ++++++ icedax.1_macro_warning_fix.patch ++++++ --- icedax/icedax.1.orig 2006-12-29 01:06:26.000000000 +0200 +++ icedax/icedax.1 2011-04-04 21:03:15.928000031 +0300 @@ -932,7 +932,7 @@ .sp Audio files: .sp -There are audio files containing samples with default extensions +There are audio files containing samples with default extensions \ .wav, .au, .aifc, .aiff, and .cdr according to the selected sound format. These files are not generated when option (-N) is given. Multiple files may be written when the bulk copy option (-B) is used. Individual file names ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
