commit qnapi for openSUSE:Factory
Hello community,
here is the log from the commit of package qnapi for openSUSE:Factory checked
in at 2018-07-03 23:34:33
Comparing /work/SRC/openSUSE:Factory/qnapi (Old)
and /work/SRC/openSUSE:Factory/.qnapi.new (New)
Package is "qnapi"
Tue Jul 3 23:34:33 2018 rev:9 rq:620330 version:0.2.3
Changes:
--- /work/SRC/openSUSE:Factory/qnapi/qnapi.changes 2018-06-19
11:55:30.944182986 +0200
+++ /work/SRC/openSUSE:Factory/.qnapi.new/qnapi.changes 2018-07-03
23:34:35.856387603 +0200
@@ -1,0 +2,7 @@
+Fri Jun 29 12:11:31 UTC 2018 - kstreit...@suse.com
+
+- require p7zip-full for TW as 7z and 7za binaries needed by qnapi
+ were moved to this package (see bsc#899627 for more details about
+ this change)
+
+---
Other differences:
--
++ qnapi.spec ++
--- /var/tmp/diff_new_pack.a8BNRx/_old 2018-07-03 23:34:36.464386732 +0200
+++ /var/tmp/diff_new_pack.a8BNRx/_new 2018-07-03 23:34:36.472386720 +0200
@@ -41,7 +41,12 @@
BuildRequires: pkgconfig(libmediainfo)
BuildRequires: pkgconfig(maia)
BuildRequires: pkgconfig(zlib)
+# Remove when p7zip-full is in all products
+%if 0%{suse_version} > 1500
+Requires: p7zip-full
+%else
Requires: p7zip
+%endif
Recommends: ffmpeg
%description
commit qnapi for openSUSE:Factory
Hello community,
here is the log from the commit of package qnapi for openSUSE:Factory checked
in at 2018-06-19 11:55:27
Comparing /work/SRC/openSUSE:Factory/qnapi (Old)
and /work/SRC/openSUSE:Factory/.qnapi.new (New)
Package is "qnapi"
Tue Jun 19 11:55:27 2018 rev:8 rq:616024 version:0.2.3
Changes:
--- /work/SRC/openSUSE:Factory/qnapi/qnapi.changes 2018-01-09
14:56:14.095246722 +0100
+++ /work/SRC/openSUSE:Factory/.qnapi.new/qnapi.changes 2018-06-19
11:55:30.944182986 +0200
@@ -1,0 +2,5 @@
+Mon Jun 11 12:20:31 UTC 2018 - aloi...@gmx.com
+
+- Added qnapi-Qt511.patch to fix build with Qt 5.11
+
+---
New:
qnapi-Qt511.patch
Other differences:
--
++ qnapi.spec ++
--- /var/tmp/diff_new_pack.3DyVfI/_old 2018-06-19 11:55:31.544160711 +0200
+++ /var/tmp/diff_new_pack.3DyVfI/_new 2018-06-19 11:55:31.552160414 +0200
@@ -21,13 +21,15 @@
Release:0
Summary:A NapiProjekt client
# libmaia and qt-maybe are BSD-2-Clause and BSD-3-Clause respectively
-License:GPL-2.0+ and BSD-2-Clause and BSD-3-Clause
+License:GPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause
Group: Productivity/Multimedia/Other
Summary(it):Client NapiProjekt
Summary(pl):Klient NapiProjekt
URL:http://qnapi.github.io/
Source0:
https://github.com/QNapi/qnapi/releases/download/%{version}/%{name}-%{version}.tar.gz
Patch0: qnapi-libmaia.patch
+# PATCH-FIX-UPSTREAM qnapi-Qt511.patch
+Patch1: qnapi-Qt511.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: update-desktop-files
@@ -60,6 +62,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
# Fix paths specific for openSUSE
sed -i 's|doc.path = $${INSTALL_PREFIX}/share/doc/qnapi|doc.path =
$${INSTALL_PREFIX}/share/doc/packages/qnapi|' qnapi.pro
++ qnapi-Qt511.patch ++
From: Luigi Baldoni
Date: 2018-06-11 14:19:30 +0200
Subject: Add missing include statement for Qt 5.11
Upstream: submitted
Qt 5.11 requires more explicit include statements
---
Index: qnapi-0.2.3/gui/src/forms/subdatawidget.h
===
--- qnapi-0.2.3.orig/gui/src/forms/subdatawidget.h
+++ qnapi-0.2.3/gui/src/forms/subdatawidget.h
@@ -16,6 +16,7 @@
#define SUBDATAWIDGET_H
#include
+#include
#include "ui_subDataWidget.h"
class subDataWidget : public QWidget {
commit qnapi for openSUSE:Factory
Hello community,
here is the log from the commit of package qnapi for openSUSE:Factory checked
in at 2018-01-09 14:56:11
Comparing /work/SRC/openSUSE:Factory/qnapi (Old)
and /work/SRC/openSUSE:Factory/.qnapi.new (New)
Package is "qnapi"
Tue Jan 9 14:56:11 2018 rev:7 rq:562783 version:0.2.3
Changes:
--- /work/SRC/openSUSE:Factory/qnapi/qnapi.changes 2017-08-16
16:11:10.058826503 +0200
+++ /work/SRC/openSUSE:Factory/.qnapi.new/qnapi.changes 2018-01-09
14:56:14.095246722 +0100
@@ -1,0 +2,5 @@
+Tue Jan 9 07:58:42 UTC 2018 - aloi...@gmx.com
+
+- Added missing build dependency
+
+---
Other differences:
--
++ qnapi.spec ++
--- /var/tmp/diff_new_pack.TohB6n/_old 2018-01-09 14:56:14.943206972 +0100
+++ /var/tmp/diff_new_pack.TohB6n/_new 2018-01-09 14:56:14.947206785 +0100
@@ -1,7 +1,7 @@
#
# spec file for package qnapi
#
-# 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
@@ -25,7 +25,7 @@
Group: Productivity/Multimedia/Other
Summary(it):Client NapiProjekt
Summary(pl):Klient NapiProjekt
-Url:http://qnapi.github.io/
+URL:http://qnapi.github.io/
Source0:
https://github.com/QNapi/qnapi/releases/download/%{version}/%{name}-%{version}.tar.gz
Patch0: qnapi-libmaia.patch
BuildRequires: fdupes
@@ -38,9 +38,9 @@
BuildRequires: pkgconfig(Qt5Xml) >= 5.2
BuildRequires: pkgconfig(libmediainfo)
BuildRequires: pkgconfig(maia)
+BuildRequires: pkgconfig(zlib)
Requires: p7zip
Recommends: ffmpeg
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
QNapi is unofficial clone of NapiProjekt program (http://napiprojekt.pl)
@@ -80,12 +80,15 @@
# Fix for "wrong-file-end-of-line-encoding" doc/ChangeLog file
sed -i 's/\r//' doc/ChangeLog
+# Put license files in the right place
+rm %{buildroot}%{_defaultdocdir}/%{name}/LICENSE*
+
%fdupes %{buildroot}%{_prefix}
%suse_update_desktop_file -i -r -n %{name} AudioVideo AudioVideoEditing
%files
-%defattr(-,root,root)
-%doc doc/COPYRIGHT doc/ChangeLog doc/LICENSE doc/LICENSE-pl
doc/qnapi-download.desktop doc/qnapi-download.schemas doc/qnapi-scan.desktop
doc/qnapi-scan.schemas
+%doc doc/COPYRIGHT doc/ChangeLog doc/qnapi-download.desktop
doc/qnapi-download.schemas doc/qnapi-scan.desktop doc/qnapi-scan.schemas
+%license doc/LICENSE doc/LICENSE-pl
%{_bindir}/%{name}
%{_datadir}/icons/*
%{_datadir}/applications/%{name}.desktop
commit qnapi for openSUSE:Factory
Hello community,
here is the log from the commit of package qnapi for openSUSE:Factory checked
in at 2017-08-16 16:11:08
Comparing /work/SRC/openSUSE:Factory/qnapi (Old)
and /work/SRC/openSUSE:Factory/.qnapi.new (New)
Package is "qnapi"
Wed Aug 16 16:11:08 2017 rev:6 rq:513023 version:0.2.3
Changes:
--- /work/SRC/openSUSE:Factory/qnapi/qnapi.changes 2017-07-21
22:44:47.271758033 +0200
+++ /work/SRC/openSUSE:Factory/.qnapi.new/qnapi.changes 2017-08-16
16:11:10.058826503 +0200
@@ -1,0 +2,6 @@
+Sat Jul 29 12:22:48 UTC 2017 - aloi...@gmx.com
+
+- Added qnapi-libmaia.patch and use the system libmaia instead
+ of the embedded one
+
+---
New:
qnapi-libmaia.patch
Other differences:
--
++ qnapi.spec ++
--- /var/tmp/diff_new_pack.9N9Zg8/_old 2017-08-16 16:11:11.154672682 +0200
+++ /var/tmp/diff_new_pack.9N9Zg8/_new 2017-08-16 16:11:11.166670997 +0200
@@ -27,6 +27,7 @@
Summary(pl):Klient NapiProjekt
Url:http://qnapi.github.io/
Source0:
https://github.com/QNapi/qnapi/releases/download/%{version}/%{name}-%{version}.tar.gz
+Patch0: qnapi-libmaia.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: update-desktop-files
@@ -36,6 +37,7 @@
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2
BuildRequires: pkgconfig(Qt5Xml) >= 5.2
BuildRequires: pkgconfig(libmediainfo)
+BuildRequires: pkgconfig(maia)
Requires: p7zip
Recommends: ffmpeg
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -57,6 +59,7 @@
%prep
%setup -q
+%patch0 -p1
# Fix paths specific for openSUSE
sed -i 's|doc.path = $${INSTALL_PREFIX}/share/doc/qnapi|doc.path =
$${INSTALL_PREFIX}/share/doc/packages/qnapi|' qnapi.pro
++ qnapi-libmaia.patch ++
Index: qnapi-0.2.3/libqnapi/libqnapi.pro
===
--- qnapi-0.2.3.orig/libqnapi/libqnapi.pro
+++ qnapi-0.2.3/libqnapi/libqnapi.pro
@@ -13,7 +13,6 @@ DESTDIR = $$PWD
INCLUDEPATH += $$PWD/src
-include(../deps/libmaia/maia.pri)
include(../deps/qt-maybe/qt-maybe.pri)
UI_DIR = tmp
@@ -90,7 +89,9 @@ HEADERS += src/config/configreader.h \
src/version.h
unix:!macx {
-PKGCONFIG += libmediainfo
+CONFIG += link_pkgconfig
+PKGCONFIG += libmediainfo \
+ maia
}
macx {
Index: qnapi-0.2.3/libqnapi/libqnapi.pri
===
--- qnapi-0.2.3.orig/libqnapi/libqnapi.pri
+++ qnapi-0.2.3/libqnapi/libqnapi.pri
@@ -1,6 +1,5 @@
LIBS += -L$$PWD -lqnapi
INCLUDEPATH += $$PWD/src \
-$$PWD/../deps/libmaia \
$$PWD/../deps/qt-maybe
DEPENDPATH += $$PWD/src
PRE_TARGETDEPS += $$PWD/libqnapi.a
Index: qnapi-0.2.3/gui/gui.pro
===
--- qnapi-0.2.3.orig/gui/gui.pro
+++ qnapi-0.2.3/gui/gui.pro
@@ -80,7 +80,8 @@ unix:!macx {
TARGET = qnapi
DESTDIR = ../
CONFIG += link_pkgconfig
-PKGCONFIG += libmediainfo
+PKGCONFIG += libmediainfo \
+ maia
}
macx {
commit qnapi for openSUSE:Factory
Hello community,
here is the log from the commit of package qnapi for openSUSE:Factory checked
in at 2017-07-21 22:44:42
Comparing /work/SRC/openSUSE:Factory/qnapi (Old)
and /work/SRC/openSUSE:Factory/.qnapi.new (New)
Package is "qnapi"
Fri Jul 21 22:44:42 2017 rev:5 rq:500796 version:0.2.3
Changes:
--- /work/SRC/openSUSE:Factory/qnapi/qnapi.changes 2017-04-06
11:02:55.820967918 +0200
+++ /work/SRC/openSUSE:Factory/.qnapi.new/qnapi.changes 2017-07-21
22:44:47.271758033 +0200
@@ -1,0 +2,15 @@
+Fri Jun 2 20:54:07 UTC 2017 - aloi...@gmx.com
+
+- Update to version 0.2.3 (machine-translated from Polish):
+ * Possibility to select the user interface language
+(english / polish / italian) - (thx Fincer, luigino)
+ * Rebuilt application configuration subsystem
+ * Split application between library (libqnapi) and user
+interface (gui)
+ * Target formatting / caption extension by line argument - # 65
+ * Fixed issue with loss of color information for captions during
+conversion - # 100
+
+- Qnapi now includes libmaia and qt-maybe
+
+---
Old:
qnapi-0.2.2.tar.gz
New:
qnapi-0.2.3.tar.gz
Other differences:
--
++ qnapi.spec ++
--- /var/tmp/diff_new_pack.OWkDUT/_old 2017-07-21 22:44:47.819680741 +0200
+++ /var/tmp/diff_new_pack.OWkDUT/_new 2017-07-21 22:44:47.819680741 +0200
@@ -17,11 +17,13 @@
Name: qnapi
-Version:0.2.2
+Version:0.2.3
Release:0
Summary:A NapiProjekt client
-License:GPL-2.0+
+# libmaia and qt-maybe are BSD-2-Clause and BSD-3-Clause respectively
+License:GPL-2.0+ and BSD-2-Clause and BSD-3-Clause
Group: Productivity/Multimedia/Other
+Summary(it):Client NapiProjekt
Summary(pl):Klient NapiProjekt
Url:http://qnapi.github.io/
Source0:
https://github.com/QNapi/qnapi/releases/download/%{version}/%{name}-%{version}.tar.gz
@@ -43,6 +45,11 @@
written using Qt5. It's focused to be functional on GNU/Linux and other
Unix-like systems, for which NapiProjekt is not available.
+%description -l it
+QNapi è un clone non ufficiale del programma NapiProjekt
(http://napiprojekt.pl)
+scritto usando Qt5. È indirizzato alla funzionalità su GNU/Linux ed altri
sistemi
+simili a Unix, per cui NapiProjekt non è disponibile.
+
%description -l pl
QNapi jest nieoficjalnym klonem programu NapiProjekt (http://napiprojekt.pl)
napisanym w bibliotece Qt5 z myślą o użytkownikach Linuksa oraz innych
@@ -50,8 +57,8 @@
%prep
%setup -q
-### Fix paths specific for openSUSE
-sed -i 's|doc.path = $${INSTALL_PREFIX}/share/doc/$${TARGET}|doc.path =
$${INSTALL_PREFIX}/share/doc/packages/$${TARGET}|' qnapi.pro
+# Fix paths specific for openSUSE
+sed -i 's|doc.path = $${INSTALL_PREFIX}/share/doc/qnapi|doc.path =
$${INSTALL_PREFIX}/share/doc/packages/qnapi|' qnapi.pro
%build
# fixes gcc6 problem with stdlib headers
@@ -67,7 +74,7 @@
install -m 644 -D doc/qnapi-download.desktop
%{buildroot}%{_datadir}/kservices5/ServiceMenus/qnapi-download.desktop
install -m 644 -D doc/qnapi-scan.desktop
%{buildroot}%{_datadir}/kservices5/ServiceMenus/qnapi-scan.desktop
-### Fix for "wrong-file-end-of-line-encoding" doc/ChangeLog file
+# Fix for "wrong-file-end-of-line-encoding" doc/ChangeLog file
sed -i 's/\r//' doc/ChangeLog
%fdupes %{buildroot}%{_prefix}
@@ -80,6 +87,8 @@
%{_datadir}/icons/*
%{_datadir}/applications/%{name}.desktop
%attr(644,root,root) %{_mandir}/man1/*
+%{_mandir}/it/man1/qnapi.1.gz
+%{_mandir}/pl/man1/qnapi.1.gz
%dir %{_datadir}/kde4
%dir %{_datadir}/kde4/services
%dir %{_datadir}/kde4/services/ServiceMenus
++ qnapi-0.2.2.tar.gz -> qnapi-0.2.3.tar.gz ++
36475 lines of diff (skipped)
commit qnapi for openSUSE:Factory
Hello community,
here is the log from the commit of package qnapi for openSUSE:Factory checked
in at 2017-04-06 11:02:54
Comparing /work/SRC/openSUSE:Factory/qnapi (Old)
and /work/SRC/openSUSE:Factory/.qnapi.new (New)
Package is "qnapi"
Thu Apr 6 11:02:54 2017 rev:4 rq:485019 version:0.2.2
Changes:
--- /work/SRC/openSUSE:Factory/qnapi/qnapi.changes 2015-12-21
12:05:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.qnapi.new/qnapi.changes 2017-04-06
11:02:55.820967918 +0200
@@ -1,0 +2,39 @@
+Thu Mar 30 16:31:33 UTC 2017 - aloi...@gmx.com
+
+- Update to version 0.2.2 (machine-translated from Polish):
+ * Refreshed application icon
+ * Subtitle display of language taken in the summary window
+- # 53 (thx andrewpros)
+ * Patch installer for Windows - # 55
+ * Improvements in the selection Subtitle - # 57 (thx
+andrewpros)
+ * Fix error when changing the diacritical characters to
+ASCII - # 64
+ * Prevention segfaultowi - # 83 (thx kempniu)
+ * Fixes typos in several places - # 84 (thx kempniu)
+ * Configuration Engine Napisy24 - # 88
+ * Removed unsupported Napiprojekt engine functions (upload
+Subtitle, reporting of amendments)
+ version 0.2.1
+ * Problem with the names of paths containing special
+characters also improved when open another instance of
+the application (Windows) - # 28
+ * Amendments to the detection of UTF-8 for languages
+other than Polish - # 37
+ * The file extension is not changed when processing Subtitle
+is inactive - # 38
+ * Showing the version information for Qt
+ * Subtitle downloading in the spare language in silent mode
+- # 42
+ * Wash libmediainfo instead ffprobe to retrieve information
+about the movie file
+ * Subtitle option to search all at once, also in the spare -
+# 45
+ * Valid only interrupt the search, if found subtitles - # 46
+ * Fixes bugs in the engine Napisy24 - # 47
+
+- Added libmediainfo as build requirement
+
+- Added fix for gcc6
+
+---
Old:
qnapi-0.2.0.tar.gz
New:
qnapi-0.2.2.tar.gz
Other differences:
--
++ qnapi.spec ++
--- /var/tmp/diff_new_pack.qYMARP/_old 2017-04-06 11:02:57.012799471 +0200
+++ /var/tmp/diff_new_pack.qYMARP/_new 2017-04-06 11:02:57.016798905 +0200
@@ -1,7 +1,7 @@
#
# spec file for package qnapi
#
-# Copyright (c) 2015 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,7 +17,7 @@
Name: qnapi
-Version:0.2.0
+Version:0.2.2
Release:0
Summary:A NapiProjekt client
License:GPL-2.0+
@@ -33,6 +33,7 @@
BuildRequires: pkgconfig(Qt5Network) >= 5.2
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2
BuildRequires: pkgconfig(Qt5Xml) >= 5.2
+BuildRequires: pkgconfig(libmediainfo)
Requires: p7zip
Recommends: ffmpeg
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -53,7 +54,8 @@
sed -i 's|doc.path = $${INSTALL_PREFIX}/share/doc/$${TARGET}|doc.path =
$${INSTALL_PREFIX}/share/doc/packages/$${TARGET}|' qnapi.pro
%build
-%qmake5
+# fixes gcc6 problem with stdlib headers
+%qmake5 QMAKE_DEFAULT_INCDIRS="" %{name}.pro
make %{?_smp_mflags}
%install
++ qnapi-0.2.0.tar.gz -> qnapi-0.2.2.tar.gz ++
10434 lines of diff (skipped)
commit qnapi for openSUSE:Factory
Hello community,
here is the log from the commit of package qnapi for openSUSE:Factory checked
in at 2015-12-21 12:05:09
Comparing /work/SRC/openSUSE:Factory/qnapi (Old)
and /work/SRC/openSUSE:Factory/.qnapi.new (New)
Package is "qnapi"
Changes:
--- /work/SRC/openSUSE:Factory/qnapi/qnapi.changes 2015-11-02
12:55:28.0 +0100
+++ /work/SRC/openSUSE:Factory/.qnapi.new/qnapi.changes 2015-12-21
12:05:33.0 +0100
@@ -1,0 +2,13 @@
+Sat Dec 19 09:40:16 UTC 2015 - fi...@opensuse.org
+
+- Update to 0.2.0:
+ * bugfix in napisy24 engine
+ * icons placed at directories according to their sizes
+ * bugfixes in file encoding detection
+ * preserving original file encoding during subtitle format conversion
+ * bugfixed backup language support
+- Drop 0001-fix-license-headers-in-source-files.patch: fixed upstream
+- Drop fix-icons-paths.patch: fixed upstream
+- Drop qnapi-napisy24.pl-skip-.url.patch: fixed upstream
+
+---
Old:
0001-fix-license-headers-in-source-files.patch
fix-icons-paths.patch
qnapi-0.1.9.tar.gz
qnapi-napisy24.pl-skip-.url.patch
New:
qnapi-0.2.0.tar.gz
Other differences:
--
++ qnapi.spec ++
--- /var/tmp/diff_new_pack.vCPxjH/_old 2015-12-21 12:05:35.0 +0100
+++ /var/tmp/diff_new_pack.vCPxjH/_new 2015-12-21 12:05:35.0 +0100
@@ -17,7 +17,7 @@
Name: qnapi
-Version:0.1.9
+Version:0.2.0
Release:0
Summary:A NapiProjekt client
License:GPL-2.0+
@@ -25,20 +25,14 @@
Summary(pl):Klient NapiProjekt
Url:http://qnapi.github.io/
Source0:
https://github.com/QNapi/qnapi/releases/download/%{version}/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM -- fix license heaaders -- Piotr Krzeminski
-Patch0: 0001-fix-license-headers-in-source-files.patch
-# PATCH-FIX-UPSTREAM -- install icons in correct paths -- Mariusz Fik
-Patch1: fix-icons-paths.patch
-# PATCH-FIX-UPSTREAM -- fix napisy24.pl plugin -- Piotr Krzeminski
-Patch2: qnapi-napisy24.pl-skip-.url.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: update-desktop-files
-BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: pkgconfig(Qt5Gui)
-BuildRequires: pkgconfig(Qt5Network)
-BuildRequires: pkgconfig(Qt5Widgets)
-BuildRequires: pkgconfig(Qt5Xml)
+BuildRequires: pkgconfig(Qt5Core) >= 5.2
+BuildRequires: pkgconfig(Qt5Gui) >= 5.2
+BuildRequires: pkgconfig(Qt5Network) >= 5.2
+BuildRequires: pkgconfig(Qt5Widgets) >= 5.2
+BuildRequires: pkgconfig(Qt5Xml) >= 5.2
Requires: p7zip
Recommends: ffmpeg
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -55,9 +49,6 @@
%prep
%setup -q
-%patch0 -p1
-%patch1
-%patch2
### Fix paths specific for openSUSE
sed -i 's|doc.path = $${INSTALL_PREFIX}/share/doc/$${TARGET}|doc.path =
$${INSTALL_PREFIX}/share/doc/packages/$${TARGET}|' qnapi.pro
++ qnapi-0.1.9.tar.gz -> qnapi-0.2.0.tar.gz ++
2520 lines of diff (skipped)
commit qnapi for openSUSE:Factory
Hello community,
here is the log from the commit of package qnapi for openSUSE:Factory checked
in at 2015-11-02 12:55:25
Comparing /work/SRC/openSUSE:Factory/qnapi (Old)
and /work/SRC/openSUSE:Factory/.qnapi.new (New)
Package is "qnapi"
Changes:
--- /work/SRC/openSUSE:Factory/qnapi/qnapi.changes 2015-09-08
17:49:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.qnapi.new/qnapi.changes 2015-11-02
12:55:28.0 +0100
@@ -1,0 +2,5 @@
+Sat Oct 31 19:46:14 UTC 2015 - fi...@opensuse.org
+
+- Add qnapi-napisy24.pl-skip-.url.patch: fix napisy24.pl plugin.
+
+---
New:
qnapi-napisy24.pl-skip-.url.patch
Other differences:
--
++ qnapi.spec ++
--- /var/tmp/diff_new_pack.FaVZW7/_old 2015-11-02 12:55:29.0 +0100
+++ /var/tmp/diff_new_pack.FaVZW7/_new 2015-11-02 12:55:29.0 +0100
@@ -15,19 +15,22 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: qnapi
Version:0.1.9
Release:0
Summary:A NapiProjekt client
-Summary(pl):Klient NapiProjekt
License:GPL-2.0+
Group: Productivity/Multimedia/Other
+Summary(pl):Klient NapiProjekt
Url:http://qnapi.github.io/
Source0:
https://github.com/QNapi/qnapi/releases/download/%{version}/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM -- fix license heaaders -- Piotr Krzeminski
Patch0: 0001-fix-license-headers-in-source-files.patch
# PATCH-FIX-UPSTREAM -- install icons in correct paths -- Mariusz Fik
Patch1: fix-icons-paths.patch
+# PATCH-FIX-UPSTREAM -- fix napisy24.pl plugin -- Piotr Krzeminski
+Patch2: qnapi-napisy24.pl-skip-.url.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: update-desktop-files
@@ -54,6 +57,7 @@
%setup -q
%patch0 -p1
%patch1
+%patch2
### Fix paths specific for openSUSE
sed -i 's|doc.path = $${INSTALL_PREFIX}/share/doc/$${TARGET}|doc.path =
$${INSTALL_PREFIX}/share/doc/packages/$${TARGET}|' qnapi.pro
@@ -70,7 +74,6 @@
install -m 644 -D doc/qnapi-download.desktop
%{buildroot}%{_datadir}/kservices5/ServiceMenus/qnapi-download.desktop
install -m 644 -D doc/qnapi-scan.desktop
%{buildroot}%{_datadir}/kservices5/ServiceMenus/qnapi-scan.desktop
-
### Fix for "wrong-file-end-of-line-encoding" doc/ChangeLog file
sed -i 's/\r//' doc/ChangeLog
++ qnapi-napisy24.pl-skip-.url.patch ++
Index: src/engines/qnapisy24engine.cpp
===
--- src/engines/qnapisy24engine.cpp.orig
+++ src/engines/qnapisy24engine.cpp
@@ -427,6 +427,7 @@ bool QNapisy24Engine::unpack()
return false;
QString resp = QByteArray(p7zip.readAll());
+
#ifdef Q_OS_WIN
QRegExp r("\r\nPath = ([^\r\n]*)\r\n");
#else
@@ -434,17 +435,32 @@ bool QNapisy24Engine::unpack()
#endif
r.setPatternSyntax(QRegExp::RegExp2);
-if (r.lastIndexIn(resp) == -1)
+QStringList pathMatches;
+int offset = 0;
+
+while((offset = r.indexIn(resp, offset)) != -1)
+{
+QString filePath = r.cap(1);
+
+if(filePath != tmpPackedFile && !filePath.endsWith(".url"))
+{
+pathMatches << filePath;
+}
+
+offset += r.matchedLength();
+}
+
+if(pathMatches.isEmpty())
return false;
-QString subFileName = r.cap(1);
+QString subFileName = pathMatches.first();
subtitlesTmp = tmpPath + "/" + subFileName;
if(QFile::exists(subtitlesTmp))
QFile::remove(subtitlesTmp);
QStringList args;
-args << "e" << "-y" << ("-o" + tmpPath) << tmpPackedFile;
+args << "e" << "-y" << ("-o" + tmpPath) << tmpPackedFile << subFileName;
p7zip.start(p7zipPath, args);
