rpms/cdrkit
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Messages from rpmlint clean-up

Browse Source
This commit is contained in:
Honza Horák 2012-07-31 12:47:41 +02:00
parent d3ea117d8b
commit 9967a20858
2 changed files with 130 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
cdrkit-1.1.11-utf8.patch Normal file
View File

@ -0,0 +1,104 @@
diff -up cdrkit-1.1.11/Changelog.utf8 cdrkit-1.1.11/Changelog
--- cdrkit-1.1.11/Changelog.utf8 2012-07-31 12:38:50.207872763 +0200
+++ cdrkit-1.1.11/Changelog 2012-07-31 12:38:57.669026934 +0200
@@ -519,7 +519,7 @@ cdrkit (2.01.01a08+X.12) UNRELEASED; urg
cdrkit (2.01.01a08+X.11) UNRELEASED; urgency=low
- * 26_author_locale (ASCII transliteration of Jörg in the standard credits
+ * 26_author_locale (ASCII transliteration of Jörg in the standard credits
message)
* 28_cdda2wav_interface (Linux friendly cdda2wav behaviour)
* 30_doc_typo_fixes (various documentation/message fixes)
@@ -821,8 +821,8 @@ Sun May 16 01:37:11 2004 Joerg Schilling
Sun May 16 01:26:52 2004 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
* cdrecord.1 1.95
- Eißfeldt -> Ei\*sfeldt
- µsec -> \*msec
+ Eißfeldt -> Ei\*sfeldt
+ ľsec -> \*msec
Sat May 15 23:14:18 2004 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
* subchan.c 1.19
@@ -1057,7 +1057,7 @@ Wed Jan 14 15:37:47 2004 Joerg Schilling
Wed Jan 14 01:14:27 2004 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
* scsi-mac-iokit.c 1.8
ux_errno wird nun korrekt gesetzt wenn ein Kommando schiefgeht
- Die Sense Daten werden nicht mehr gelöscht
+ Die Sense Daten werden nicht mehr gelöscht
Author ist nun "schily", denn das Modul kommt nun teilweise dirch scgcheck
Tue Jan 13 20:43:44 2004 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
@@ -1074,7 +1074,7 @@ Mon Jan 12 00:33:39 2004 Joerg Schilling
Sun Jan 11 18:42:14 2004 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
* scsi-linux-sg.c 1.77
- Versuch das /dev/hd* Interface von Linux-2.6 besser zu unterstützen.
+ Versuch das /dev/hd* Interface von Linux-2.6 besser zu unterstützen.
Sun Jan 11 16:18:48 2004 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
* scsi-linux-sg.c 1.76
@@ -6144,7 +6144,7 @@ Mon Oct 26 00:27:22 1998 Joerg Schilling
New manufacturer: Xcitec Inc.
Doremi Media Co., Ltd.
Matsushita Electric Industrial Co.,Ltd.
- CDA Datenträger Albrechts GmbH.
+ CDA Datenträger Albrechts GmbH.
Sun Oct 25 13:00:22 1998 Joerg Schilling <joerg@schily.isdn.cs.tu-berlin.de>
* cdrecord.c 1.71
diff -up cdrkit-1.1.11/doc/icedax/README.utf8 cdrkit-1.1.11/doc/icedax/README
--- cdrkit-1.1.11/doc/icedax/README.utf8 2012-07-31 12:38:18.903226517 +0200
+++ cdrkit-1.1.11/doc/icedax/README 2012-07-31 12:38:18.902226496 +0200
@@ -387,7 +387,7 @@ and
<http://www.anime.net/~goemon/linux-cd/cdda-list.html>
-From a news posting from Björn Wiberg
+From a news posting from Björn Wiberg
> The following table was generated using the CDROM.CFG file from Nero
> v3.0.4.2.
diff -up cdrkit-1.1.11/doc/icedax/THANKS.utf8 cdrkit-1.1.11/doc/icedax/THANKS
--- cdrkit-1.1.11/doc/icedax/THANKS.utf8 2012-07-31 12:38:18.901226475 +0200
+++ cdrkit-1.1.11/doc/icedax/THANKS 2012-07-31 12:38:18.901226475 +0200
@@ -5,7 +5,7 @@ http://www.mode.net/
and
-Fraunhofer Institut für integrierte Schaltungen (FhG-IIS)
+Fraunhofer Institut für integrierte Schaltungen (FhG-IIS)
http://www.iis.fhg.de/
Code for extraction of ISRC and MCN codes as well as MD5 signatures
@@ -33,4 +33,4 @@ Francesco Chemolli (getopt_long patches)
Thanks to all testers and finally Jim McLaughlin for supplying
the first cdda-reader source code (that got me started).
-Heiko Eißfeldt
+Heiko Eißfeldt
diff -up cdrkit-1.1.11/doc/READMEs/README.ATAPI.utf8 cdrkit-1.1.11/doc/READMEs/README.ATAPI
--- cdrkit-1.1.11/doc/READMEs/README.ATAPI.utf8 2012-07-31 12:38:18.899226433 +0200
+++ cdrkit-1.1.11/doc/READMEs/README.ATAPI 2012-07-31 12:38:18.900226454 +0200
@@ -279,7 +279,7 @@ selectively telling the kernel what to u
this would not be needed if the Linux SCSI CD-ROM driver would be more
up to date and supports standard conforming drives.
-Jörg Schilling <schilling@fokus.fhg.de>
+Jörg Schilling <schilling@fokus.fhg.de>
--------------------------------------------------
Here is a hint from Alan Brown <alanb@manawatu.gen.nz>:
diff -up cdrkit-1.1.11/doc/READMEs/README.cdplus.utf8 cdrkit-1.1.11/doc/READMEs/README.cdplus
--- cdrkit-1.1.11/doc/READMEs/README.cdplus.utf8 2012-07-31 12:38:18.900226454 +0200
+++ cdrkit-1.1.11/doc/READMEs/README.cdplus 2012-07-31 12:38:18.900226454 +0200
@@ -63,7 +63,7 @@ Note: If you want to create an HFS hybri
use the '-part' option to genisoimage. Otherwise, the data track will be mounted
as an ISO9660/Joliet CD when used on a Mac.
-Jörg
+Jörg
Edited for cdrkit by Christian Fromme <kaner@strace.org> and Eduard Bloch

47
cdrkit.spec
View File

@ -11,7 +11,6 @@ Patch1: cdrkit-1.1.8-werror.patch
Patch2: cdrkit-1.1.9-efi-boot.patch
Patch4: cdrkit-1.1.9-no_mp3.patch
Patch5: cdrkit-1.1.9-buffer_overflow.patch
#Patch6: cdrkit-1.1.9-rr_joliet.patch
Patch6: cdrkit-1.1.10-build-fix.patch
Patch7: cdrkit-1.1.11-manpagefix.patch
Patch8: cdrkit-1.1.11-rootstat.patch
@ -21,12 +20,11 @@ Patch11: cdrkit-1.1.11-format.patch
Patch12: cdrkit-1.1.11-handler.patch
Patch13: cdrkit-1.1.11-dvdman.patch
Patch14: cdrkit-1.1.11-paranoiacdda.patch
Patch15: cdrkit-1.1.11-utf8.patch
BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
BuildRequires: cdparanoia-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
cdrkit is a collection of CD/DVD utilities.
@ -38,8 +36,8 @@ Provides: dvdrecord = 0:0.1.5.1
Obsoletes: cdrecord < 9:2.01-12
Provides: cdrecord = 9:2.01-12
Requires: libusal = %{version}-%{release}
Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
Requires(post): %{_sbindir}/alternatives chkconfig coreutils
Requires(preun): %{_sbindir}/alternatives
Requires(post): %{_sbindir}/alternatives
%description -n wodim
Wodim is an application for creating audio and data CDs. Wodim
@ -47,21 +45,21 @@ works with many different brands of CD recorders, fully supports
multi-sessions and provides human-readable error messages.
%package -n genisoimage
Summary: Creates an image of an ISO9660 file system
Summary: Creates an image of an ISO9660 file-system
Group: Applications/System
Obsoletes: mkisofs < 9:2.01-12
Provides: mkisofs = 9:2.01-12
Requires: libusal = %{version}-%{release}
Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
Requires(post): %{_sbindir}/alternatives chkconfig coreutils
Requires(preun): %{_sbindir}/alternatives
Requires(post): %{_sbindir}/alternatives
%description -n genisoimage
The genisoimage program is used as a pre-mastering program; i.e., it
generates the ISO9660 file system. Genisoimage takes a snapshot of
generates the ISO9660 file-system. Genisoimage takes a snapshot of
a given directory tree and generates a binary image of the tree
which will correspond to an ISO9660 filesystem when written to
which will correspond to an ISO9660 file-system when written to
a block device. Genisoimage is used for writing CD-ROMs, and includes
support for creating bootable El Torito CD-ROMs.
support for creating boot-able El Torito CD-ROMs.
Install the genisoimage package if you need a program for writing
CD-ROMs.
@ -118,7 +116,6 @@ SCSI devices.
%patch2 -p1 -b .efi
%patch4 -p1 -b .no_mp3
%patch5 -p1 -b .buffer_overflow
#%patch6 -p1 -b .rr_joliet
%patch6 -p1 -b .build-fix
%patch7 -p1 -b .manpagefix
%patch8 -p1 -b .rootstat
@ -128,6 +125,8 @@ SCSI devices.
%patch12 -p1 -b .handler
%patch13 -p1 -b .dvdman
%patch14 -p1 -b .paranoiacdda
# not using -b since otherwise backup files would be included into rpm
%patch15 -p1
# we do not want bundled paranoia library
rm -rf libparanoia
@ -143,8 +142,8 @@ export CFLAGS="$RPM_OPT_FLAGS -Wall -Werror -Wno-unused-function -Wno-unused-var
export CXXFLAGS="$CFLAGS"
export FFLAGS="$CFLAGS"
%cmake CMAKE_VERBOSE=1 \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DBUILD_SHARED_LIBS:BOOL=ON \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DBUILD_SHARED_LIBS:BOOL=ON \
..
make VERBOSE=1 %{?_smp_mflags}
@ -172,11 +171,11 @@ rm -rf $RPM_BUILD_ROOT
%post -n wodim
link=`readlink %{_bindir}/cdrecord`
if [ "$link" == "%{_bindir}/wodim" ]; then
rm -f %{_bindir}/cdrecord
rm -f %{_bindir}/cdrecord
fi
link=`readlink %{_bindir}/dvdrecord`
if [ "$link" == "wodim" ]; then
rm -f %{_bindir}/dvdrecord
rm -f %{_bindir}/dvdrecord
fi
%{_sbindir}/alternatives --install %{_bindir}/cdrecord cdrecord \
@ -192,7 +191,7 @@ fi
%preun -n wodim
if [ $1 = 0 ]; then
%{_sbindir}/alternatives --remove cdrecord %{_bindir}/wodim
%{_sbindir}/alternatives --remove cdrecord %{_bindir}/wodim
fi
%post -n genisoimage
@ -209,13 +208,13 @@ fi
%preun -n genisoimage
if [ $1 = 0 ]; then
%{_sbindir}/alternatives --remove mkisofs %{_bindir}/genisoimage
%{_sbindir}/alternatives --remove mkisofs %{_bindir}/genisoimage
fi
%post -n icedax
link=`readlink %{_bindir}/cdda2wav`
if [ "$link" == "icedax" ]; then
rm -f %{_bindir}/cdda2wav
rm -f %{_bindir}/cdda2wav
fi
%{_sbindir}/alternatives --install %{_bindir}/cdda2wav cdda2wav \
%{_bindir}/icedax 50 \
@ -224,9 +223,13 @@ fi
%preun -n icedax
if [ $1 = 0 ]; then
%{_sbindir}/alternatives --remove cdda2wav %{_bindir}/icedax
%{_sbindir}/alternatives --remove cdda2wav %{_bindir}/icedax
fi
%post -n libusal -p /sbin/ldconfig
%postun -n libusal -p /sbin/ldconfig
%files -n wodim
%defattr(-,root,root)
%doc Changelog COPYING FAQ FORK START
@ -280,12 +283,13 @@ fi
%files -n libusal
%defattr(-,root,root)
%doc Changelog COPYING FAQ FORK START
%doc doc/plattforms/README.linux Changelog COPYING FAQ FORK START
%{_libdir}/libusal.so.*
%{_libdir}/librols.so.*
%files -n libusal-devel
%defattr(-,root,root)
%doc COPYING
%{_libdir}/libusal.so
%{_libdir}/librols.so
%{_includedir}/usal
@ -294,6 +298,7 @@ fi
* Mon Jul 30 2012 Honza Horak <hhorak@redhat.com> - 1.1.11-12
- Use system cdparanoia instead of old bundled version
- Build libusal as a shared library
- Messages from rpmlint clean-up
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.11-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild