rpms/kid3/FC-4 .cvsignore, 1.3, 1.4 kid3.spec, 1.8, 1.9 sources, 1.3, 1.4

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/kid3/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31338/FC-4

Modified Files:
	.cvsignore kid3.spec sources 
Log Message:
* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6-2
- Explicitly disable musicbrainz support for now, needs older libtunepimp
  than what's available in FE.
- Apply Debian's 0.6-2 patch, includes ogg tagging fix.
- Install man page.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Oct 2005 18:35:02 -0000	1.3
+++ .cvsignore	18 Feb 2006 14:34:18 -0000	1.4
@@ -1 +1,2 @@
 kid3-0.6.tar.gz
+kid3_0.6-2.diff.gz


Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-4/kid3.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kid3.spec	31 Oct 2005 18:35:02 -0000	1.8
+++ kid3.spec	18 Feb 2006 14:34:18 -0000	1.9
@@ -1,12 +1,13 @@
 Name:           kid3
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://kid3.sourceforge.net/
 Source0:        http://download.sourceforge.net/kid3/%{name}-%{version}.tar.gz
+Patch0:         http://ftp.debian.org/debian/pool/main/k/kid3/kid3_0.6-2.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel
@@ -23,19 +24,21 @@
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e 's/\r//' LICENSE
 
 
 %build
 unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
-# TODO: musicbrainz support (needs libtunepimp-devel)
-%configure --disable-rpath --disable-dependency-tracking
+# TODO: musicbrainz support needs libtunepimp-devel < 0.4.0 as of 0.6
+%configure --disable-rpath --disable-dependency-tracking --without-musicbrainz
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+install -Dpm 644 debian/kid3.1 $RPM_BUILD_ROOT%{_mandir}/man1/kid3.1
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --mode 644 \
@@ -66,9 +69,16 @@
 %{_datadir}/applications/*kid3.desktop
 %{_datadir}/apps/kid3/
 %{_datadir}/icons/hicolor/*/apps/kid3.png
+%{_mandir}/man1/kid3.1*
 
 
 %changelog
+* Wed Feb 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.6-2
+- Explicitly disable musicbrainz support for now, needs older libtunepimp
+  than what's available in FE.
+- Apply Debian's 0.6-2 patch, includes ogg tagging fix.
+- Install man page.
+
 * Mon Oct 31 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.6-1
 - 0.6, patches applied upstream.
 - Clean up build dependencies.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Oct 2005 18:35:02 -0000	1.3
+++ sources	18 Feb 2006 14:34:18 -0000	1.4
@@ -1 +1,2 @@
 945992608a29b692284db2c80e1217bd  kid3-0.6.tar.gz
+7b34f08c9f678028559d5de2c9f07b4e  kid3_0.6-2.diff.gz