Request 3791 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 3791 (accepted)

No description set

Created by awissu over 7 years ago
In state accepted
Package maintainer: awissu

Submit curlew

Submit package home:awissu:branches:Multimedia / curlew to package Multimedia / curlew

curlew.changes Changed

curlew.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package curlew
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,28 +17,30 @@
 
 
 Name:           curlew
-Version:        0.2.2
+Version:        0.2.3
 Release:        0
 Summary:        Multimedia converter
 License:        Waqf
-Group:          Productivity/Multimedia/Video/Convertors
+Group:          Productivity/Multimedia/Video/Editors and Convertors
 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.2_sitelib.patch
+Patch0:         curlew-0.2.3_sitelib.patch
+BuildRequires:  dbus-1-python3
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  intltool
 BuildRequires:  python3-base >= 3.3.2
 BuildRequires:  python3-gobject >= 3.12.0
 BuildRequires:  python3-setuptools
 BuildRequires:  rsvg-view
+BuildRequires:  typelib-1_0-Gtk-3_0 >= 3.12.0
 BuildRequires:  update-desktop-files
 Requires:       dbus-1-python3
 Requires:       ffmpeg
 Requires:       mediainfo
 Requires:       mencoder
 Requires:       python3-gobject
-Requires:       typelib(Gtk) = 3.0
+Requires:       typelib-1_0-Gtk-3_0 >= 3.12.0
 Requires:       xdg-utils
 # Conflict with ffmpeg
 #Requires:       libav-tools
@@ -62,17 +64,14 @@
   - 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
+# Fix: spurious-executable-perm
 find . -type f -perm /u+x -exec chmod 644 {} \; || :
 
 %build
@@ -80,9 +79,7 @@
 
 %install
 python3 setup.py install --root=%{buildroot}
-
 %suse_update_desktop_file -r %{name} AudioVideo Video AudioVideoEditing
-
 %find_lang %{name}
 
 %post
@@ -94,12 +91,12 @@
 %desktop_database_postun
 
 %files
+%defattr(-,root,root)
 %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
+%{_datadir}/icons/hicolor/*/apps/%{name}.??g
 %{python3_sitelib}/%{name}-*.egg-info
 %{python3_sitelib}/%{name}/

curlew-0.2.2_sitelib.patch Deleted

@@ -1,160 +0,0 @@
-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"}
-       )

curlew-0.2.3_sitelib.patch Added

@@ -0,0 +1,188 @@
+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"}
+       )

curlew-0.2.2.tar.gz -> curlew-0.2.3.tar.gz Changed

Build Results
RPM Lint

Refresh

Comments for request 3791 0

Request History

awissu created request over 7 years ago

awissu accepted request over 7 years ago