Accepting request 288222 from home:XRevan86

OBS-URL: https://build.opensuse.org/request/show/288222
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/minitube?expand=0&rev=16

minitube-2.3.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8442826c570656e58c8b5c811d0bae51b33990be733aab912bf96c4dfba641ac
+size 954674

minitube.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Feb 28 13:32:01 UTC 2015 - sor.alexei@meowr.ru
+
+- Update to 2.3.1:
+  * Ensure JS reloading for new version.
+  * Remove unused code, added js ageGate.
+  * Fix VEVO videos.
+  * Restore wheel scroll setting.
+- Remove qtlocalpeer.patch: fixed upstream.
+- Spec cleanup.
+- Rename disable_update_check.patch to
+  minitube-no-update-check.patch.
+- Rename missing_watchrelatedvideo_icon.patch to
+  minitube-fix-watchrelatedvideo-icon.patch.
+- Add minitube-lang package.
+
 -------------------------------------------------------------------
 Wed Nov  5 09:34:35 UTC 2014 - kieltux@gmail.com
 

minitube.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package minitube
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,64 +17,74 @@
 
 
 Name:           minitube
-Version:        2.3.0
+Version:        2.3.1
 Release:        0
 Summary:        Native Youtube Client
 License:        GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
 Url:            http://flavio.tordini.org/minitube
-# Upstream doesn't provide source tarball with version in its name
-Source0:        http://flavio.tordini.org/files/minitube/%{name}.tar.gz
+Source:         https://gitorious.org/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 # Manpage written by Jakob Haufe <sur5r@sur5r.net> for the Debian project
 Source1:        minitube.1
-Patch0:         qtlocalpeer.patch
-Patch1:         disable_update_check.patch
-Patch2:         missing_watchrelatedvideo_icon.patch
-BuildRequires:  libqt4-devel >= 4.5.0
-BuildRequires:  phonon-devel
+# PATCH-FIX-OPENSUSE minitube-no-update-check.patch sur5r@sur5r.net -- Disable update check.
+Patch0:         %{name}-no-update-check.patch
+# PATCH-FIX-OPENSUSE minitube-fix-watchrelatedvideo-icon.patch kieltux@gmail.com -- Missing toolbar icon (watch related videos).
+Patch1:         %{name}-fix-watchrelatedvideo-icon.patch
+BuildRequires:  fdupes
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  libqt4-linguist
 BuildRequires:  update-desktop-files
-# Requires phonon, because libphonon4 is not enough. Phonon package will pull a phonon-backend-* package.
+BuildRequires:  pkgconfig(QtDBus)
+BuildRequires:  pkgconfig(QtNetwork)
+BuildRequires:  pkgconfig(QtScript)
+BuildRequires:  pkgconfig(QtSql)
+BuildRequires:  pkgconfig(QtXml)
+BuildRequires:  pkgconfig(phonon)
 Requires:       phonon
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Recommends:     %{name}-lang = %{version}
 
 %description
 Minitube is a native YouTube client. With it you can watch YouTube
-videos in a new way: you type a keyword, Minitube gives you an endless
-video stream. Minitube does not require the Flash Player.
+videos in a new way: you type a keyword, Minitube gives you an
+endless video stream.
 
-Minitube is not about cloning the original YouTube web interface, it
-strives to create a new TV-like experience.
+Minitube is not about cloning the original YouTube web interface,
+it strives to create a new TV-like experience.
 
-Author:
--------
-    Flavio Tordini
+%lang_package
 
 %prep
-%setup -q -n minitube
-# Missing unistd.h include in qtlocalpeer.cpp
+%setup -q -n %{name}-%{name}
 %patch0
-# Disable online update check, from home:jetchko:fedora20 > minitube
 %patch1
-# Patch for missing icon (watch related video) in toolbar
-%patch2
 
 %build
-qmake PREFIX=%{_prefix}
+%{_libdir}/qt4/bin/qmake \
+  PREFIX=%{_prefix}            \
+  QMAKE_CFLAGS="%{optflags}"   \
+  QMAKE_CXXFLAGS="%{optflags}"
 make %{?_smp_mflags}
 
 %install
 make INSTALL_ROOT=%{buildroot} install
-install -D -m 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/%{name}.1
-%suse_update_desktop_file -r %{name} Qt AudioVideo Video Player
+install -Dm 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/%{name}.1
+%suse_update_desktop_file -r %{name} AudioVideo Video Player
+%fdupes %{buildroot}%{_datadir}
 
 %files
 %defattr(-,root,root)
 %doc AUTHORS CHANGES COPYING TODO
-%{_mandir}/man1/%{name}.1*
 %{_bindir}/%{name}
+%{_datadir}/%{name}/
+%exclude %{_datadir}/%{name}/locale/
 %{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/*
-%dir %{_datadir}/%{name}
+%dir %{_datadir}/icons/hicolor/*/
+%dir %{_datadir}/icons/hicolor/*/apps/
+%{_datadir}/icons/hicolor/*/apps/%{name}*
+%{_mandir}/man?/%{name}*
+
+%files lang
+%defattr(-,root,root)
 %{_datadir}/%{name}/locale/
 
 %changelog

minitube.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7fb24e295dc3e2f4ce41add1ef71c7b1fef57383578f46af8e271710c86c2247
-size 955192

qtlocalpeer.patch

@@ -1,10 +0,0 @@
---- src/qtsingleapplication/qtlocalpeer.cpp.orig	2014-07-20 11:07:09.000000000 +0200
-+++ src/qtsingleapplication/qtlocalpeer.cpp	2014-08-04 19:59:32.975591970 +0200
-@@ -46,6 +46,7 @@
- 
- 
- #include "qtlocalpeer.h"
-+#include "unistd.h"
- #include <QtCore/QCoreApplication>
- #include <QtCore/QTime>
- #include <QDebug>