[id3lib/el6] Add man pages from Debian and tidy spec file
David King
amigadave at fedoraproject.org
Mon Nov 17 13:00:50 UTC 2014
commit a098a7bfa255e208e50a1d754e37fd1570c87801
Author: Adrian Reber <adrian at lisas.de>
Date: Wed Aug 7 17:16:38 2013 +0200
Add man pages from Debian and tidy spec file
- Remove unneeded parts (clean, defattr, buildroot)
- Added man pages from Debian
- Fixed bogus dates
20-create-manpages.patch | 198 ++++++++++++++++++++++++++++++++++++++++++++++
id3lib.spec | 22 +++---
2 files changed, 210 insertions(+), 10 deletions(-)
---
diff --git a/20-create-manpages.patch b/20-create-manpages.patch
new file mode 100644
index 0000000..b2ef4ef
--- /dev/null
+++ b/20-create-manpages.patch
@@ -0,0 +1,198 @@
+This patch adds debian-made man pages
+--- /dev/null
++++ b/doc/man/id3info.1
+@@ -0,0 +1,31 @@
++.TH ID3INFO 1 "May 2000" local "User Command"
++.SH NAME
++id3info \- Display id3 tag information.
++.SH SYNOPSIS
++.B id3info
++.RB [
++.I OPTION
++.RB ]
++.RB [
++.I FILE
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3info
++displays both the id3v1 and id3v2 tag information for a file.
++Id3info will not differentiate between the two types of tags.
++.SH OPTIONS
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.SH SEE ALSO
++id3convert(1), id3tag(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2 at cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw at debian.org>.
++
+--- /dev/null
++++ b/doc/man/id3tag.1
+@@ -0,0 +1,69 @@
++.TH ID3TAG 1 "May 2000" local "User Command"
++.SH NAME
++id3tag \- Tags an mp3 file with id3v1 and/or id3v2 tags.
++.SH SYNOPSIS
++.B id3tag
++.RB [
++.I OPTION
++.RB ] ...
++.RB [
++.I FILE
++.RB ] ...
++.br
++.SH DESCRIPTION
++.B Id3tag
++will render both types of tag by default. Only the last
++tag type indicated in the option list will be used. Non-
++rendered will remain unchanged in the original file. Will
++also parse and convert Lyrics3 v2.0 frames, but will not
++render them.
++
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-2, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.TP
++.B \-a, \-\-artist ARTIST
++Set the artist information
++.TP
++.B \-s, \-\-song SONG
++Set the song title information
++.TP
++.B \-A, \-\-album ALBUM
++Set the album title information
++.TP
++.B \-c, \-\-comment COMMENT
++Set the comment information
++.TP
++.B \-C, \-\-desc DESCRIPTION
++Set the comment description
++.TP
++.B \-g, \-\-genre num
++Set the genre number
++.TP
++.B \-y, \-\-year num
++Set the year
++.TP
++.B \-t, \-\-track num
++Set the track number
++.TP
++.B \-T, \-\-total num
++Set the total number of tracks on the album
++
++.SH SEE ALSO
++id3convert(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2 at cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw at debian.org>.
++
+--- /dev/null
++++ b/doc/man/id3convert.1
+@@ -0,0 +1,47 @@
++.TH ID3CONVERT 1 "May 2000" local "User Command"
++.SH NAME
++id3convert \- Converts between id3v1 and id3v2 tags of an mp3 file.
++.SH SYNOPSIS
++.B id3convert
++.RB [
++.I OPTION
++.RB ]
++.RB [
++.I FILE
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3convert
++converts between id3v1 and id3v2 tags of an mp3 file. Id3convert will render
++both types of tag by default. Only the last tag type indicated in the option
++list will be used. Non-rendered tags will remain unchanged in the original
++file. Id3convert will also parse and convert Lyrics3 v2.0 frames, but will
++not render them.
++
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-1, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-s, \-\-strip
++Strip, rather than render, the tags
++.TP
++.B \-p, \-\-padding
++Use padding in the tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++
++.SH SEE ALSO
++id3tag(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2 at cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw at debian.org>.
+--- /dev/null
++++ b/doc/man/id3cp.1
+@@ -0,0 +1,38 @@
++.TH ID3CP 1 "July 2001" local "User Command"
++.SH NAME
++id3cp \- Copies tags from one file to another.
++.SH SYNOPSIS
++.B id3cp
++.RB [
++.I OPTION
++.RB ] ...
++.RB [
++.I SOURCE
++.RB ]
++.RB [
++.I DEST
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3cp
++copies tags from SOURCE to DEST.
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-1, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.SH SEE ALSO
++id3convert(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2 at cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw at debian.org>.
diff --git a/id3lib.spec b/id3lib.spec
index 8c05c94..11b6a27 100644
--- a/id3lib.spec
+++ b/id3lib.spec
@@ -1,7 +1,7 @@
Summary: Library for manipulating ID3v1 and ID3v2 tags
Name: id3lib
Version: 3.8.3
-Release: 25%{?dist}
+Release: 26%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://id3lib.sourceforge.net/
@@ -13,7 +13,7 @@ Patch2: id3lib-3.8.3-io_helpers-163101.patch
Patch3: id3lib-3.8.3-mkstemp.patch
Patch4: id3lib-3.8.3-includes.patch
Patch5: http://launchpadlibrarian.net/33114077/id3lib-vbr_buffer_overflow.diff
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Patch6: http://anonscm.debian.org/viewvc/collab-maint/deb-maint/id3lib/trunk/debian/patches/20-create-manpages.patch
BuildRequires: zlib-devel doxygen
%description
@@ -44,6 +44,7 @@ This package provides files needed to develop with the id3lib library.
%patch3 -p1 -b .mkstemp
%patch4 -p1 -b .gcc43
%patch5 -p1
+%patch6 -p1
chmod -x src/*.h src/*.cpp include/id3/*.h
sed -i -e 's/\r//' doc/id3v2.3.0.*
sed -i -e 's|@DOX_DIR_HTML@|%{_docdir}/%{name}-devel-%{version}/api|' \
@@ -60,7 +61,6 @@ make %{?_smp_mflags} libid3_la_LIBADD=-lz
%install
-rm -rf $RPM_BUILD_ROOT __doc
make install DESTDIR=$RPM_BUILD_ROOT
make docs
for i in txt html; do
@@ -68,10 +68,8 @@ for i in txt html; do
done
mkdir -p __doc/doc ; cp -p doc/*.{gif,jpg,png,html,txt,ico,css} __doc/doc
rm -f $RPM_BUILD_ROOT%{_libdir}/libid3.la
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 644 doc/man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
%post -p /sbin/ldconfig
@@ -80,16 +78,15 @@ rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog HISTORY NEWS README THANKS TODO __doc/doc/
%{_libdir}/libid3-3.8.so.*
%{_bindir}/id3convert
%{_bindir}/id3cp
%{_bindir}/id3info
%{_bindir}/id3tag
+%{_mandir}/man1/*
%files devel
-%defattr(-,root,root,-)
%doc doc/id3lib.css doc/api/
%{_includedir}/id3.h
%{_includedir}/id3/
@@ -97,6 +94,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Aug 07 2013 Adrian Reber <adrian at lisas.de> - 3.8.3-26
+- Remove unneeded parts (clean, defattr, buildroot)
+- Added man pages from Debian
+- Fixed bogus dates
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.3-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -116,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 3.8.3-20
- Autorebuild for GCC 4.3
-* Fri Dec 4 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.8.3-19
+* Tue Dec 4 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 3.8.3-19
- Fix building of id3lib and programs using it with gcc34
- Drop prebuild doxygen docs, now that doxygen is fixed to not cause multilib
conflicts
More information about the scm-commits
mailing list