rpms/kid3/FC-6 .cvsignore, 1.5, 1.6 kid3.spec, 1.13, 1.14 sources, 1.5, 1.6 kid3-0.7-mimetypes.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	.cvsignore kid3.spec sources 
Removed Files:
	kid3-0.7-mimetypes.patch 
Log Message:
* Wed Nov 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-1
- 0.8.1, desktop entry fixes applied upstream.
- Re-enable musicbrainz support.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Jun 2006 18:48:38 -0000	1.5
+++ .cvsignore	22 Nov 2006 16:46:02 -0000	1.6
@@ -1 +1 @@
-kid3-0.7.tar.gz
+kid3-0.8.1.tar.gz


Index: kid3.spec
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-6/kid3.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- kid3.spec	2 Oct 2006 18:37:39 -0000	1.13
+++ kid3.spec	22 Nov 2006 16:46:02 -0000	1.14
@@ -1,24 +1,19 @@
-%bcond_with     tunepimp
-
 Name:           kid3
-Version:        0.7
-Release:        4%{?dist}
+Version:        0.8.1
+Release:        1%{?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:         %{name}-0.7-mimetypes.patch
+Source0:        http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel
 BuildRequires:  id3lib-devel
+BuildRequires:  taglib-devel >= 1.4
 BuildRequires:  flac-devel
-%if %{with tunepimp}
 BuildRequires:  libtunepimp-devel
-%endif
-BuildRequires:  desktop-file-utils
 BuildRequires:  perl(File::Spec)
 
 %description
@@ -30,17 +25,14 @@
 
 %prep
 %setup -q
-%patch0 -p1
 sed -i -e 's/\r//' LICENSE
+sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|g' configure # lib64 rpaths
+sed -i -e 's/-lid3/-lid3 -lz/' configure #216783 workaround
 
 
 %build
 unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
-%configure \
-%if ! %{with tunepimp}
-  --disable-musicbrainz \
-%endif
-  --disable-rpath --disable-dependency-tracking
+%configure --disable-rpath --disable-dependency-tracking
 make %{?_smp_mflags}
 
 
@@ -48,13 +40,9 @@
 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 \
-  --vendor fedora \
-  --add-category X-Fedora \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/kid3.desktop
-rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
+# preserve desktop entry location for from < 0.8 upgrades
+mv $RPM_BUILD_ROOT%{_datadir}/applications/{kde/kid3,fedora-kid3}.desktop
+rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde
 %find_lang %{name}
 abs2rel() { perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' "$@" ; }
 for file in $(find $RPM_BUILD_ROOT%{_docdir}/HTML -type l) ; do
@@ -78,17 +66,22 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING LICENSE README
-%lang(en) %{_docdir}/HTML/en/kid3/
-%lang(de) %{_docdir}/HTML/de/
+%doc AUTHORS ChangeLog COPYING LICENSE README
 %{_bindir}/kid3
 %{_datadir}/applications/*kid3.desktop
 %{_datadir}/apps/kid3/
-%{_datadir}/icons/hicolor/*/apps/kid3.png
+%{_datadir}/icons/hicolor/*x*/apps/kid3.png
+%{_datadir}/icons/hicolor/scalable/apps/kid3.svgz
+%lang(en) %{_docdir}/HTML/en/kid3/
+%lang(de) %{_docdir}/HTML/de/
 %{_mandir}/man1/kid3.1*
 
 
 %changelog
+* Wed Nov 22 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-1
+- 0.8.1, desktop entry fixes applied upstream.
+- Re-enable musicbrainz support.
+
 * Mon Oct  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7-4
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kid3/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Jun 2006 18:48:38 -0000	1.5
+++ sources	22 Nov 2006 16:46:02 -0000	1.6
@@ -1 +1 @@
-e5f8262e3456d9b0bdba4e4b56ca3aee  kid3-0.7.tar.gz
+df03e94061330e3ec088911727f85059  kid3-0.8.1.tar.gz


--- kid3-0.7-mimetypes.patch DELETED ---