Hello community,

here is the log from the commit of package kid3-qt for openSUSE:Factory
checked in at Mon Mar 21 13:01:32 CET 2011.



--------
--- kid3-qt/kid3-qt.changes     2010-10-08 09:58:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/kid3-qt/kid3-qt.changes        2011-03-18 
00:00:02.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Mar 17 22:28:17 UTC 2011 - davejpla...@gmail.com
+
+- Update to release 1.6
+- Man page added - kid3-qt.1
+- Improved numbering of tracks, GUI and usability.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  kid3-1.5.tar.bz2

New:
----
  kid3-1.6.tar.bz2
  kid3-qt-phonon.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kid3-qt.spec ++++++
--- /var/tmp/diff_new_pack.DkFU0L/_old  2011-03-21 12:58:34.000000000 +0100
+++ /var/tmp/diff_new_pack.DkFU0L/_new  2011-03-21 12:58:34.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package kid3-qt (Version 1.5)
+# spec file for package kid3-qt
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,20 +19,26 @@
 
 
 Name:           kid3-qt
-Version:        1.5
+Version:        1.6
 Release:        1
 Summary:        Efficient ID3 Tag Editor - Non Kde version
 Source0:        kid3-%{version}.tar.bz2
+Patch0:         kid3-qt-phonon.patch
 Url:            http://kid3.sourceforge.net
 Group:          Productivity/Multimedia/Sound/Utilities
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  licenses
+BuildRequires:  licenses pkg-config
+%if 0%{?suse_version} >= 1130
+BuildRequires:  pkgconfig(phonon)
+%else
+BuildRequires:  phonon-devel
+%endif
 BuildRequires:  flac-devel id3lib-devel libqt4-devel
 BuildRequires:  libtunepimp-devel perl taglib-devel
 BuildRequires:  perl(File::Spec) update-desktop-files
-BuildRequires:  libmusicbrainz-devel libvorbis-devel
-BuildRequires:  docbook-utils doxygen
+BuildRequires:  jpackage-utils libmusicbrainz3-devel libvorbis-devel
+BuildRequires:  crimson fop hicolor-icon-theme susedoc xerces-j2
 
 Requires:       licenses
 
@@ -65,80 +71,85 @@
 
 %prep
 %setup -q -n kid3-%{version}
+%patch0
 
 %build
-cd kid3-qt
+cd %{name}
 
+export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
 # if configure does not exist: autoconf
-autoconf -f
-%configure --with-qmake=qmake --with-docdir=%{_docdir}/%{name}
-%__make %{?jobs:-j%{jobs}}
+autoconf -v -f
+
+%configure LIBS="$(pkg-config --libs phonon)"\
+         --with-qmake=qmake \
+         --with-docdir=%{_docdir}/%{name} \
+         --without-mp4v2 \
+         --with-extra-libs="$(pkg-config --libs phonon)" \
+         --with-extra-includes=%{_includedir}/phonon
+
+%__make -e CXXFLAGS="$CXXFLAGS %{optflags} -ggdb" %{?jobs:-j%{jobs}}
 
 %install
+pushd %{name}
+export INSTALL_ROOT=%{buildroot}
+%makeinstall
+%suse_update_desktop_file -r "%{name}" AudioVideo AudioVideoEditing
+popd
+#
+install -Dpm 0644 deb/kid3.1 %{buildroot}%{_mandir}/man1/kid3-qt.1
+
 for FILE in COPYING ; do
     MD5SUM=$(md5sum $FILE | sed 's/ .*//')
     if test -f /usr/share/doc/licenses/md5/$MD5SUM ; then
         ln -sf /usr/share/doc/licenses/md5/$MD5SUM $FILE
     fi
 done
-pushd kid3-qt
-export INSTALL_ROOT=%{buildroot}
-%makeinstall
-%suse_update_desktop_file -r "%{name}" AudioVideo AudioVideoEditing
-popd
-
-#find %{buildroot} -type f -o -name "*.so" -exec strip "{}" \;
+#find %%{buildroot} -type f -o -name "*.so" -exec strip "{}" \;
+cp -pr AUTHORS ChangeLog COPYING LICENSE NEWS README 
%{buildroot}%{_docdir}/%{name}/
+%find_lang %{name} %{name}-qt.lang --without-kde --with-qt --all-name 
--without-mo
 
 %clean
 %__rm -rf "%{buildroot}"
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING LICENSE NEWS README
+%doc %{_docdir}/%{name}
 %defattr(755,root,root,755)
 %_bindir/%{name}
 %defattr(644,root,root,755)
 %_datadir/applications/%{name}.desktop
