Request 4249 (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 4249 (accepted)

No description set

Created by awissu over 6 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) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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,34 +17,32 @@
 
 
 Name:           curlew
-Version:        0.2.4
+Version:        0.2.5
 Release:        0
 Summary:        Multimedia converter
 License:        Waqf
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Url:            http://sourceforge.net/projects/curlew/
+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-sitelib.patch
 BuildRequires:  dbus-1-python3
+BuildRequires:  gobject-introspection
 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-1_0-Gtk-3_0 >= 3.12.0
 Requires:       xdg-utils
 # Conflict with ffmpeg
 #Requires:       libav-tools
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -91,8 +89,8 @@
 %desktop_database_postun
 
 %files
-%defattr(-,root,root)
-%doc LICENSE* AUTHORS ChangeLog README
+%license LICENSE*
+%doc AUTHORS changelog README
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
@@ -101,6 +99,5 @@
 %{python3_sitelib}/%{name}/
 
 %files lang -f %{name}.lang
-%defattr(-,root,root,-)
 
 %changelog

curlew-sitelib.patch Changed

@@ -1,6 +1,6 @@
-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
+diff -ruN curlew-0.2.5.orig/curlew curlew-0.2.5/curlew
+--- curlew-0.2.5.orig/curlew	2016-03-04 16:39:47.000000000 +0300
++++ curlew-0.2.5/curlew	2018-06-08 00:57:29.124269779 +0300
 @@ -1,9 +1,5 @@
  #!/usr/bin/env python3
  
@@ -12,9 +12,9 @@
 -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
+diff -ruN curlew-0.2.5.orig/modules/codecsdialog.py curlew-0.2.5/modules/codecsdialog.py
+--- curlew-0.2.5.orig/modules/codecsdialog.py	2018-05-26 06:32:54.000000000 +0300
++++ curlew-0.2.5/modules/codecsdialog.py	2018-06-08 00:58:45.720529325 +0300
 @@ -21,7 +21,7 @@
  gi.require_version('Gtk', '3.0')
  
@@ -23,10 +23,10 @@
 +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
+     def __init__(self, prnt, encoder, title):
+diff -ruN curlew-0.2.5.orig/modules/configs.py curlew-0.2.5/modules/configs.py
+--- curlew-0.2.5.orig/modules/configs.py	2018-05-26 06:33:01.000000000 +0300
++++ curlew-0.2.5/modules/configs.py	2018-06-08 00:58:45.720529325 +0300
 @@ -19,7 +19,7 @@
  
  
@@ -36,9 +36,9 @@
  
  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
+diff -ruN curlew-0.2.5.orig/modules/consts.py curlew-0.2.5/modules/consts.py
+--- curlew-0.2.5.orig/modules/consts.py	2018-05-26 06:33:11.000000000 +0300
++++ curlew-0.2.5/modules/consts.py	2018-06-08 00:59:32.468688114 +0300
 @@ -26,7 +26,7 @@
  CONF_FILE = join(CONF_PATH, 'curlew.cfg')
  
@@ -48,10 +48,10 @@
  
  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 @@
+diff -ruN curlew-0.2.5.orig/modules/curlew.py curlew-0.2.5/modules/curlew.py
+--- curlew-0.2.5.orig/modules/curlew.py	2018-05-26 06:33:18.000000000 +0300
++++ curlew-0.2.5/modules/curlew.py	2018-06-08 01:00:20.820852654 +0300
+@@ -39,24 +39,24 @@
      from gi.repository import Gtk, GLib, Gdk, GObject, GdkPixbuf, Gio, Pango
      import dbus.glib, dbus.service
      
@@ -64,22 +64,24 @@
 +    from curlew.functions import show_message, get_format_size, \
      duration_to_time, time_to_duration, check_codec
 -    from modules.logdialog import LogDialog
+-    from modules.errdialog import ErrDialog
 -    from modules.tray import StatusIcon
 -    from modules.languages import LANGUAGES
