rpms/minitube/F-16 minitube-1.7-translation.patch, NONE, 1.1 minitube-1.7-updateCheckRemoval.patch, NONE, 1.1 minitube.spec, 1.13, 1.14 sources, 1.10, 1.11

[Magnus Tuominen]

Author: magnu5

Update of /cvs/free/rpms/minitube/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31170

Modified Files:
	minitube.spec sources 
Added Files:
	minitube-1.7-translation.patch 
	minitube-1.7-updateCheckRemoval.patch 
Log Message:
* Fri Jan 06 2012 Magnus Tuominen <magnus.tuominen at gmail.com> - 1.7-1
- 1.7
- new translation patch
- remove updatechecking bits


minitube-1.7-translation.patch:
 locale.pri |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE minitube-1.7-translation.patch ---
diff -up locale/locale.pri.orig locale/locale.pri
--- locale/locale.pri.orig	2012-01-06 09:44:16.966957462 +0200
+++ locale/locale.pri	2012-01-06 10:33:17.215239541 +0200
@@ -4,7 +4,7 @@ INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 
 # ls -1 *.ts | tr '\n' ' '
-TRANSLATIONS += ca.ts ca_ES.ts da.ts de_DE.ts el.ts en_US.ts es.ts es_AR.ts es_ES.ts fi_FI.ts fr.ts gl.ts he_IL.ts hr.ts hu.ts ia.ts id.ts id_ID.ts it.ts jv.ts ka_GE.ts nb.ts nl.ts pl.ts pl_PL.ts pt.ts pt_BR.ts ro.ts ru.ts sl.ts sq.ts sr.ts sv_SE.ts te.ts tr.ts uk_UA.ts zh_CN.ts 
+TRANSLATIONS += ca.ts ca.ts da.ts de.ts el.ts en.ts es.ts fi.ts fr.ts gl.ts he.ts hr.ts hu.ts ia.ts id.ts it.ts jv.ts ka.ts nb.ts nl.ts pl.ts pt.ts ro.ts ru.ts sl.ts sq.ts sr.ts sv.ts te.ts tr.ts uk.ts zh_CN.ts
 isEmpty(QMAKE_LRELEASE) {
     win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
     else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease

minitube-1.7-updateCheckRemoval.patch:
 MainWindow.cpp |   31 +++----------------------------
 MainWindow.h   |    6 +++---
 2 files changed, 6 insertions(+), 31 deletions(-)

--- NEW FILE minitube-1.7-updateCheckRemoval.patch ---
diff -up src/MainWindow.cpp.orig src/MainWindow.cpp
--- src/MainWindow.cpp.orig	2012-01-05 13:53:47.000000000 +0200
+++ src/MainWindow.cpp	2012-01-06 21:05:19.164971931 +0200
@@ -20,7 +20,7 @@
 #endif
 #include "downloadmanager.h"
 #include "youtubesuggest.h"
-#include "updatechecker.h"
+
 #ifdef APP_DEMO
 #include "demostartupview.h"
 #endif
@@ -43,9 +43,9 @@ MainWindow::MainWindow() :
         downloadView(0),
         mediaObject(0),
         audioOutput(0),
-        m_fullscreen(false),
-        updateChecker(0) {
+        m_fullscreen(false)
 
+{
     singleton = this;
 
     // views mechanism
@@ -1252,32 +1252,7 @@ void MainWindow::dropEvent(QDropEvent *e
     }
 }
 
-void MainWindow::checkForUpdate() {
-    static const QString updateCheckKey = "updateCheck";
-
-    // check every 24h
-    QSettings settings;
-    uint unixTime = QDateTime::currentDateTime().toTime_t();
-    int lastCheck = settings.value(updateCheckKey).toInt();
-    int secondsSinceLastCheck = unixTime - lastCheck;
-    // qDebug() << "secondsSinceLastCheck" << unixTime << lastCheck << secondsSinceLastCheck;
-    if (secondsSinceLastCheck < 86400) return;
-
-    // check it out
-    if (updateChecker) delete updateChecker;
-    updateChecker = new UpdateChecker();
-    connect(updateChecker, SIGNAL(newVersion(QString)),
-            this, SLOT(gotNewVersion(QString)));
-    updateChecker->checkForUpdate();
-    settings.setValue(updateCheckKey, unixTime);
-
-}
-
 void MainWindow::gotNewVersion(QString version) {
-    if (updateChecker) {
-        delete updateChecker;
-        updateChecker = 0;
-    }
 
 #if defined(APP_DEMO) || defined(APP_MAC_STORE)
     return;
diff -up src/MainWindow.h.orig src/MainWindow.h
--- src/MainWindow.h.orig	2012-01-05 13:53:47.000000000 +0200
+++ src/MainWindow.h	2012-01-06 20:59:43.832461064 +0200
@@ -13,7 +13,7 @@
 #include "downloadview.h"
 
 class SearchLineEdit;
-class UpdateChecker;
+
 
 class MainWindow : public QMainWindow {
 
@@ -40,7 +40,7 @@ protected:
     void resizeEvent(QResizeEvent *);
 
 private slots:
-    void checkForUpdate();
+
     void gotNewVersion(QString version);
     void goBack();
     void showSearch();
@@ -91,7 +91,7 @@ private:
     static QString formatTime(qint64 time);
     bool confirmQuit();
 
-    UpdateChecker *updateChecker;
+
 
     // view mechanism
     QStackedWidget *views;


Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-16/minitube.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- minitube.spec	27 Nov 2011 19:35:56 -0000	1.13
+++ minitube.spec	6 Jan 2012 20:04:30 -0000	1.14
@@ -1,9 +1,9 @@
 Name:           minitube
-Version:        1.6
-Release:        3%{?dist}
+Version:        1.7
+Release:        1%{?dist}
 Summary:        A YouTube desktop client
-
 Group:          Applications/Multimedia
+
 # License info:
 #
 # LGPLv2.1 with exceptions or GPLv3:
@@ -34,8 +34,9 @@
 Source0:        http://flavio.tordini.org/files/%{name}/%{name}.tar.gz
 # fixes requirement on bundled qtsingleapplication
 Patch0:         minitube-qtsingleapp.patch
+Patch1:         minitube-1.7-translation.patch
+Patch2:         minitube-1.7-updateCheckRemoval.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 %{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
 
 BuildRequires:  qt4-devel
@@ -68,16 +69,28 @@
 
 # remove bundled copy of qtsingleapplication
 rm -rf src/qtsingleapplication
-
+# rename badly named translation files
+mv locale/sv_SE.ts locale/sv.ts
+mv locale/en_US.ts locale/en.ts
+mv locale/de_DE.ts locale/de.ts
+mv locale/fi_FI.ts locale/fi.ts
+mv locale/he_IL.ts locale/he.ts
+mv locale/ka_GE.ts locale/ka.ts
+mv locale/uk_UA.ts locale/uk.ts
+mv locale/zh_CN.ts locale/zh-temp.ts
+# we want that one^..
+# removing the rest
+rm -rf locale/*_*.ts
+mv locale/zh-temp.ts locale/zh_CN.ts
 %patch0 -p 1
+%patch1 -p 0
+%patch2 -p 0
 
 %build
 
 %{_qt4_qmake} PREFIX=%{_prefix}
 make %{?_smp_mflags}
 
-
-
 %install
 rm -rf %{buildroot}
 make install INSTALL_ROOT=%{buildroot}
@@ -118,8 +131,15 @@
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
-
 %changelog
+* Fri Jan 06 2012 Magnus Tuominen <magnus.tuominen at gmail.com> - 1.7-1
+- 1.7
+- new translation patch
+- remove updatechecking bits
+
+* Sat Dec 17 2011 Magnus Tuominen <magnus.tuominen at gmail.com> - 1.6-4
+- more translation fixes
+
 * Sun Nov 27 2011 Magnus Tuominen <magnus.tuominen at gmail.com> - 1.6-3
 - clean spec file
 - make translations work


Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-16/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	29 Oct 2011 15:48:36 -0000	1.10
+++ sources	6 Jan 2012 20:04:30 -0000	1.11
@@ -1 +1 @@
-dae6a1e4d17c778d87f8683bb1774d61  minitube.tar.gz
+9a657616eaa32311296d41eb99717ec2  minitube.tar.gz