@@ -1,4 +1,11 @@

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

+Tue May 23 16:40:23 UTC 2017 - avvissu@yandex.by

+

+- Update to 0.2.4:

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

+- Update patch: curlew-0.2.1_sitelib.patch > curlew-sitelib.patch 

+

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

 Fri Apr 21 21:21:34 UTC 2017 - avvissu@yandex.by

 - Update to 0.2.3:

​

@@ -17,7 +17,7 @@

 Name:           curlew

-Version:        0.2.3

+Version:        0.2.4

 Release:        0

 Summary:        Multimedia converter

 License:        Waqf

@@ -25,7 +25,7 @@

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

 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.3_sitelib.patch

+Patch0:         curlew-sitelib.patch

 BuildRequires:  dbus-1-python3

 BuildRequires:  hicolor-icon-theme

 BuildRequires:  intltool

​

@@ -1,188 +0,0 @@

-diff -ruN curlew-0.2.3.orig/curlew curlew-0.2.3/curlew

---- curlew-0.2.3.orig/curlew   2016-03-04 16:39:47.000000000 +0300

-+++ curlew-0.2.3/curlew    2017-04-22 00:12:17.920666141 +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 -ruN curlew-0.2.3.orig/modules/codecs.py curlew-0.2.3/modules/codecs.py

---- curlew-0.2.3.orig/modules/codecs.py    2017-04-20 11:31:29.000000000 +0300

-+++ curlew-0.2.3/modules/codecs.py 2017-04-22 00:13:35.652887426 +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 -ruN curlew-0.2.3.orig/modules/configs.py curlew-0.2.3/modules/configs.py

---- curlew-0.2.3.orig/modules/configs.py   2017-04-20 11:31:29.000000000 +0300

-+++ curlew-0.2.3/modules/configs.py    2017-04-22 00:13:35.652887426 +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 -ruN curlew-0.2.3.orig/modules/consts.py curlew-0.2.3/modules/consts.py

---- curlew-0.2.3.orig/modules/consts.py    2017-04-20 11:31:29.000000000 +0300

-+++ curlew-0.2.3/modules/consts.py 2017-04-22 00:14:14.996999426 +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')

- 

- SOUND_FILE = join(DTA_DIR, 'done.ogg')

- 

-diff -ruN curlew-0.2.3.orig/modules/curlew.py curlew-0.2.3/modules/curlew.py

---- curlew-0.2.3.orig/modules/curlew.py    2017-04-21 02:26:15.000000000 +0300

-+++ curlew-0.2.3/modules/curlew.py 2017-04-22 00:17:59.627062169 +0300

-@@ -39,24 +39,24 @@

-     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, SOUND_FILE

--    from modules.configs import get_b_config, get_s_config

--    from modules.players import Players

-+    from curlew.configs import get_b_config, get_s_config

-+    from curlew.players import Players

- except Exception as e:

-     print(e)

-     sys.exit(1)

-@@ -74,7 +74,7 @@

- 

- # Localization.

- DOMAIN = 'curlew'

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

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

- gettext.install(DOMAIN, LOCALDIR)

- 

- # Treeview cols nbrs

-diff -ruN curlew-0.2.3.orig/modules/edition.py curlew-0.2.3/modules/edition.py

---- curlew-0.2.3.orig/modules/edition.py   2017-04-20 11:31:29.000000000 +0300

-+++ curlew-0.2.3/modules/edition.py    2017-04-22 00:13:35.640887391 +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 -ruN curlew-0.2.3.orig/modules/formats.py curlew-0.2.3/modules/formats.py

---- curlew-0.2.3.orig/modules/formats.py   2017-04-20 11:49:28.000000000 +0300

-+++ curlew-0.2.3/modules/formats.py    2017-04-22 00:13:35.644887403 +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 -ruN curlew-0.2.3.orig/modules/__init__.py curlew-0.2.3/modules/__init__.py

---- curlew-0.2.3.orig/modules/__init__.py  2017-04-20 11:30:11.000000000 +0300

-+++ curlew-0.2.3/modules/__init__.py   2017-04-22 00:13:35.640887391 +0300

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

- 

- from gi.repository import GLib

- 

--from modules.consts import CONF_FILE, USR_FFILE, CONF_PATH

-+from curlew.consts import CONF_FILE, USR_FFILE, CONF_PATH

- from os.path import exists

- import os

- 

-diff -ruN curlew-0.2.3.orig/modules/players.py curlew-0.2.3/modules/players.py

---- curlew-0.2.3.orig/modules/players.py   2017-04-20 11:31:29.000000000 +0300

-+++ curlew-0.2.3/modules/players.py    2017-04-22 00:13:35.652887426 +0300

-@@ -23,8 +23,8 @@

- from shutil import which

- 

- from gi.repository import Gtk

--from modules.customwidgets import ComboWithEntry

--from modules.configs import set_s_config

-+from curlew.customwidgets import ComboWithEntry

-+from curlew.configs import set_s_config

- 

