@@ -1,4 +1,24 @@

 -------------------------------------------------------------------

+Mon Mar 14 11:58:45 UTC 2016 - avvissu@yandex.ru

+

+- Update to 0.2.2:

+  * see: /usr/share/doc/packages/curlew/ChangeLog

+- Update patches:

+  * curlew-0.2.1_path.patch -> curlew-0.2.2_path.patch

+

+-------------------------------------------------------------------

+Sun Feb 28 04:04:00 UTC 2016 - avvissu@yandex.ru

+

+- Set mplayer as the default player

+

+-------------------------------------------------------------------

+Sat Feb 27 16:34:14 UTC 2016 - avvissu@yandex.ru

+

+- Update to 0.2.1:

+  * see: /usr/share/doc/packages/curlew/ChangeLog

+- Add a language pack

+

+-------------------------------------------------------------------

 Fri Apr 10 21:09:24 UTC 2015 - avvissu@yandex.ru

 - Initial package

​

@@ -1,7 +1,7 @@

 #

 # spec file for package curlew

 #

-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.

+# Copyright (c) 2016 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,27 +17,28 @@

 Name:           curlew

-Version:        0.1.22.3

+Version:        0.2.2

 Release:        0

 Summary:        Multimedia converter

 License:        Waqf

 Group:          Productivity/Multimedia/Video/Convertors

 Url:            http://sourceforge.net/projects/curlew/

-Source0:        http://sourceforge.net/projects/curlew/files/curlew-0.1.22.3/%{name}-%{version}.tar.gz

-# PATCH-FIX-OPENSUSE desktop.patch avvissu@yandex.ru -- Generic name of the application

-Patch0:         curlew-0.1.22.3_desktop.patch

-BuildRequires:  ImageMagick

-BuildRequires:  desktop-file-utils

+Source0:        http://sourceforge.net/projects/curlew/files/curlew-%{version}/%{name}-%{version}.tar.gz

+# PATCH-FIX-OPENSUSE sitelib.patch avvissu@yandex.ru -- Change path to files (use site-packages)

+Patch0:         curlew-0.2.2_sitelib.patch

 BuildRequires:  hicolor-icon-theme

 BuildRequires:  intltool

-BuildRequires:  python-devel

-BuildRequires:  python-distutils-extra

-BuildRequires:  python-gobject >= 3.0

-BuildRequires:  python-setuptools

+BuildRequires:  python3-base >= 3.3.2

+BuildRequires:  python3-gobject >= 3.12.0

+BuildRequires:  python3-setuptools

+BuildRequires:  rsvg-view

+BuildRequires:  update-desktop-files

+Requires:       dbus-1-python3

 Requires:       ffmpeg

 Requires:       mediainfo

 Requires:       mencoder

-Requires:       python-gobject

+Requires:       python3-gobject

+Requires:       typelib(Gtk) = 3.0

 Requires:       xdg-utils

 # Conflict with ffmpeg

 #Requires:       libav-tools

@@ -61,47 +62,48 @@

   - Combine subtitle with video file.

   - Show error details if exist.

   - And more ...

+  

+%lang_package

 %prep

 %setup -q

 %patch0 -p1

+# Set mplayer as the default player

+sed -i '/self.player/s/avplay/mplayer/' $(grep -rl 'avplay')

+

 # Fix spurious-executable-perm

 find . -type f -perm /u+x -exec chmod 644 {} \; || :

 %build

-python setup.py build

+python3 setup.py build

 %install

-python setup.py install --root=%{buildroot}

+python3 setup.py install --root=%{buildroot}

+

+%suse_update_desktop_file -r %{name} AudioVideo Video AudioVideoEditing

 %find_lang %{name}

 %post

 %icon_theme_cache_post

 %desktop_database_post

-# Notify user about changes

-if [ $1 -ge 2 ] ; then

-mkdir -p %{_localstatedir}/adm/update-messages

