Packman Build Service PMBS

flacon.changes Changed

flacon.spec Changed

@@ -17,17 +17,22 @@
 
 
 Name:           flacon
-Version:        0.8.0
+Version:        0.9.1
 Release:        0
-License:        GPL-3.0+
+License:        LGPL-2.1+
 Summary:        Split Compressed Audio CD Image to Tracks
-Url:            http://code.google.com/p/flacon/
+Url:            https://github.com/SokoloffA/flacon
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
-Source0:        http://flacon.googlecode.com/files/%{name}-%{version}.tgz
+Source0:        https://github.com/SokoloffA/flacon/archive/v%{version}.tar.gz
+# PATCH-FIX-UPSTREAM flacon-0.9.1-qt_version_check.patch <sokoloff.a@gmail.com> -- fix compile with Qt < 4.8.0
+Patch0:         flacon-0.9.1-qt_version_check.patch
+BuildRequires:  cmake
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  python-base
-BuildRequires:  python-qt4-devel
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(QtCore)
+BuildRequires:  pkgconfig(QtGui)
+BuildRequires:  pkgconfig(QtNetwork)
+BuildRequires:  pkgconfig(uchardet)
 # not actually needed for build, but in order to make the build fail
 # if the runtime dependencies are not available in the repository:
 BuildRequires:  faac
@@ -42,8 +47,6 @@
 Requires:       flac
 Requires:       lame
 Requires:       mac
-Requires:       python-chardet
-Requires:       python-qt4
 Requires:       shntool
 Requires:       ttaenc
 Requires:       vorbis-tools
@@ -52,8 +55,6 @@
 Recommends:     mp3gain
 Recommends:     vorbisgain
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
-%py_requires
 
 %description
 Flacon extracts individual tracks from one big audio file containing
@@ -66,14 +67,21 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-make clean
-make
+mkdir build
+cd build
+cmake .. \
+    -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+    -DCMAKE_C_FLAGS="%{optflags}" \
+    -DCMAKE_CXX_FLAGS="%{optflags}"
+make %{?_smp_mflags} VERBOSE=1
 
 %install
+pushd build
 %make_install
-rm -f %{buildroot}%{_datadir}/%{name}/encoders/*_config_ui.py*
+popd
 %find_lang %{name} --with-qt
 %suse_update_desktop_file %{name}
 
@@ -87,11 +95,13 @@
 
 %files
 %defattr(-,root,root,-)
+%doc LICENSE README.md
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %exclude %{_datadir}/%{name}/translations/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/*/*/%{name}.*
+%doc %{_mandir}/man?/*
 
 %files lang -f %{name}.lang
 %defattr(-,root,root,-)

flacon-0.9.1-qt_version_check.patch Added

@@ -0,0 +1,64 @@
+Index: flacon-0.9.1/tagset.cpp
+===================================================================
+--- flacon-0.9.1.orig/tagset.cpp
++++ flacon-0.9.1/tagset.cpp
+@@ -105,11 +105,35 @@ QString TagSetData::decode(const Tag &ta
+     return mTextCodec->toUnicode(tag.value.toAscii());
+ }
+ 
+-
+-
+ /************************************************
+ 
+  ************************************************/
++#if (QT_VERSION < QT_VERSION_CHECK(4, 8, 0))
++
++template<class T>
++unsigned int levenshteinDistance(const T &s1, const T & s2)
++{
++    const size_t len1 = s1.size(), len2 = s2.size();
++    QVector<unsigned int> col(len2+1), prevCol(len2+1);
++    QVector<unsigned int> &c = col;
++    QVector<unsigned int> &p = prevCol;
++
++    for (int i = 0; i < p.size(); i++)
++        p[i] = i;
++
++    for (unsigned int i = 0; i < len1; i++)
++    {
++        c[0] = i+1;
++        for (unsigned int j = 0; j < len2; j++)
++            c[j+1] = qMin( qMin( 1 + c[j], 1 + p[1 + j]),
++                            p[j] + (s1[i]==s2[j] ? 0 : 1) );
++
++        p = col;
++        c = prevCol;
++    }
++    return p[len2];
++}
++#else
+ template<class T>
+ unsigned int levenshteinDistance(const T &s1, const T & s2)
+ {
+@@ -129,7 +153,7 @@ unsigned int levenshteinDistance(const T
+     }
+     return prevCol[len2];
+ }
+-
++#endif
+ 
+ 
+ /************************************************
+@@ -307,12 +331,10 @@ int TagSet::distance(const TagSet *other
+     int res = 0;
+     QString str1 = this->diskTag(TAG_PERFORMER).toUpper().replace("THE ", "");
+     QString str2 = other->diskTag(TAG_PERFORMER).toUpper().replace("THE ", "");
+-
+     res += levenshteinDistance(str1, str2) * 3;
+ 
+     str1 = this->diskTag(TAG_ALBUM).toUpper().replace("THE ", "");
+     str2 = other->diskTag(TAG_ALBUM).toUpper().replace("THE ", "");
+-
+     res += levenshteinDistance(str1, str2);
+ 
+     return res;

flacon-0.8.0.tgz Deleted

v0.9.1.tar.gz Added

Changes of Revision 8