- updated to 4.8.0 (supports aqbanking 5.6 and libalkimia 4.3.2)

- updated desktop patch
- removed outdated fr_translation patch
- added man patch (restores man installation)

diff --git a/kmymoney2-desktop.patch b/kmymoney2-desktop.patch
index 04c6a3cd28b0a94a93f1a6b2dcf7ee37baece2aa..2277a1f602b39805c80351ac76751a28708c12d1 100644 (file)
--- a/kmymoney2-desktop.patch
+++ b/kmymoney2-desktop.patch
@@ -1,8 +1,9 @@
---- kmymoney-4.6.0/kmymoney/kmymoney.desktop~  2011-08-09 07:48:32.000000000 +0200
-+++ kmymoney-4.6.0/kmymoney/kmymoney.desktop   2011-09-22 08:56:19.820372194 +0200
-@@ -79,4 +55,4 @@
+--- kmymoney-4.8.0/kmymoney/kmymoney.desktop.orig      2016-06-14 21:16:15.571035117 +0200
++++ kmymoney-4.8.0/kmymoney/kmymoney.desktop   2017-02-09 20:51:56.676477194 +0100
+@@ -109,5 +109,5 @@
  Type=Application
  X-DocPath=kmymoney/index.html
  Icon=kmymoney
 -Categories=Office;Finance;
-+Categories=Qt;KDE;Utility;
++Categories=Qt;KDE;Office;Finance;
+ StartupWMClass=Kmymoney

diff --git a/kmymoney2-fr_translation.patch b/kmymoney2-fr_translation.patch
deleted file mode 100644 (file)
index dfc20ec..0000000
--- a/kmymoney2-fr_translation.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- kmymoney-4.6.0/doc-translations/CMakeLists.txt~    2011-08-09 07:49:40.000000000 +0200
-+++ kmymoney-4.6.0/doc-translations/CMakeLists.txt     2011-09-22 10:14:46.249075761 +0200
-@@ -1,5 +1,5 @@
- add_subdirectory( es_kmymoney/kmymoney )
--add_subdirectory( fr_kmymoney/kmymoney )
-+#add_subdirectory( fr_kmymoney/kmymoney )
- add_subdirectory( it_kmymoney/kmymoney )
- add_subdirectory( pt_kmymoney/kmymoney )
- add_subdirectory( pt_BR_kmymoney/kmymoney )

diff --git a/kmymoney2-man.patch b/kmymoney2-man.patch
new file mode 100644 (file)
index 0000000..a15eae1
--- /dev/null
+++ b/kmymoney2-man.patch
@@ -0,0 +1,5 @@
+--- kmymoney-4.8.0/doc/en_US/CMakeLists.txt.orig       2016-06-14 21:17:17.537030935 +0200
++++ kmymoney-4.8.0/doc/en_US/CMakeLists.txt    2017-02-09 21:21:41.597329522 +0100
+@@ -1 +1,2 @@
+ kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmymoney )
++kde4_create_manpage(man-kmymoney.1.docbook 1 INSTALL_DESTINATION ${MAN_INSTALL_DIR})

diff --git a/kmymoney2.spec b/kmymoney2.spec
index aad5befa767674b1e9d348ac19737de75663ab0a..7d8f0dc0ddfd93f5922b486abc7a205dcda6beae 100644 (file)
--- a/kmymoney2.spec
+++ b/kmymoney2.spec
@@ -1,7 +1,7 @@
 #
 # TODO: - do something with rest of templates
-#      - drop fr_translation.patch when french translation is fixed
 #      - consider rename to kmymoney
+#      - sqlcipher plugin (BR: sqlcipher-devel + qsqlite sources)
 #
 # Conditional build:
 %bcond_without kbanking        # kbanking support
@@ -10,32 +10,42 @@
 Summary:       Personal finance application similar to Microsoft Money
 Summary(pl.UTF-8):     Program do finansów osobistych, podobny do Microsoft Money
 Name:          kmymoney2
-Version:       4.6.4
-Release:       4
+Version:       4.8.0
+Release:       1
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://downloads.sourceforge.net/kmymoney2/%{real_name}-%{version}.tar.xz
-# Source0-md5: 0674b9ef7ed5447e6a88b56a834389f8
+# Source0-md5: a1cc5f862493f1abc1f660ffed4f1711
 URL:           http://kmymoney2.sourceforge.net/
 Patch0:                %{name}-desktop.patch