-cat > %{_localstatedir}/adm/update-messages/%{name}-%{version} << EOF

-INFO: ValueError: unsupported pickle protocol: 3

-INFO: If you are switching between python versions, you will need to 

-INFO: remove the old profile from ~/.%{name}

-EOF

-fi

 %postun

 %icon_theme_cache_postun

 %desktop_database_postun

-%files -f %{name}.lang

-%defattr(-,root,root,-)

-%doc %{_datadir}/doc/curlew

+%files

+%doc LICENSE* AUTHORS ChangeLog README

 %{_bindir}/%{name}

+%{_datadir}/%{name}/

 %{_datadir}/applications/%{name}.desktop

 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg

 %{_datadir}/icons/hicolor/*/apps/%{name}.png

-%{python_sitelib}/Curlew

-%{python_sitelib}/%{name}-*

+%{python3_sitelib}/%{name}-*.egg-info

+%{python3_sitelib}/%{name}/

+

+%files lang -f %{name}.lang

+%defattr(-,root,root,-)

 %changelog

​

@@ -1,16 +0,0 @@

-diff -U 3 -H -d -r -N -- curlew-0.1.22.3.orig/curlew.desktop curlew-0.1.22.3/curlew.desktop

---- curlew-0.1.22.3.orig/curlew.desktop    2013-10-08 11:52:26.000000000 +0300

-+++ curlew-0.1.22.3/curlew.desktop 2015-04-11 01:14:51.039378764 +0300

-@@ -12,7 +12,11 @@

- Comment=Easy to use Multimedia Converter for Linux

- Comment[ar]=محول وسائط على لينكس سهل الاستخدام

- Comment[fr]=Un Convertisseur Multimédia simple à utiliser sous Linux

--Categories=AudioVideo;Video;

-+GenericName=Multimedia Converter

-+GenericName[ru]=Мультимедиа конвертер

-+GenericName[ar]=تحويل الوسائط المتعددة

-+GenericName[fr]=Convertisseur multimédia

-+Categories=AudioVideo;Video;AudioVideoEditing;

- #MimeType=audio/vorbis;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;video/x-ms-asf;audio/ogg;audio/3gpp;audio/AMR;audio/AMR-WB;video/3gpp;video/flv;video/mpeg;video/msvideo;video/x-mpeg;video/x-ms-asf;video/x-ms-wmv;video/quicktime;audio/x-realaudio;audio/x-pn-realaudio;video/vnd.rn-realvideo;audio/mp4a-latm;video/x-m4v;video/mp4;audio/x-matroska;video/x-matroska;audio/x-aiff;audio/x-monkeys-audio;video/x-m4v;audio/mp4a-latm;video/webm

- Encoding=UTF-8

- Terminal=false

​

@@ -0,0 +1,160 @@

+diff -U 3 -dHrN curlew-0.2.2.orig/curlew curlew-0.2.2/curlew

+--- curlew-0.2.2.orig/curlew   2016-03-07 13:52:48.000000000 +0300

++++ curlew-0.2.2/curlew    2016-03-14 15:02:59.504346113 +0300

+@@ -1,9 +1,5 @@

+ #!/usr/bin/env python3

+ 

+-from site import addsitedir

+-addsitedir('/usr/share/curlew')

+-addsitedir('/usr/local/share/curlew')

+-

+ import sys

+-from modules.curlew import main

++from curlew.curlew import main

+ main(*sys.argv[1:])

+diff -U 3 -dHrN curlew-0.2.2.orig/modules/codecs.py curlew-0.2.2/modules/codecs.py

+--- curlew-0.2.2.orig/modules/codecs.py    2016-03-10 16:19:55.000000000 +0300

++++ curlew-0.2.2/modules/codecs.py 2016-03-14 15:04:47.898214293 +0300

+@@ -21,7 +21,7 @@

+ gi.require_version('Gtk', '3.0')

+ 

+ from gi.repository import Gtk, Pango

+-from modules.functions import get_available_codecs

++from curlew.functions import get_available_codecs

+ 

+ class CodecsDialog(Gtk.Dialog):

+     def __init__(self, prnt, encoder, title, headerbar):

+diff -U 3 -dHrN curlew-0.2.2.orig/modules/configs.py curlew-0.2.2/modules/configs.py

+--- curlew-0.2.2.orig/modules/configs.py   2016-03-08 19:41:33.000000000 +0300

++++ curlew-0.2.2/modules/configs.py    2016-03-14 15:08:07.496466859 +0300

+@@ -19,7 +19,7 @@

+ 

+ 

+ from gi.repository import GLib

+-from modules.consts import CONF_FILE

++from curlew.consts import CONF_FILE

+ 

+ GROUP = 'configs'

+ 

+diff -U 3 -dHrN curlew-0.2.2.orig/modules/consts.py curlew-0.2.2/modules/consts.py

+--- curlew-0.2.2.orig/modules/consts.py    2016-03-07 13:52:48.000000000 +0300

++++ curlew-0.2.2/modules/consts.py 2016-03-14 15:05:41.710010707 +0300

+@@ -26,7 +26,7 @@

+ CONF_FILE = join(CONF_PATH, 'curlew.cfg')

+ 

+ PKG_DIR = dirname(realpath(__file__))

+-DTA_DIR = join(PKG_DIR, '../')

++DTA_DIR = join(PKG_DIR, '../../../../share/curlew')

+ 

+ ORG_FFILE = join(DTA_DIR, 'formats.cfg')

+ USR_FFILE = join(CONF_PATH, 'formats.cfg')

+diff -U 3 -dHrN curlew-0.2.2.orig/modules/curlew.py curlew-0.2.2/modules/curlew.py

+--- curlew-0.2.2.orig/modules/curlew.py    2016-03-12 00:37:11.000000000 +0300

++++ curlew-0.2.2/modules/curlew.py 2016-03-14 15:08:07.536464240 +0300

+@@ -38,23 +38,23 @@

+     from gi.repository import Gtk, GLib, Gdk, GObject, GdkPixbuf, Gio

+     import dbus.glib, dbus.service

+     

+-    from modules.customwidgets import LabeledHBox, TimeLayout, HScale, \

++    from curlew.customwidgets import LabeledHBox, TimeLayout, HScale, \

+     SpinsFrame, LabeledGrid, ComboWithEntry, ButtonWithIcon

+-    from modules.about import About

+-    from modules.functions import show_message, get_format_size, \

++    from curlew.about import About

++    from curlew.functions import show_message, get_format_size, \

+     duration_to_time, time_to_duration, check_codec

+-    from modules.logdialog import LogDialog

+-    from modules.tray import StatusIcon

+-    from modules.languages import LANGUAGES

+-    from modules.favdialog import Favorite

+-    from modules.waitdialog import WaitDialog

+-    from modules.fileinfos import FileInfos

+-    from modules.formats import Formats

+-    from modules.infobars import InfoBar

+-    from modules.codecs import CodecsDialog

+-    from modules.consts import CONF_PATH, HOME, CONF_FILE, DTA_DIR, \

++    from curlew.logdialog import LogDialog

++    from curlew.tray import StatusIcon

++    from curlew.languages import LANGUAGES

++    from curlew.favdialog import Favorite

++    from curlew.waitdialog import WaitDialog

++    from curlew.fileinfos import FileInfos

++    from curlew.formats import Formats

++    from curlew.infobars import InfoBar

++    from curlew.codecs import CodecsDialog

++    from curlew.consts import CONF_PATH, HOME, CONF_FILE, DTA_DIR, \

+     ORG_FFILE, USR_FFILE

+-    from modules.configs import get_b_config

++    from curlew.configs import get_b_config

+ except Exception as e:

+     print(e)

+     sys.exit(1)

+@@ -72,7 +72,7 @@

+ 

+ # Localization.

+ DOMAIN = 'curlew'

+-LOCALDIR = join(DTA_DIR, 'locale')

++LOCALDIR = join(DTA_DIR, '../locale')

+ gettext.install(DOMAIN, LOCALDIR)

+ 

+ # Create ".curlew" folder if not exist

+diff -U 3 -dHrN curlew-0.2.2.orig/modules/edition.py curlew-0.2.2/modules/edition.py

+--- curlew-0.2.2.orig/modules/edition.py   2016-03-11 19:29:53.000000000 +0300

++++ curlew-0.2.2/modules/edition.py    2016-03-14 15:08:07.492467120 +0300

+@@ -24,9 +24,9 @@

+ 

+ from gi.repository import Gtk, GLib

+ 

+-from modules.customwidgets import LabeledGrid, ButtonWithIcon

+-from modules.consts import CONF_FILE, ORG_FFILE

+-from modules.functions import show_message

++from curlew.customwidgets import LabeledGrid, ButtonWithIcon

++from curlew.consts import CONF_FILE, ORG_FFILE

++from curlew.functions import show_message

+ 

+ 

+ class FormatEditor(Gtk.Dialog):

+diff -U 3 -dHrN curlew-0.2.2.orig/modules/formats.py curlew-0.2.2/modules/formats.py

+--- curlew-0.2.2.orig/modules/formats.py   2016-03-12 00:41:14.000000000 +0300

++++ curlew-0.2.2/modules/formats.py    2016-03-14 15:08:07.488467381 +0300

+@@ -21,8 +21,8 @@

+ gi.require_version('Gtk', '3.0')

+ 

+ from gi.repository import Gtk

+-from modules.edition import FormatEditor

+-from modules.customwidgets import ButtonWithIcon

++from curlew.edition import FormatEditor

++from curlew.customwidgets import ButtonWithIcon

+ 

+ class Formats(Gtk.Popover):

+     

+diff -U 3 -dHrN curlew-0.2.2.orig/setup.py curlew-0.2.2/setup.py

+--- curlew-0.2.2.orig/setup.py 2016-03-14 12:39:44.000000000 +0300

++++ curlew-0.2.2/setup.py  2016-03-14 15:11:55.448256414 +0300

+@@ -17,8 +17,6 @@

+ doc_files  = ['LICENSE-ar.txt', 'LICENSE-en.txt', 'AUTHORS', 'THANKS', 'ChangeLog', 'README']

+ data_files = [('share/applications/', ['curlew.desktop']),

+               ('share/icons/hicolor/scalable/apps', ['curlew.svg']),

+-              ('share/pixmaps', ['curlew.svg']),

+-              ('share/doc/curlew', doc_files),

+               ('share/curlew', ['formats.cfg']),

+               #('share/curlew', ['formats.cfg', 'ffmpeg']), # Portable version

+               ('share/curlew/modules', glob("modules/*.py"))

+@@ -58,7 +56,7 @@

+         # Generate mo files

+         call("msgfmt {} -o {}".format(po_file, mo_path), shell=True)

+     

+-    locales = map(lambda i: ('share/curlew/'+i, [i+'/curlew.mo', ]), glob('locale/*/LC_MESSAGES'))

++    locales = map(lambda i: ('share/'+i, [i+'/curlew.mo', ]), glob('locale/*/LC_MESSAGES'))

+     data_files.extend(locales)

+     

+     return 0

+@@ -168,5 +166,7 @@

+                      'Topic :: Desktop Environment :: Gnome',

+                      'Topic :: Multimedia :: Sound/Audio :: Conversion',

+                      'Topic :: Utilities'],

+-      data_files=data_files

++      data_files=data_files,

++      packages=['curlew'],

++      package_dir={"curlew" : "modules"}

+       )

​