Hello community, here is the log from the commit of package wodim for openSUSE:Factory checked in at 2013-06-07 10:13:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wodim (Old) and /work/SRC/openSUSE:Factory/.wodim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wodim" Changes: -------- --- /work/SRC/openSUSE:Factory/wodim/wodim.changes 2013-05-16 16:25:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.wodim.new/wodim.changes 2013-06-07 10:13:18.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Jun 6 23:39:05 UTC 2013 - [email protected] + +- Avoid calling fdupes on entire buildroot; it is not valid for /etc +- Install manpage symlinks inside cdrkit-cdrtools-compat +- Remove static libraries for which there are no header files + packaged + +------------------------------------------------------------------- +Wed Jun 5 23:42:50 UTC 2013 - [email protected] + +- Avoid collision of iso{dump,vfy} etc. by moving binaries into + separate directory. This allows parallel installation of mkisofs + and genisoimage. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wodim.spec ++++++ --- /var/tmp/diff_new_pack.ZGSjeL/_old 2013-06-07 10:13:19.000000000 +0200 +++ /var/tmp/diff_new_pack.ZGSjeL/_new 2013-06-07 10:13:19.000000000 +0200 @@ -69,9 +69,6 @@ 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 %description -n genisoimage Genisoimage is a pre-mastering program that generates an iso9660 @@ -135,6 +132,7 @@ cd .. %install +b="%buildroot" cd build make install DESTDIR="%buildroot" cd .. @@ -162,6 +160,16 @@ 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} +# Do not squat on cdrtools names in genisoimage package +# (do it in cdrkit-cdrtools-compat, which conflicts anyway) +mkdir -p "$b/%_libexecdir/genisoimage" +for i in devdump iso{debug,dump,info,vfy}; do + mv "$b/%_bindir/$i" "$b/%_libexecdir/genisoimage/" + ln -s "%_libexecdir/genisoimage/$i" "$b/%_bindir/" + mv "$b/%_mandir/man1/$i.1" "$b/%_mandir/man1/genisoimage-$i.1" + ln -s "genisoimage-$i.1%ext_man" "$b/%_mandir/man1/$i.1%ext_man" +done + # Other symlinks ln -sf icedax %{buildroot}%{_bindir}/list_audio_tracks ln -sf cdda2ogg.1%{ext_man} %{buildroot}%{_mandir}/man1/cdda2mp3.1%{ext_man} @@ -169,11 +177,8 @@ # Install libraries cd build install -dm 0755 %{buildroot}%{_libdir} -install -pm 0644 libedc/libedc.a \ - libhfs_iso/libhfs_iso.a \ - libparanoia/libparanoia.a \ +install -pm 0644 \ librols/librols.a \ - libunls/libunls.a \ libusal/libusal.a \ %{buildroot}%{_libdir} cd .. @@ -206,7 +211,7 @@ # Missing man page. Do symlink like in Debian. ln -sf wodim.1%{ext_man} %{buildroot}%{_mandir}/man1/netscsid.1%{ext_man} -%fdupes -s %{buildroot} +%fdupes -s %buildroot/%_prefix %verifyscript %verify_permissions -e %{_bindir}/wodim @@ -238,12 +243,22 @@ %defattr(-,root,root,-) %{_bindir}/cdda2wav %{_bindir}/cdrecord +%{_bindir}/devdump %{_bindir}/dvdrecord %{_bindir}/mkhybrid %{_bindir}/mkisofs +%{_bindir}/isodebug +%{_bindir}/isodump +%{_bindir}/isoinfo +%{_bindir}/isovfy %{_bindir}/readcd %doc %{_mandir}/man1/cdda2wav.1%{ext_man} %doc %{_mandir}/man1/cdrecord.1%{ext_man} +%doc %{_mandir}/man1/devdump.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}/man1/mkisofs.1%{ext_man} %doc %{_mandir}/man1/readcd.1%{ext_man} @@ -257,21 +272,17 @@ %defattr(-,root,root,-) %doc doc/genisoimage/* %doc 3rd-party/geteltorito/README.geteltorito genisoimage/diag/README.diag -%{_bindir}/devdump %{_bindir}/dirsplit %{_bindir}/genisoimage %{_bindir}/geteltorito -%{_bindir}/isodebug -%{_bindir}/isodump -%{_bindir}/isoinfo -%{_bindir}/isovfy -%doc %{_mandir}/man1/devdump.1%{ext_man} +%_libexecdir/genisoimage/ +%doc %{_mandir}/man1/genisoimage-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}/man1/genisoimage-isodebug.1%{ext_man} +%doc %{_mandir}/man1/genisoimage-isodump.1%{ext_man} +%doc %{_mandir}/man1/genisoimage-isoinfo.1%{ext_man} +%doc %{_mandir}/man1/genisoimage-isovfy.1%{ext_man} %doc %{_mandir}/man5/genisoimagerc.5%{ext_man} %files -n icedax -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