-Patch1:                %{name}-fr_translation.patch
-%{?with_kbanking:BuildRequires:        aqbanking-devel >= 5.0.0}
+Patch1:                %{name}-man.patch
+%{?with_kbanking:BuildRequires:        aqbanking-devel >= 5.5.1}
 BuildRequires: automoc4
-BuildRequires: cmake
-BuildRequires: gpgme-devel
-%{?with_kbanking:BuildRequires:        gwenhywfar-devel >= 4.0.0}
-%{?with_kbanking:BuildRequires:        gwenhywfar-gui-qt4-devel >= 4.0.0}
-BuildRequires: kde4-kdelibs-devel
-BuildRequires: kde4-kdepimlibs-devel
-BuildRequires: libalkimia-devel >= 4.3.1
-BuildRequires: libassuan-devel
+BuildRequires: boost-devel >= 1.33.1
+BuildRequires: cmake >= 2.8.9
+BuildRequires: doxygen
+BuildRequires: gmp-devel
+# included in kde4-kdelibs-devel
+#BuildRequires:        gpgme-c++-devel
+#BuildRequires:        gpgme-qt4-devel
+%{?with_kbanking:BuildRequires:        gwenhywfar-devel >= 4.13.0}
+%{?with_kbanking:BuildRequires:        gwenhywfar-gui-cpp-devel >= 4.13.0}
+%{?with_kbanking:BuildRequires:        gwenhywfar-gui-qt4-devel >= 4.13.0}
+BuildRequires: kde4-kdelibs-devel >= 4.6.0
+BuildRequires: kde4-kdepimlibs-devel >= 4.6.0
+BuildRequires: libalkimia-devel >= 4.3.2
 BuildRequires: libical-c++-devel
 BuildRequires: libofx-devel >= 0.9.4
-BuildRequires: libxml++2-devel
-BuildRequires: pth-devel
-BuildRequires: qt4-build
-BuildRequires: rpmbuild(macros) >= 1.600
-BuildRequires: soprano-devel
+BuildRequires: pkgconfig
+BuildRequires: qt4-build >= 4
+BuildRequires: rpmbuild(macros) >= 1.606
+BuildRequires: shared-mime-info
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+Requires:      kde4-kdelibs >= 4.6.0
+Requires:      kde4-kdepimlibs >= 4.6.0
+Requires:      libalkimia >= 4.3.2
+Requires:      libofx >= 0.9.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -57,6 +67,7 @@ Summary(ru.UTF-8):    Хедеры для компилляции программ k
 Summary(uk.UTF-8):     Хедери для компіляції програм kmymoney2
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      kde4-kdelibs-devel >= 4.6.0
 
 %description devel
 This package contains header files for kMyMoney2.
@@ -82,6 +93,10 @@ Summary:     KBanking plugin for KMyMoney2
 Summary(pl.UTF-8):     Wtyczka KBanking dla KMyMoney2
 Group:         X11/Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      aqbanking >= 5.5.1
+Requires:      gwenhywfar >= 4.13.0
+Requires:      gwenhywfar-gui-cpp >= 4.13.0
+Requires:      gwenhywfar-gui-qt4 >= 4.13.0
 
 %description kbanking
 KBanking plugin for KMyMoney2.
@@ -98,7 +113,8 @@ Wtyczka KBanking dla KMyMoney2.
 install -d build
 cd build
 %cmake .. \
-       %{?with_kbanking:-DENABLE_KBANKING="on"}
+       %{?with_kbanking:-DENABLE_KBANKING=ON} \
+       -DUSE_QT_DESIGNER=ON
 
 %{__make}
 
@@ -122,6 +138,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{real_name}.lang
 %defattr(644,root,root,755)
+%doc AUTHORS BUGS README.Fileformats TODO
 %attr(755,root,root) %{_bindir}/kmymoney
 %attr(755,root,root) %{_libdir}/libkmm_kdchart.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkmm_kdchart.so.4
