Author: magnu5 Update of /cvs/free/rpms/minitube/F-16 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20821 Modified Files: minitube.spec sources Added Files: minitube-1.8-1-disable-update-check.patch Log Message: * Fri Aug 24 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com&gt; - 1.8.0-1 - 1.8.0 - clean spec file - disable-update-patch borrowed from debian minitube-1.8-1-disable-update-check.patch: MainWindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE minitube-1.8-1-disable-update-check.patch --- diff -up src/MainWindow.cpp.orig src/MainWindow.cpp --- src/MainWindow.cpp.orig 2012-08-24 09:32:11.454026355 +0300 +++ src/MainWindow.cpp 2012-08-24 09:32:24.429901026 +0300 @@ -124,7 +124,7 @@ MainWindow::MainWindow() : setAcceptDrops(true); - QTimer::singleShot(0, this, SLOT(checkForUpdate())); + //QTimer::singleShot(0, this, SLOT(checkForUpdate())); } Index: minitube.spec =================================================================== RCS file: /cvs/free/rpms/minitube/F-16/minitube.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- minitube.spec 6 Jan 2012 20:04:30 -0000 1.14 +++ minitube.spec 24 Aug 2012 06:55:07 -0000 1.15 @@ -1,5 +1,5 @@ Name: minitube -Version: 1.7 +Version: 1.8.0 Release: 1%{?dist} Summary: A YouTube desktop client Group: Applications/Multimedia @@ -34,10 +34,7 @@ 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}} +Patch1: minitube-1.8-1-disable-update-check.patch BuildRequires: qt4-devel BuildRequires: desktop-file-utils @@ -45,15 +42,9 @@ BuildRequires: qtsingleapplication-devel BuildRequires: gettext Requires: hicolor-icon-theme - -# KDE 4.6.1 in fedora 15 defaults to phonon-backend-gstreamer -# add gstreamer-ffmpeg as Required. -%if 0%{?fedora} && 0%{?fedora} > 14 Requires: gstreamer-ffmpeg -%else -Requires: xine-lib-extras-freeworld -%endif +%{?_qt4_version:Requires: qt4 >= %{_qt4_version}} %description Minitube is a YouTube desktop client. With it you can watch YouTube videos in a new way: @@ -64,27 +55,11 @@ %prep %setup -q -n %{name} -# Fix spurious-executable-perm -chmod -x src/*{h,cpp} - # 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 @@ -100,17 +75,15 @@ --delete-original \ %{buildroot}%{_datadir}/applications/%{name}.desktop -# There is a bug in find-lang.sh (see BZ #729336) -# heavily borrowed from /usr/lib/rpm/find-lang.sh -find %{buildroot} -type f -o -type l|sort|sed ' -s:'"%{buildroot}"':: -s:\(.*/locale/\)\([^/_]\+\)\(.*\.qm$\):%lang(\2) \1\2\3: -s:^\([^%].*\):: +# %%find_lang +# There is a bug in find-lang.sh (see BZ #729336) +# heavily borrowed from /usr/lib/rpm/find-lang.sh +find %{buildroot} -type f -o -type l|sort|sed ' +s:'"%{buildroot}"':: +s:\(.*/locale/\)\([^/_]\+\)\(.*\.qm$\):%lang(\2) \1\2\3: +s:^\([^%].*\):: /^$/d' > %{name}.lang -%clean -rm -rf %{buildroot} - %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -124,14 +97,29 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING LICENSE.LGPL CHANGES TODO INSTALL +%doc AUTHORS COPYING LICENSE.LGPL CHANGES TODO %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%dir %{_datadir}/%{name}/ +%dir %{_datadir}/%{name}/locale %changelog +* Fri Aug 24 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com&gt; - 1.8.0-1 +- 1.8.0 +- clean spec file +- disable-update-patch borrowed from debian + +* Fri Apr 12 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com&gt; - 1.7.1-1 +- 1.7.1 +- removed INSTALL +- own dir +- removed legacy stuff from spec + +* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.7-2 +- Rebuilt for c++ ABI breakage + * Fri Jan 06 2012 Magnus Tuominen <magnus.tuominen(a)gmail.com&gt; - 1.7-1 - 1.7 - new translation patch Index: sources =================================================================== RCS file: /cvs/free/rpms/minitube/F-16/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 6 Jan 2012 20:04:30 -0000 1.11 +++ sources 24 Aug 2012 06:55:07 -0000 1.12 @@ -1 +1 @@ -9a657616eaa32311296d41eb99717ec2 minitube.tar.gz +dabfe4776ab6a19eff14e644f68714bb minitube.tar.gz