-%_datadir/icons/hicolor/16x16/apps/kid3-qt.png
-%_datadir/icons/hicolor/32x32/apps/kid3-qt.png
-%_datadir/icons/hicolor/48x48/apps/kid3-qt.png
-%_datadir/icons/hicolor/scalable/apps/kid3-qt.svgz
-%_datadir/kid3-qt/translations/kid3_de.qm
-%_datadir/kid3-qt/translations/kid3_et.qm
-%_datadir/kid3-qt/translations/kid3_fr.qm
-%_datadir/kid3-qt/translations/kid3_it.qm
-%_datadir/kid3-qt/translations/kid3_nl.qm
-%_datadir/kid3-qt/translations/kid3_ru.qm
-%_datadir/kid3-qt/translations/kid3_tr.qm
-%_datadir/kid3-qt/translations/kid3_zh_TW.qm
-%_datadir/kid3-qt/translations/kid3_pl.qm
-%_datadir/kid3-qt/translations/kid3_fi.qm
-%_datadir/kid3-qt/translations/kid3_es.qm
-%_datadir/kid3-qt/translations/kid3_cs.qm
-%_datadir/kid3-qt/translations/qt_de.qm
+%_iconsbasedir/16x16/apps/%{name}.png
+%_iconsbasedir/32x32/apps/%{name}.png
+%_iconsbasedir/48x48/apps/%{name}.png
+%_iconsbasedir/scalable/apps/%{name}.svgz
+%_datadir/%{name}/translations/kid3_de.qm
+%_datadir/%{name}/translations/kid3_et.qm
+%_datadir/%{name}/translations/kid3_fr.qm
+%_datadir/%{name}/translations/kid3_it.qm
+%_datadir/%{name}/translations/kid3_nl.qm
+%_datadir/%{name}/translations/kid3_ru.qm
+%_datadir/%{name}/translations/kid3_tr.qm
+%_datadir/%{name}/translations/kid3_zh_TW.qm
+%_datadir/%{name}/translations/kid3_pl.qm
+%_datadir/%{name}/translations/kid3_fi.qm
+%_datadir/%{name}/translations/kid3_es.qm
+%_datadir/%{name}/translations/kid3_cs.qm
+%_datadir/%{name}/translations/qt_de.qm
+%_mandir/man1/kid3-qt.1.gz
 
 %if 0%{?suse_version} != 1120
-%_datadir/kid3-qt/translations/qt_zh_TW.qm
-%_datadir/kid3-qt/translations/qt_pl.qm
-%_datadir/kid3-qt/translations/qt_ru.qm
-%_datadir/kid3-qt/translations/qt_fr.qm
-%_datadir/kid3-qt/translations/qt_es.qm
+%_datadir/%{name}/translations/qt_zh_TW.qm
+%_datadir/%{name}/translations/qt_pl.qm
+%_datadir/%{name}/translations/qt_ru.qm
+%_datadir/%{name}/translations/qt_fr.qm
+%_datadir/%{name}/translations/qt_es.qm
 %endif
 
 %if 0%{?suse_version} > 1120
-%_datadir/kid3-qt/translations/qt_cs.qm
+%_datadir/%{name}/translations/qt_cs.qm
 %endif
 
-%dir %{_datadir}/icons/hicolor
-%dir %{_datadir}/icons/hicolor/16x16
-%dir %{_datadir}/icons/hicolor/16x16/apps
-%dir %{_datadir}/icons/hicolor/32x32
-%dir %{_datadir}/icons/hicolor/32x32/apps
-%dir %{_datadir}/icons/hicolor/48x48
-%dir %{_datadir}/icons/hicolor/48x48/apps
-%dir %{_datadir}/icons/hicolor/scalable
-%dir %{_datadir}/icons/hicolor/scalable/apps
-%dir %{_datadir}/kid3-qt
-%dir %{_datadir}/kid3-qt/translations
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/translations
 
 %changelog

++++++ kid3-1.5.tar.bz2 -> kid3-1.6.tar.bz2 ++++++
++++ 88476 lines of diff (skipped)

++++++ kid3-qt-phonon.patch ++++++
Index: kid3-qt/configure.in
===================================================================
--- kid3-qt/configure.in.orig   2011-01-16 14:29:15.000000000 +0200
+++ kid3-qt/configure.in        2011-01-25 18:00:22.546046332 +0200
@@ -508,25 +508,27 @@ if test "$with_phonon" != "no"; then
   AC_DEFUN([AC_FIND_PHONON],
   [
     AC_MSG_CHECKING([for libphonon])
-    mkdir phonontest
-    cat >phonontest/phonontest.pro <<EOF
-TEMPLATE = app
-QT += phonon
-SOURCES += phonontest.cpp
-EOF
-    cat >phonontest/phonontest.cpp <<EOF
+#    pkg
+#    mkdir phonontest
+#    cat >phonontest/phonontest.pro <<EOF
+#TEMPLATE = app
+#QT += phonon
+#SOURCES += phonontest.cpp
+#EOF
+#    cat >phonontest/phonontest.cpp <<EOF
 #include <Phonon/Path>
-int main() {
-  Phonon::Path p;
-  return 0;
-}
-EOF
-    cd phonontest
-    ${CFG_QMAKE} && make >/dev/null 2>&1
-    phonon_result=$?
-    cd ..
-    rm -rf phonontest
-    if test $phonon_result -eq 0; then
+#int main() {
+#  Phonon::Path p;
+#  return 0;
+#}
+#EOF
+#    cd phonontest
+#    ${CFG_QMAKE} && make >/dev/null 2>&1
+#    phonon_result=$?
+#    cd ..
+#    rm -rf phonontest
+    
+    if pkg-config --exists phonon; then
       AC_MSG_RESULT(yes)
       HAVE_PHONON=1
       AC_SUBST(HAVE_PHONON)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to