@@ -131,16 +148,32 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libkmm_plugin.so.4
 %attr(755,root,root) %{_libdir}/libkmm_widgets.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkmm_widgets.so.4
+%attr(755,root,root) %{_libdir}/libkmm_payeeidentifier.so
+%attr(755,root,root) %{_libdir}/libpayeeidentifier_iban_bic.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpayeeidentifier_iban_bic.so.4
+%attr(755,root,root) %{_libdir}/libpayeeidentifier_iban_bic_widgets.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpayeeidentifier_iban_bic_widgets.so.4
+%attr(755,root,root) %{_libdir}/libpayeeidentifier_nationalAccount.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libpayeeidentifier_nationalAccount.so.4
 %attr(755,root,root) %{_libdir}/kde4/kcm_kmm_icalendarexport.so
 %attr(755,root,root) %{_libdir}/kde4/kcm_kmm_printcheck.so
+%attr(755,root,root) %{_libdir}/kde4/kmm_csvexport.so
 %attr(755,root,root) %{_libdir}/kde4/kmm_csvimport.so
 %attr(755,root,root) %{_libdir}/kde4/kmm_icalendarexport.so
 %attr(755,root,root) %{_libdir}/kde4/kmm_ofximport.so
 %attr(755,root,root) %{_libdir}/kde4/kmm_printcheck.so
 %attr(755,root,root) %{_libdir}/kde4/kmm_reconciliationreport.so
+%attr(755,root,root) %{_libdir}/kde4/kmm_weboob.so
+%attr(755,root,root) %{_libdir}/kde4/konlinetasks_national.so
+%attr(755,root,root) %{_libdir}/kde4/konlinetasks_sepa.so
+%attr(755,root,root) %{_libdir}/kde4/payeeidentifier_iban_bic_delegates.so
+%attr(755,root,root) %{_libdir}/kde4/payeeidentifier_ibanbic_storageplugin.so
+%attr(755,root,root) %{_libdir}/kde4/payeeidentifier_nationalAccount_ui.so
+%attr(755,root,root) %{_libdir}/kde4/payeeidentifier_nationalaccount_storageplugin.so
 %dir %{_datadir}/apps/kmymoney
 %{_datadir}/apps/kmymoney/icons
 %{_datadir}/apps/kmymoney/html
+%{_datadir}/apps/kmymoney/ibanbicdata
 %{_datadir}/apps/kmymoney/misc
 %{_datadir}/apps/kmymoney/pics
 %dir %{_datadir}/apps/kmymoney/templates
@@ -176,46 +209,70 @@ rm -rf $RPM_BUILD_ROOT
 %lang(zh_TW) %{_datadir}/apps/kmymoney/templates/zh_TW
 %{_datadir}/apps/kmymoney/tips
 %{_datadir}/apps/kmymoney/kmymoneyui.rc
-%dir %{_datadir}/apps/kmm_csvimport
-%{_datadir}/apps/kmm_csvimport/kmm_csvimport.rc
-%dir %{_datadir}/apps/kmm_icalendarexport
-%{_datadir}/apps/kmm_icalendarexport/kmm_icalendarexport.rc
-%dir %{_datadir}/apps/kmm_ofximport
-%{_datadir}/apps/kmm_ofximport/kmm_ofximport.rc
-%dir %{_datadir}/apps/kmm_printcheck
-%{_datadir}/apps/kmm_printcheck/check_template.html
-%{_datadir}/apps/kmm_printcheck/check_template_green_linen.html
-%{_datadir}/apps/kmm_printcheck/kmm_printcheck.rc
-%{_datadir}/config.kcfg/kmymoney.kcfg
+# ???
+%{_datadir}/apps/appdata/kmymoney.appdata.xml
+%{_datadir}/apps/kconf_update/kmymoney.upd
+%{_datadir}/apps/kmm_csvexport
+%{_datadir}/apps/kmm_csvimport
+%{_datadir}/apps/kmm_icalendarexport
+%{_datadir}/apps/kmm_ofximport
+%{_datadir}/apps/kmm_printcheck
+%{_datadir}/apps/kmm_weboob
 %{_datadir}/config/csvimporterrc
+%{_datadir}/config.kcfg/kmymoney.kcfg
 %{_datadir}/mime/packages/x-kmymoney.xml