--    from modules.favdialog import Favorite
+-    from modules.favdialog import FavoriteDialog
 -    from modules.waitdialog import WaitDialog
 -    from modules.formats import Formats
 -    from modules.infobars import InfoBar
--    from modules.codecs import CodecsDialog
+-    from modules.codecsdialog import CodecsDialog
 -    from modules.consts import CONF_PATH, HOME, CONF_FILE, DTA_DIR, \
 +    from curlew.logdialog import LogDialog
++    from curlew.errdialog import ErrDialog
 +    from curlew.tray import StatusIcon
 +    from curlew.languages import LANGUAGES
-+    from curlew.favdialog import Favorite
++    from curlew.favdialog import FavoriteDialog
 +    from curlew.waitdialog import WaitDialog
 +    from curlew.formats import Formats
 +    from curlew.infobars import InfoBar
-+    from curlew.codecs import CodecsDialog
++    from curlew.codecsdialog 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
@@ -89,7 +91,7 @@
  except Exception as e:
      print(e)
      sys.exit(1)
-@@ -73,7 +73,7 @@
+@@ -74,7 +74,7 @@
  
  # Localization.
  DOMAIN = 'curlew'
@@ -98,9 +100,9 @@
  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
+diff -ruN curlew-0.2.5.orig/modules/formateditor.py curlew-0.2.5/modules/formateditor.py
+--- curlew-0.2.5.orig/modules/formateditor.py	2018-05-26 06:33:53.000000000 +0300
++++ curlew-0.2.5/modules/formateditor.py	2018-06-08 00:58:45.748529420 +0300
 @@ -24,9 +24,9 @@
  
  from gi.repository import Gtk, GLib
@@ -114,23 +116,23 @@
  
  
  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
+diff -ruN curlew-0.2.5.orig/modules/formats.py curlew-0.2.5/modules/formats.py
+--- curlew-0.2.5.orig/modules/formats.py	2018-05-26 06:34:00.000000000 +0300
++++ curlew-0.2.5/modules/formats.py	2018-06-08 00:58:45.720529325 +0300
 @@ -21,8 +21,8 @@
  gi.require_version('Gtk', '3.0')
  
  from gi.repository import Gtk
--from modules.edition import FormatEditor
+-from modules.formateditor import FormatEditor
 -from modules.customwidgets import ButtonWithIcon
-+from curlew.edition import FormatEditor
++from curlew.formateditor 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
+diff -ruN curlew-0.2.5.orig/modules/__init__.py curlew-0.2.5/modules/__init__.py
+--- curlew-0.2.5.orig/modules/__init__.py	2018-05-26 06:32:44.000000000 +0300
++++ curlew-0.2.5/modules/__init__.py	2018-06-08 00:58:45.720529325 +0300
 @@ -19,7 +19,7 @@
  
  from gi.repository import GLib
@@ -140,9 +142,9 @@
  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
+diff -ruN curlew-0.2.5.orig/modules/players.py curlew-0.2.5/modules/players.py
+--- curlew-0.2.5.orig/modules/players.py	2018-05-26 06:34:39.000000000 +0300
++++ curlew-0.2.5/modules/players.py	2018-06-08 00:58:45.720529325 +0300
 @@ -18,7 +18,7 @@
  # http://waqf.ojuba.org/license
  
@@ -152,11 +154,11 @@
  
  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
+diff -ruN curlew-0.2.5.orig/setup.py curlew-0.2.5/setup.py
+--- curlew-0.2.5.orig/setup.py	2018-05-26 06:31:20.000000000 +0300
++++ curlew-0.2.5/setup.py	2018-06-08 01:02:30.029293820 +0300
 @@ -17,8 +17,6 @@
- doc_files  = ['LICENSE-ar.txt', 'LICENSE-en.txt', 'AUTHORS', 'THANKS', 'ChangeLog', 'README']
+ 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']),

curlew-0.2.4.tar.gz Deleted

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

Build Results
RPM Lint

Refresh

Comments for request 4249 0

Request History

awissu created request over 6 years ago

awissu accepted request over 6 years ago