SHA256
1
0
forked from pool/datovka

Accepting request 359655 from network

- Version update to 4.5.0:
  * various backend updates
  * various bugs fixed
  * qt 5.3 required now
- Rebase patch:
  * datovka-fix-pro.patch

OBS-URL: https://build.opensuse.org/request/show/359655
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/datovka?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2016-02-18 10:07:08 +00:00 committed by Git OBS Bridge
commit a89e4f36df
5 changed files with 42 additions and 18 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0fb5f7cf493662de33d3d66efc157fd38ab46380fc33066a5bb208dae61db25d
size 2243300

3
datovka-4.5.0-src.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7aa5c4ff3f5cebe70166406fa9ae6d87b25f8b29a4f2618625ecd0901d5372d6
size 2270680

View File

@ -1,8 +1,8 @@
Index: datovka-4.3.1/datovka.pro
Index: datovka-4.5.0/datovka.pro
===================================================================
--- datovka-4.3.1.orig/datovka.pro
+++ datovka-4.3.1/datovka.pro
@@ -49,7 +49,6 @@ isEqual(QT_MAJOR_VERSION, $${REQUIRED_MA
--- datovka-4.5.0.orig/datovka.pro
+++ datovka-4.5.0/datovka.pro
@@ -61,7 +61,6 @@ isEqual(QT_MAJOR_VERSION, $${REQUIRED_MA
#LIBISDS_PREFIX = "$$HOME/third_party/built"
DEFINES += \
@ -10,7 +10,7 @@ Index: datovka-4.3.1/datovka.pro
VERSION=\\\"$${VERSION}\\\"
unix:!macx {
@@ -98,12 +97,6 @@ unix:!macx {
@@ -110,12 +109,6 @@ unix:!macx {
localisation.files += locale/datovka_cs.qm \
locale/datovka_en.qm
@ -23,21 +23,30 @@ Index: datovka-4.3.1/datovka.pro
DEFINES += DATADIR=\\\"$$DATADIR\\\" \
PKGDATADIR=\\\"$$PKGDATADIR\\\" \
LOCALE_INST_DIR="\"\\\"$${LOCALE_INST_DIR}\\\"\"" \
@@ -126,8 +119,11 @@ unix:!macx {
@@ -133,16 +126,19 @@ unix:!macx {
icon64 \
icon128 \
icon256 \
- localisation \
- additional
+ localisation
}
}
-QMAKE_CXXFLAGS = \
QMAKE_CXXFLAGS = \
- -g -O0 -std=c++11 \
+QMAKE_CXXFLAGS += \
+ -g -std=c++11 $$(CXXFLAGS) \
+ -Wall -Wextra -pedantic
-Wall -Wextra -pedantic \
-Isrc/views
+QMAKE_CFLAGS += \
+ -g $$(CFLAGS) \
-Wall -Wextra -pedantic
+ -Wall -Wextra -pedantic
+
INCLUDEPATH += \
@@ -198,12 +194,6 @@ macx {
src
@@ -211,15 +207,8 @@ macx {
locale/datovka_en.qm
localisation.files += locale/qtbase_cs.qm
@ -48,5 +57,9 @@ Index: datovka-4.3.1/datovka.pro
- ChangeLog
-
QMAKE_BUNDLE_DATA +=\
localisation \
additional
- localisation \
- additional
+ localisation
}
win32 {

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Feb 16 18:29:42 UTC 2016 - tchvatal@suse.com
- Version update to 4.5.0:
* various backend updates
* various bugs fixed
* qt 5.3 required now
- Rebase patch:
* datovka-fix-pro.patch
-------------------------------------------------------------------
Tue Jan 5 09:30:36 UTC 2016 - tchvatal@suse.com

View File

@ -17,7 +17,7 @@
Name: datovka
Version: 4.4.3
Version: 4.5.0
Release: 0
Summary: Library to access Czech eGov system \"Datove schranky\"
License: LGPL-2.0+
@ -57,6 +57,7 @@ sed -i \
%{name}.pro
%build
lrelease-qt5 datovka.pro
CFLAGS="%{optflags}" \
%qmake5 PREFIX=%{_prefix} DISABLE_VERSION_CHECK_BY_DEFAULT=1
make %{?_smp_mflags}