diff --git a/datovka-3.1.tar.gz b/datovka-3.1.tar.gz deleted file mode 100644 index 76e6695..0000000 --- a/datovka-3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fe2e1698320c87ef305dbb040827612a9231da90f6411052f8e3d3ca4343e8fb -size 687994 diff --git a/datovka-4.1.0-src.tar.xz b/datovka-4.1.0-src.tar.xz new file mode 100644 index 0000000..41452ef --- /dev/null +++ b/datovka-4.1.0-src.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21bbbb7c2a49a765ff1c1d5e8ff9ca79b47cd0ec908c7b86321aaf658b2419fb +size 580440 diff --git a/datovka-fix-pro.patch b/datovka-fix-pro.patch new file mode 100644 index 0000000..85d9f2c --- /dev/null +++ b/datovka-fix-pro.patch @@ -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 diff --git a/datovka.changes b/datovka.changes index e3ab043..05c0687 100644 --- a/datovka.changes +++ b/datovka.changes @@ -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 diff --git a/datovka.spec b/datovka.spec index 7d33baf..4ae14a1 100644 --- a/datovka.spec +++ b/datovka.spec @@ -1,7 +1,7 @@ # # 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 # 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 -Version: 3.1 +Version: 4.1.0 Release: 0 Summary: Library to access Czech eGov system \"Datove schranky\" License: LGPL-2.0+ Group: Development/Libraries/Python -Url: http://labs.nic.cz/page/969/datovka/ -Source0: http://www.nic.cz/public_media/datove_schranky/releases/src/%{name}-%{version}.tar.gz -BuildRequires: dejavu -BuildRequires: fdupes -BuildRequires: python -BuildRequires: python-dslib >= 3.1 -BuildRequires: python-gtk -BuildRequires: python-openssl -BuildRequires: python-reportlab -BuildRequires: python-setuptools -BuildRequires: python-sqlalchemy -BuildRequires: update-desktop-files +Url: https://labs.nic.cz/cs/nova-datovka.html +Source0: https://secure.nic.cz/files/datove_schranky/%{version}/%{name}-%{version}-src.tar.xz +# PATCH-FIX-UPSTREAM: remove some issues with current .pro file +Patch0: datovka-fix-pro.patch +BuildRequires: libqt5-linguist +BuildRequires: openssl-devel +BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Gui) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Network) >= 5.2.0 +BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0 +BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0 +BuildRequires: pkgconfig(libisds) Requires: dejavu -Requires: python-dslib >= 3.1 -Requires: python-gtk -Requires: python-openssl -Requires: python-reportlab -Requires: python-setuptools -Requires: python-sqlalchemy +Requires: libqt5_sql_backend +Recommends: %{name}-lang +# Included inside with different approach +Obsoletes: python-dslib BuildRoot: %{_tmppath}/%{name}-%{version}-build -%{py_requires} %description A library for accessing ISDS (Informační system datovych schranek/ @@ -57,41 +50,35 @@ Data Box Information System) SOAP services as defined in Czech ISDS Act %{?lang_package} %prep -%setup -q - +%setup -q -c %{name} +%patch0 -p1 sed -i \ - -e 's:Office:Office;Network;Email;:' \ - %{name}.desktop + -e 's:lrelease:lrelease-qt5:g' \ + %{name}.pro %build -python setup.py build +CFLAGS="%{optflags}" \ +%qmake5 PREFIX=%{_prefix} +make %{?_smp_mflags} %install -python setup.py install --prefix=%{_prefix} --optimize=2 --root=%{buildroot} -%fdupes %{buildroot} -%find_lang %{name} +make install INSTALL_ROOT=%{buildroot} -for file in %{buildroot}%{python_sitelib}/%{name}/{_update_license,datovka}.py ; do - chmod a+x $file -done -chmod a-x %{buildroot}%{_datadir}/applications/%{name}.desktop -%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - -%files lang -f %{name}.lang -%defattr(-,root,root) +# fix desktop file +sed -i \ + -e 's:Office:Office;Network;Email;:g' \ + %{buildroot}%{_datadir}/applications/datovka.desktop +rm -rf %{buildroot}%{_datadir}/datovka/doc %files %defattr(-,root,root) -%doc LICENSE README.txt -%dir %{_datadir}/%{name} -%{python_sitelib}/* -%{_bindir}/%{name} -%{_datadir}/%{name}/* -%{_datadir}/applications/%{name}.desktop +%doc AUTHORS COPYING +%{_bindir}/datovka +%{_datadir}/applications/datovka.desktop +%dir %{_datadir}/datovka +%dir %{_datadir}/datovka/localisations/ +%{_datadir}/datovka/localisations/datovka_cs.qm +%{_datadir}/datovka/localisations/datovka_en.qm %{_datadir}/icons/hicolor/* %changelog