rpms/openafs-kmod/F-15 openafs-kmod.spec,1.25,1.26
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5772
Modified Files:
openafs-kmod.spec
Log Message:
* Fri Jan 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
- Update to OpenAFS 1.6.1 pre-release 1
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-15/openafs-kmod.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- openafs-kmod.spec 4 Jan 2012 12:03:52 -0000 1.25
+++ openafs-kmod.spec 6 Jan 2012 23:47:46 -0000 1.26
@@ -1,7 +1,7 @@
# (un)define the next line to either build for the newest or all current kernels
-%define buildforkernels newest
-%define buildforkernels newest
-%define buildforkernels newest
+#define buildforkernels newest
+%define buildforkernels current
+#define buildforkernels akmod
# Define the OpenAFS sysname
%ifarch %{ix86}
@@ -19,18 +19,20 @@
%define kmod_name openafs
+%define pre pre1
+
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.6.0
-Release: 2%{?dist}.6
+Version: 1.6.1
+Release: 0.%{pre}%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
License: IBM
URL: http://www.openafs.org
-Source0: http://www.openafs.org/dl/openafs/%{version}/%{kmod_name}-%{version}-src....
+Source0: http://www.openafs.org/dl/openafs/%{version}/%{kmod_name}-%{version}%{pre...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%global AkmodsBuildRequires %{_bindir}/kmodtool, pam-devel, ncurses-devel, flex, byacc, bison, automake
@@ -62,7 +64,7 @@
#popd
for kernel_version in %{?kernel_versions} ; do
- cp -a %{kmod_name}-%{version} _kmod_build_${kernel_version%%___*}
+ cp -a %{kmod_name}-%{version}%{pre} _kmod_build_${kernel_version%%___*}
done
@@ -96,6 +98,9 @@
%changelog
+* Fri Jan 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
+- Update to OpenAFS 1.6.1 pre-release 1
+
* Wed Jan 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.0-2.6
- rebuild for updated kernel
12 years, 9 months
rpms/openafs/devel openafs.spec,1.13,1.14
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4974/devel
Modified Files:
openafs.spec
Log Message:
update changelog date
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openafs.spec 2 Jan 2012 21:47:06 -0000 1.13
+++ openafs.spec 6 Jan 2012 23:40:41 -0000 1.14
@@ -321,7 +321,7 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
-* Fri Dec 30 2011 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
+* Fri Jan 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
- Update to OpenAFS 1.6.1 pre-release 1
* Fri Sep 02 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.0-1
12 years, 9 months
rpms/openafs/F-16 .cvsignore, 1.3, 1.4 openafs.spec, 1.10, 1.11 sources, 1.6, 1.7
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv445
Modified Files:
.cvsignore openafs.spec sources
Log Message:
* Fri Jan 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
- Update to OpenAFS 1.6.1 pre-release 1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs/F-16/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 6 Sep 2011 18:25:09 -0000 1.3
+++ .cvsignore 6 Jan 2012 23:26:54 -0000 1.4
@@ -1,2 +1,2 @@
-openafs-1.6.0-doc.tar.bz2
-openafs-1.6.0-src.tar.bz2
+openafs-1.6.1pre1-src.tar.bz2
+openafs-1.6.1pre1-doc.tar.bz2
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-16/openafs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openafs.spec 6 Sep 2011 18:25:09 -0000 1.10
+++ openafs.spec 6 Jan 2012 23:26:54 -0000 1.11
@@ -10,15 +10,17 @@
%define sysname amd64_linux26
%endif
+%define pre pre1
+
Summary: Enterprise Network File System
Name: openafs
-Version: 1.6.0
-Release: 1%{?dist}
+Version: 1.6.1
+Release: 0.%{pre}%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
-Source0: http://www.openafs.org/dl/openafs/%{version}/%{name}-%{version}-src.tar.bz2
-Source1: http://www.openafs.org/dl/openafs/%{version}/openafs-%{version}-doc.tar.bz2
+Source0: http://www.openafs.org/dl/openafs/%{version}/%{name}-%{version}%{pre}-src...
+Source1: http://www.openafs.org/dl/openafs/%{version}/openafs-%{version}%{pre}-doc...
Source11: CellServDB
Source12: cacheinfo
Source13: openafs.init
@@ -90,7 +92,7 @@
Cell.
%prep
-%setup -q -b 1 -n openafs-%{version}
+%setup -q -b 1 -n openafs-%{version}%{pre}
# This changes osconf.m4 to build with -fPIC on i386 and x86_64
%patch0
@@ -268,6 +270,7 @@
%config(noreplace) %{_sysconfdir}/openafs/CellServDB
%config(noreplace) %{_sysconfdir}/openafs/ThisCell
%config(noreplace) %{_sysconfdir}/openafs/cacheinfo
+%{_bindir}/afsio
%{_bindir}/cmdebug
%{_bindir}/xstat_cm_test
%{_sbindir}/afsd
@@ -318,6 +321,9 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Fri Jan 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
+- Update to OpenAFS 1.6.1 pre-release 1
+
* Fri Sep 02 2011 Jack Neely <jjneely(a)ncsu.edu> 0:1.6.0-1
- Update to OpenAFS 1.6.0 final
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-16/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 6 Sep 2011 18:25:09 -0000 1.6
+++ sources 6 Jan 2012 23:26:55 -0000 1.7
@@ -1,2 +1,2 @@
-41180f1adacd926dc6c8c94e947dfb60 openafs-1.6.0-doc.tar.bz2
-ad53439fb0fbebcbcffc046835e40d54 openafs-1.6.0-src.tar.bz2
+99a79608d68a7f087a1357d2f3ad2b01 openafs-1.6.1pre1-src.tar.bz2
+be0f3db9d12603684126c56a3aa4c613 openafs-1.6.1pre1-doc.tar.bz2
12 years, 9 months
rpms/openafs-kmod/F-16 openafs-kmod.spec,1.18,1.19
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31047
Modified Files:
openafs-kmod.spec
Log Message:
correct changelog date
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-16/openafs-kmod.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- openafs-kmod.spec 6 Jan 2012 23:13:49 -0000 1.18
+++ openafs-kmod.spec 6 Jan 2012 23:14:47 -0000 1.19
@@ -98,7 +98,7 @@
%changelog
-* Fri Jan 06 2011 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
+* Fri Jan 06 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
- Update to OpenAFS 1.6.1 pre-release 1
* Wed Jan 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.0-2.13
12 years, 9 months
rpms/openafs-kmod/F-16 .cvsignore, 1.3, 1.4 openafs-kmod.spec, 1.17, 1.18 sources, 1.5, 1.6
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30810
Modified Files:
.cvsignore openafs-kmod.spec sources
Log Message:
* Fri Dec 30 2011 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
- Update to OpenAFS 1.6.1 pre-release 1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-16/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 7 Sep 2011 19:42:13 -0000 1.3
+++ .cvsignore 6 Jan 2012 23:13:49 -0000 1.4
@@ -1 +1 @@
-openafs-1.6.0-src.tar.bz2
+openafs-1.6.1pre1-src.tar.bz2
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-16/openafs-kmod.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openafs-kmod.spec 4 Jan 2012 12:14:27 -0000 1.17
+++ openafs-kmod.spec 6 Jan 2012 23:13:49 -0000 1.18
@@ -1,5 +1,7 @@
# (un)define the next line to either build for the newest or all current kernels
-%define buildforkernels newest
+#define buildforkernels newest
+%define buildforkernels current
+#define buildforkernels akmod
# Define the OpenAFS sysname
%ifarch %{ix86}
@@ -17,18 +19,20 @@
%define kmod_name openafs
+%define pre pre1
+
# name should have a -kmod suffix
Name: %{kmod_name}-kmod
-Version: 1.6.0
-Release: 2%{?dist}.13
+Version: 1.6.1
+Release: 0.%{pre}%{?dist}
Summary: Kernel module(s)
Group: System Environment/Kernel
License: IBM
URL: http://www.openafs.org
-Source0: http://www.openafs.org/dl/openafs/%{version}/%{kmod_name}-%{version}-src....
+Source0: http://www.openafs.org/dl/openafs/%{version}/%{kmod_name}-%{version}%{pre...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%global AkmodsBuildRequires %{_bindir}/kmodtool, pam-devel, ncurses-devel, flex, byacc, bison, automake
@@ -60,7 +64,7 @@
#popd
for kernel_version in %{?kernel_versions} ; do
- cp -a %{kmod_name}-%{version} _kmod_build_${kernel_version%%___*}
+ cp -a %{kmod_name}-%{version}%{pre} _kmod_build_${kernel_version%%___*}
done
@@ -94,6 +98,9 @@
%changelog
+* Fri Jan 06 2011 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-0.pre1
+- Update to OpenAFS 1.6.1 pre-release 1
+
* Wed Jan 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.0-2.13
- rebuild for updated kernel
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-16/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 7 Sep 2011 19:42:13 -0000 1.5
+++ sources 6 Jan 2012 23:13:49 -0000 1.6
@@ -1 +1 @@
-ad53439fb0fbebcbcffc046835e40d54 openafs-1.6.0-src.tar.bz2
+99a79608d68a7f087a1357d2f3ad2b01 openafs-1.6.1pre1-src.tar.bz2
12 years, 9 months
rpms/openafs-kmod/devel openafs-kmod.spec,1.13,1.14
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20707
Modified Files:
openafs-kmod.spec
Log Message:
set rawhide to build akmods only
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/devel/openafs-kmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openafs-kmod.spec 2 Jan 2012 15:24:41 -0000 1.13
+++ openafs-kmod.spec 6 Jan 2012 22:10:41 -0000 1.14
@@ -1,5 +1,7 @@
# (un)define the next line to either build for the newest or all current kernels
-%define buildforkernels current
+#define buildforkernels newest
+#define buildforkernels current
+%define buildforkernels akmod
# Define the OpenAFS sysname
%ifarch %{ix86}
12 years, 9 months
rpms/minitube/F-15 minitube-1.7-translation.patch, NONE, 1.1 minitube-1.7-updateCheckRemoval.patch, NONE, 1.1 minitube.spec, 1.14, 1.15 sources, 1.10, 1.11
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31785
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(a)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-15/minitube.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- minitube.spec 27 Nov 2011 19:37:45 -0000 1.14
+++ minitube.spec 6 Jan 2012 20:06:18 -0000 1.15
@@ -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(a)gmail.com> - 1.7-1
+- 1.7
+- new translation patch
+- remove updatechecking bits
+
+* Sat Dec 17 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-4
+- more translation fixes
+
* Sun Nov 27 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-3
- clean spec file
- make translations work
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/F-15/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 29 Oct 2011 15:50:53 -0000 1.10
+++ sources 6 Jan 2012 20:06:18 -0000 1.11
@@ -1 +1 @@
-dae6a1e4d17c778d87f8683bb1774d61 minitube.tar.gz
+9a657616eaa32311296d41eb99717ec2 minitube.tar.gz
12 years, 9 months
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
by 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(a)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(a)gmail.com> - 1.7-1
+- 1.7
+- new translation patch
+- remove updatechecking bits
+
+* Sat Dec 17 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-4
+- more translation fixes
+
* Sun Nov 27 2011 Magnus Tuominen <magnus.tuominen(a)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
12 years, 9 months
rpms/minitube/devel minitube-1.7-translation.patch, NONE, 1.1 minitube-1.7-updateCheckRemoval.patch, NONE, 1.1 minitube.spec, 1.14, 1.15 sources, 1.10, 1.11
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27646
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(a)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/devel/minitube.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- minitube.spec 27 Nov 2011 19:33:34 -0000 1.14
+++ minitube.spec 6 Jan 2012 19:38:30 -0000 1.15
@@ -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(a)gmail.com> - 1.7-1
+- 1.7
+- new translation patch
+- remove updatechecking bits
+
+* Sat Dec 17 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-4
+- more translation fixes
+
* Sun Nov 27 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-3
- clean spec file
- make translations work
Index: sources
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 29 Oct 2011 15:46:35 -0000 1.10
+++ sources 6 Jan 2012 19:38:30 -0000 1.11
@@ -1 +1 @@
-dae6a1e4d17c778d87f8683bb1774d61 minitube.tar.gz
+9a657616eaa32311296d41eb99717ec2 minitube.tar.gz
12 years, 9 months