-%{_iconsdir}/hicolor/*/apps/kmymoney.png
-%{_iconsdir}/hicolor/*/mimetypes/kmy.png
-%{_desktopdir}/kde4/kmymoney.desktop
+%dir %{_datadir}/kde4/services/ibanbicdata
+%{_datadir}/kde4/services/ibanbicdata/germany.desktop
 %{_datadir}/kde4/services/kcm_kmm_icalendarexport.desktop
 %{_datadir}/kde4/services/kcm_kmm_printcheck.desktop
+%{_datadir}/kde4/services/kmm_csvexport.desktop
 %{_datadir}/kde4/services/kmm_csvimport.desktop
 %{_datadir}/kde4/services/kmm_icalendarexport.desktop
 %{_datadir}/kde4/services/kmm_kbanking.desktop
 %{_datadir}/kde4/services/kmm_ofximport.desktop
 %{_datadir}/kde4/services/kmm_printcheck.desktop
 %{_datadir}/kde4/services/kmm_reconciliationreport.desktop
-%{_datadir}/kde4/servicetypes/kmymoneyimporterplugin.desktop
-%{_datadir}/kde4/servicetypes/kmymoneyplugin.desktop
+%{_datadir}/kde4/services/kmm_weboob.desktop
+%{_datadir}/kde4/services/kmymoney-ibanbic-delegate.desktop
+%{_datadir}/kde4/services/kmymoney-ibanbic-storageplugin.desktop
+%{_datadir}/kde4/services/kmymoney-nationalaccount-delegate.desktop
+%{_datadir}/kde4/services/kmymoney-nationalaccount-storageplugin.desktop
+%{_datadir}/kde4/services/kmymoney-nationalorders.desktop
+%{_datadir}/kde4/services/kmymoney-nationalordersui.desktop
+%{_datadir}/kde4/services/kmymoney-nationalstorageplugin.desktop
+%{_datadir}/kde4/services/kmymoney-sepaorders.desktop
+%{_datadir}/kde4/services/kmymoney-sepaordersui.desktop
+%{_datadir}/kde4/services/kmymoney-sepastorageplugin.desktop
+%{_datadir}/kde4/servicetypes/ibanbicdata.desktop
+%{_datadir}/kde4/servicetypes/kmymoney-importerplugin.desktop
+%{_datadir}/kde4/servicetypes/kmymoney-nationalaccountnumberplugin.desktop
+%{_datadir}/kde4/servicetypes/kmymoney-onlinetaskui.desktop
+%{_datadir}/kde4/servicetypes/kmymoney-payeeidentifierdelegate.desktop
+%{_datadir}/kde4/servicetypes/kmymoney-plugin.desktop
+%{_datadir}/kde4/servicetypes/kmymoney-sqlstorageplugin.desktop
+%{_desktopdir}/kde4/kmymoney.desktop
+%{_iconsdir}/hicolor/*x*/apps/kmymoney.png
+%{_iconsdir}/hicolor/*x*/mimetypes/application-x-kmymoney.png
 %{_mandir}/man1/kmymoney.1*
 
+# TODO: QtDesigner-kmymoney
+%attr(755,root,root) %{_libdir}/qt4/plugins/designer/kmymoneywidgets.so
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libkmm_kdchart.so
 %attr(755,root,root) %{_libdir}/libkmm_mymoney.so
 %attr(755,root,root) %{_libdir}/libkmm_plugin.so
 %attr(755,root,root) %{_libdir}/libkmm_widgets.so
+%attr(755,root,root) %{_libdir}/libpayeeidentifier_iban_bic.so
+%attr(755,root,root) %{_libdir}/libpayeeidentifier_iban_bic_widgets.so
+%attr(755,root,root) %{_libdir}/libpayeeidentifier_nationalAccount.so
 %{_includedir}/kmymoney
 
 %if %{with kbanking}
 %files kbanking
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/kde4/kmm_kbanking.so
-%dir %{_datadir}/apps/kmm_kbanking
-%{_datadir}/apps/kmm_kbanking/kmm_kbanking.rc
+%{_datadir}/apps/kmm_kbanking
+%{_datadir}/config.kcfg/kbanking.kcfg
 %endif