- PLAYERS_LIST = [

-     'mpv',

-diff -ruN curlew-0.2.3.orig/setup.py curlew-0.2.3/setup.py

---- curlew-0.2.3.orig/setup.py 2016-12-01 17:26:10.000000000 +0300

-+++ curlew-0.2.3/setup.py  2017-04-22 00:19:55.035178724 +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', 'done.ogg']),

-               #('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"}

-       )

​

@@ -0,0 +1,184 @@

+diff -ruN curlew-0.2.4.orig/curlew curlew-0.2.4/curlew

+--- curlew-0.2.4.orig/curlew   2016-03-04 15:39:47.000000000 +0200

++++ curlew-0.2.4/curlew    2017-05-23 19:32:22.312050586 +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 -ruN curlew-0.2.4.orig/modules/codecs.py curlew-0.2.4/modules/codecs.py

+--- curlew-0.2.4.orig/modules/codecs.py    2017-04-20 11:31:29.000000000 +0300

++++ curlew-0.2.4/modules/codecs.py 2017-05-23 19:31:37.587405490 +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 -ruN curlew-0.2.4.orig/modules/configs.py curlew-0.2.4/modules/configs.py

+--- curlew-0.2.4.orig/modules/configs.py   2017-04-20 11:31:29.000000000 +0300

++++ curlew-0.2.4/modules/configs.py    2017-05-23 19:31:37.587405490 +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 -ruN curlew-0.2.4.orig/modules/consts.py curlew-0.2.4/modules/consts.py

+--- curlew-0.2.4.orig/modules/consts.py    2017-04-20 11:31:29.000000000 +0300

++++ curlew-0.2.4/modules/consts.py 2017-05-23 19:33:04.720625755 +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')

+ 

+ SOUND_FILE = join(DTA_DIR, 'done.ogg')

+ 

+diff -ruN curlew-0.2.4.orig/modules/curlew.py curlew-0.2.4/modules/curlew.py

+--- curlew-0.2.4.orig/modules/curlew.py    2017-04-29 22:20:50.000000000 +0300

++++ curlew-0.2.4/modules/curlew.py 2017-05-23 19:33:58.657310417 +0300

+@@ -39,23 +39,23 @@

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

+     import dbus.glib, dbus.service

+     

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

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

+     SpinsFrame, LabeledGrid, ComboWithEntry, ButtonWithIcon, ToggleBtnWithIcon

+-    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.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.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, SOUND_FILE

+-    from modules.configs import get_b_config, get_s_config

+-    from modules.players import choose_player

++    from curlew.configs import get_b_config, get_s_config

++    from curlew.players import choose_player

+ except Exception as e:

+     print(e)

+     sys.exit(1)

+@@ -73,7 +73,7 @@

+ 

+ # Localization.

+ DOMAIN = 'curlew'

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

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

+ gettext.install(DOMAIN, LOCALDIR)

+ 

+ # Treeview cols nbrs

+diff -ruN curlew-0.2.4.orig/modules/edition.py curlew-0.2.4/modules/edition.py

+--- curlew-0.2.4.orig/modules/edition.py   2017-04-20 11:31:29.000000000 +0300

++++ curlew-0.2.4/modules/edition.py    2017-05-23 19:31:37.567405192 +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 -ruN curlew-0.2.4.orig/modules/formats.py curlew-0.2.4/modules/formats.py

+--- curlew-0.2.4.orig/modules/formats.py   2017-04-20 11:49:28.000000000 +0300

++++ curlew-0.2.4/modules/formats.py    2017-05-23 19:31:37.571405251 +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 -ruN curlew-0.2.4.orig/modules/__init__.py curlew-0.2.4/modules/__init__.py

+--- curlew-0.2.4.orig/modules/__init__.py  2017-04-20 11:30:11.000000000 +0300

++++ curlew-0.2.4/modules/__init__.py   2017-05-23 19:31:37.567405192 +0300

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

+ 

+ from gi.repository import GLib

+ 

+-from modules.consts import CONF_FILE, USR_FFILE, CONF_PATH

++from curlew.consts import CONF_FILE, USR_FFILE, CONF_PATH

+ from os.path import exists

+ import os

+ 

+diff -ruN curlew-0.2.4.orig/modules/players.py curlew-0.2.4/modules/players.py

+--- curlew-0.2.4.orig/modules/players.py   2017-04-28 12:35:19.000000000 +0300

++++ curlew-0.2.4/modules/players.py    2017-05-23 19:31:37.587405490 +0300

+@@ -18,7 +18,7 @@

+ # http://waqf.ojuba.org/license

+ 

+ from shutil import which

+-from modules.configs import set_s_config

++from curlew.configs import set_s_config

+ 

+ PLAYERS_LIST = [

+     'mpv',

+diff -ruN curlew-0.2.4.orig/setup.py curlew-0.2.4/setup.py

+--- curlew-0.2.4.orig/setup.py 2017-04-29 23:20:17.000000000 +0300

++++ curlew-0.2.4/setup.py  2017-05-23 19:35:34.198409459 +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', 'done.ogg']),

+               #('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"}

+       )

​