Accepting request 285808 from network

- Version bump to 4.1:
  * Complete rewrite under qt5
  * Should provide same usability, reffer to homepage for more info
- Various cleanups
- Add patch to fix building with respecting cflags/etc:
  * datovka-fix-pro.patch

OBS-URL: https://build.opensuse.org/request/show/285808
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/datovka?expand=0&rev=7
This commit is contained in:
Dominique Leuenberger 2015-02-13 07:35:29 +00:00 committed by Git OBS Bridge
parent c9c93cb27a
commit 52a359f750
5 changed files with 90 additions and 55 deletions

View File

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

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

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

38
datovka-fix-pro.patch Normal file
View File

@ -0,0 +1,38 @@
Index: datovka-4.1.0/datovka.pro
===================================================================
--- datovka-4.1.0.orig/datovka.pro
+++ datovka-4.1.0/datovka.pro
@@ -49,7 +49,6 @@ isEqual(QT_MAJOR_VERSION, $${REQUIRED_MA
#LIBISDS_PREFIX = "$$HOME/third_party/built"
DEFINES += \
- DEBUG=1 \
VERSION=\\\"$${VERSION}\\\"
unix:!macx {
@@ -124,8 +123,11 @@ unix:!macx {
}
}
-QMAKE_CXXFLAGS = \
- -g -O0 -std=c++11 \
+QMAKE_CXXFLAGS += \
+ -g -std=c++11 $$(CXXFLAGS) \
+ -Wall -Wextra -pedantic
+QMAKE_CFLAGS += \
+ -g $$(CFLAGS) \
-Wall -Wextra -pedantic
INCLUDEPATH += \
@@ -188,11 +190,6 @@ macx {
locale/datovka_en.qm
localisation.files += locale/qtbase_cs.qm
- additional.path = "Contents/Resources"
- additional.files = \
- AUTHORS \
- COPYING
-
QMAKE_BUNDLE_DATA +=\
localisation \
additional

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Feb 2 13:50:12 UTC 2015 - tchvatal@suse.com
- Version bump to 4.1:
* Complete rewrite under qt5
* Should provide same usability, reffer to homepage for more info
- Various cleanups
- Add patch to fix building with respecting cflags/etc:
* datovka-fix-pro.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 15 14:30:05 UTC 2014 - tchvatal@suse.com Mon Sep 15 14:30:05 UTC 2014 - tchvatal@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package datovka # spec file for package datovka
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,38 +16,31 @@
# #
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%else
BuildArch: noarch
%endif
Name: datovka Name: datovka
Version: 3.1 Version: 4.1.0
Release: 0 Release: 0
Summary: Library to access Czech eGov system \"Datove schranky\" Summary: Library to access Czech eGov system \"Datove schranky\"
License: LGPL-2.0+ License: LGPL-2.0+
Group: Development/Libraries/Python Group: Development/Libraries/Python
Url: http://labs.nic.cz/page/969/datovka/ Url: https://labs.nic.cz/cs/nova-datovka.html
Source0: http://www.nic.cz/public_media/datove_schranky/releases/src/%{name}-%{version}.tar.gz Source0: https://secure.nic.cz/files/datove_schranky/%{version}/%{name}-%{version}-src.tar.xz
BuildRequires: dejavu # PATCH-FIX-UPSTREAM: remove some issues with current .pro file
BuildRequires: fdupes Patch0: datovka-fix-pro.patch
BuildRequires: python BuildRequires: libqt5-linguist
BuildRequires: python-dslib >= 3.1 BuildRequires: openssl-devel
BuildRequires: python-gtk BuildRequires: pkgconfig(Qt5Core) >= 5.2.0
BuildRequires: python-openssl BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0
BuildRequires: python-reportlab BuildRequires: pkgconfig(Qt5Network) >= 5.2.0
BuildRequires: python-setuptools BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.2.0
BuildRequires: python-sqlalchemy BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0
BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
BuildRequires: pkgconfig(libisds)
Requires: dejavu Requires: dejavu
Requires: python-dslib >= 3.1 Requires: libqt5_sql_backend
Requires: python-gtk Recommends: %{name}-lang
Requires: python-openssl # Included inside with different approach
Requires: python-reportlab Obsoletes: python-dslib
Requires: python-setuptools
Requires: python-sqlalchemy
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{py_requires}
%description %description
A library for accessing ISDS (Informační system datovych schranek/ A library for accessing ISDS (Informační system datovych schranek/
@ -57,41 +50,35 @@ Data Box Information System) SOAPservices as defined in Czech ISDS Act
%{?lang_package} %{?lang_package}
%prep %prep
%setup -q %setup -q -c %{name}
%patch0 -p1
sed -i \ sed -i \
-e 's:Office:Office;Network;Email;:' \ -e 's:lrelease:lrelease-qt5:g' \
%{name}.desktop %{name}.pro
%build %build
python setup.py build CFLAGS="%{optflags}" \
%qmake5 PREFIX=%{_prefix}
make %{?_smp_mflags}
%install %install
python setup.py install --prefix=%{_prefix} --optimize=2 --root=%{buildroot} make install INSTALL_ROOT=%{buildroot}
%fdupes %{buildroot}
%find_lang %{name}
for file in %{buildroot}%{python_sitelib}/%{name}/{_update_license,datovka}.py ; do # fix desktop file
chmod a+x $file sed -i \
done -e 's:Office:Office;Network;Email;:g' \
chmod a-x %{buildroot}%{_datadir}/applications/%{name}.desktop %{buildroot}%{_datadir}/applications/datovka.desktop
%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop rm -rf %{buildroot}%{_datadir}/datovka/doc
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files lang -f %{name}.lang
%defattr(-,root,root)
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE README.txt %doc AUTHORS COPYING
%dir %{_datadir}/%{name} %{_bindir}/datovka
%{python_sitelib}/* %{_datadir}/applications/datovka.desktop
%{_bindir}/%{name} %dir %{_datadir}/datovka
%{_datadir}/%{name}/* %dir %{_datadir}/datovka/localisations/
%{_datadir}/applications/%{name}.desktop %{_datadir}/datovka/localisations/datovka_cs.qm
%{_datadir}/datovka/localisations/datovka_en.qm
%{_datadir}/icons/hicolor/* %{_datadir}/icons/hicolor/*
%changelog %changelog