rpms/kid3/devel kid3-1.1-discogs_import.patch, NONE, 1.1 kid3.spec, 1.24, 1.25

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/kid3/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31396

Modified Files:
	kid3.spec 
Added Files:
	kid3-1.1-discogs_import.patch 
Log Message:
* Wed Feb 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.1-2
- Apply upstream patch to fix discogs.com import.
- Update desktop database when appropriate.
- Improve icon cache refresh scriptlets.
- Do not convert doc symlinks to relative.
- Drop support for building for KDE 3.


kid3-1.1-discogs_import.patch:

--- NEW FILE kid3-1.1-discogs_import.patch ---
Index: kid3/kid3/discogsdialog.cpp
===================================================================
--- kid3/kid3/discogsdialog.cpp	(revision 579)
+++ kid3/kid3/discogsdialog.cpp	(working copy)
@@ -70,18 +70,18 @@
 	// releases have the format:
 	// <li><a href="/release/761529"><span style="font-size: 11pt;"><em>Amon</em> <em>Amarth</em> - The <em>Avenger</em></span></a><br>
 	QString str = QString::fromUtf8(searchStr);
-	QRegExp idTitleRe("<a href=\"/release/([0-9]+)\">(.+)</a>");
+	QRegExp idTitleRe("<a href=\"/([^/]*/?release)/([0-9]+)\">(.+)</a>");
 	QStringList lines = QCM_split("<p/>", str.remove('\n').remove('\r'));
 	m_albumListBox->clear();
 	for (QStringList::const_iterator it = lines.begin(); it != lines.end(); ++it) {
 		if (idTitleRe.QCM_indexIn(*it) != -1) {
-			QString title(idTitleRe.cap(2));
+			QString title(idTitleRe.cap(3));
 			title.replace(QRegExp("<[^>]+>"), "");
 			new AlbumListItem(
 				m_albumListBox,
 				title,
-				"release",
-				idTitleRe.cap(1));
+				idTitleRe.cap(1),
+				idTitleRe.cap(2));
 		}
 	}
 	m_albumListBox->setFocus();

 	  	 


Index: kid3.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kid3/devel/kid3.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kid3.spec	25 Oct 2008 21:00:37 -0000	1.24
+++ kid3.spec	20 Feb 2009 17:45:26 -0000	1.25
@@ -1,31 +1,24 @@
-%if 0%{?fedora} < 9
-%global kde3    1
-%endif
-
 Name:           kid3
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Efficient ID3 tag editor
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://kid3.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/kid3/%{name}-%{version}.tar.gz
+# http://sf.net/tracker/index.php?func=detail&aid=2602860&group_id=70849&atid=529223
+Patch0:         %{name}-1.1-discogs_import.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{?kde3}
-BuildRequires:  kdelibs3-devel
-%else
 BuildRequires:  kdelibs4-devel
 BuildRequires:  cmake
-%endif
 BuildRequires:  id3lib-devel
 BuildRequires:  taglib-devel >= 1.4
 BuildRequires:  flac-devel
 BuildRequires:  libtunepimp-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  libmp4v2-devel
-BuildRequires:  perl(File::Spec)
 BuildRequires:  gettext
 Requires:       xdg-utils
 
@@ -39,16 +32,11 @@
 
 %prep
 %setup -q
-sed -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|g' configure # lib64 rpaths
+%patch0 -p1
 
 
 %build
-%if 0%{?kde3}
-unset QTDIR ; . %{_sysconfdir}/profile.d/qt.sh
-%configure --disable-rpath --disable-dependency-tracking
-%else
-%cmake_kde4 -DCMAKE_VERBOSE_MAKEFILE=ON
-%endif
+%cmake_kde4
 make %{?_smp_mflags}
 
 
@@ -56,8 +44,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-# deb-kde3/kid3.1 == deb-kde4/kid3-kde4.1 as of 1.0
-install -Dpm 644 deb-kde3/kid3.1 $RPM_BUILD_ROOT%{_mandir}/man1/kid3.1
+install -Dpm 644 deb-kde4/kid3-kde4.1 $RPM_BUILD_ROOT%{_mandir}/man1/kid3.1
 
 # preserve desktop entry location for from < 0.8 upgrades
 mv $RPM_BUILD_ROOT%{_datadir}/applications/{kde*/kid3,fedora-kid3}.desktop
@@ -65,24 +52,24 @@
 
 %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
-  f=$(readlink $file) ; d=$(dirname ${file#$RPM_BUILD_ROOT})
-  case "$f" in /*) rm -f $file ; ln -s $(abs2rel $f $d) $file ;; esac
-done
-
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %post
-update-desktop-database &>/dev/null || :
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-update-desktop-database &>/dev/null || :
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
+if [ $1 -eq 0 ] ; then
+    update-desktop-database %{_datadir}/applications &>/dev/null
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+update-desktop-database %{_datadir}/applications &>/dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %files -f %{name}.lang
@@ -92,18 +79,21 @@
 %{_datadir}/applications/*kid3.desktop
 %{_datadir}/icons/hicolor/*x*/apps/kid3.png
 %{_datadir}/icons/hicolor/scalable/apps/kid3.svgz
-%if 0%{?kde3}
-%{_datadir}/apps/kid3/
-%else
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_datadir}/kde4/apps/kid3/
-%endif
-%lang(en) %{_docdir}/HTML/en/kid3/
-%lang(de) %{_docdir}/HTML/de/
+%lang(en) %{_kde4_docdir}/HTML/en/kid3/
+%lang(de) %{_kde4_docdir}/HTML/de/kid3/
 %{_mandir}/man1/kid3.1*
 
 
 %changelog
+* Wed Feb 18 2009 Ville Skyttä <ville.skytta at iki.fi> - 1.1-2
+- Apply upstream patch to fix discogs.com import.
+- Update desktop database when appropriate.
+- Improve icon cache refresh scriptlets.
+- Do not convert doc symlinks to relative.
+- Drop support for building for KDE 3.
+
 * Sat Oct 25 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1-1
 - 1.1.