Hello community, here is the log from the commit of package kmymoney for openSUSE:Factory checked in at Tue Oct 18 14:18:56 CEST 2011.
-------- --- openSUSE:Factory/kmymoney/kmymoney.changes 2011-09-23 02:06:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/kmymoney/kmymoney.changes 2011-10-18 09:47:28.000000000 +0200 @@ -1,0 +2,20 @@ +Tue Oct 18 07:47:06 UTC 2011 - co...@suse.com + +- change lang and doc subpackages to recommends + +------------------------------------------------------------------- +Thu Oct 13 18:16:50 UTC 2011 - ctri...@opensuse.org + +- Allow import of gnucash files (bnc#723728) + +------------------------------------------------------------------- +Fri Sep 16 13:00:21 UTC 2011 - toddrme2...@gmail.com + +- Split translation package (fix for RPMLINT warning) +- Split documentation package (fix for RPMLINT warning) +- Changed descriptions +- Added pth gpgme backend support +- Enabled building of HTML handbook +- Cleaned up spec file formatting + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- minmem New: ---- bnc723728_fix_gnucash_import.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmymoney.spec ++++++ --- /var/tmp/diff_new_pack.0ex7qX/_old 2011-10-18 14:18:49.000000000 +0200 +++ /var/tmp/diff_new_pack.0ex7qX/_new 2011-10-18 14:18:49.000000000 +0200 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: kmymoney @@ -25,37 +24,34 @@ Summary: A Personal Finance Manager for KDE 4 Url: http://kmymoney2.sourceforge.net/ Group: Productivity/Office/Finance -Source0: http://prdownloads.sourceforge.net/kmymoney2/%{name}-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# Source0: http://prdownloads.sourceforge.net/kmymoney2/%{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM bnc723728_fix_gnucash_import.diff [bnc#723728] +Patch0: bnc723728_fix_gnucash_import.diff BuildRequires: aqbanking-devel BuildRequires: boost-devel -BuildRequires: cmake BuildRequires: fdupes BuildRequires: glib2-devel BuildRequires: glibmm2-devel BuildRequires: gmp-devel -BuildRequires: gwenhywfar-devel BuildRequires: libalkimia-devel BuildRequires: libgpgme-devel BuildRequires: libical-devel -BuildRequires: libkde4-devel BuildRequires: libkdepimlibs4-devel BuildRequires: libofx-devel BuildRequires: libxml2-devel +BuildRequires: libpth-devel BuildRequires: libxml++-devel -BuildRequires: shared-mime-info -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif +Recommends: %{name}-lang = %{version} +Recommends: %{name}-doc = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_pimlibs_requires %kde4_runtime_requires Requires(post): shared-mime-info Requires(postun): shared-mime-info %description -KMyMoney is a personal finance manager. - -KMyMoney is the Personal Finance Manager for KDE4. It operates +KMyMoney is a Personal Finance Manager for KDE4. It operates similar to Quicken, supports various account types, categorization of expenses, multiple currencies, online banking support via QIF, OFX and HBCI, budgeting and a rich set of reports. @@ -67,13 +63,24 @@ Requires: %{name} = %{version} %description devel -The development files for KMyMoney. +Development files and headers need to build software using KMyMoney. +%package doc +License: GPLv2 or GPLv3 +Summary: Documentation for KMyMoney +Group: Productivity/Office/Finance +Requires: %{name} = %{version} + +%description doc +Documentation and help files for KMyMoney. + +%lang_package %prep %setup -q +%patch0 %build -%cmake_kde4 -d build +%cmake_kde4 -d build -- -DUSE_HTML_HANDBOOK=YES %make_jobs %install @@ -87,53 +94,34 @@ %post /sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +%{_kde4_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : %postun /sbin/ldconfig -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +%{_kde4_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : %clean rm -rf %{buildroot} -%files -f %{name}.lang +%files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog ChangeLog.original README.Fileformats -%{_kde4_bindir}/kmymoney -%{_kde4_modulesdir}/kcm_kmm_icalendarexport.so -%{_kde4_modulesdir}/kcm_kmm_printcheck.so -%{_kde4_modulesdir}/kmm_csvimport.so -%{_kde4_modulesdir}/kmm_icalendarexport.so -%{_kde4_modulesdir}/kmm_kbanking.so -%{_kde4_modulesdir}/kmm_ofximport.so -%{_kde4_modulesdir}/kmm_printcheck.so -%{_kde4_modulesdir}/kmm_reconciliationreport.so -%{_kde4_libdir}/libkmm_kdchart.so.* -%{_kde4_libdir}/libkmm_mymoney.so.* -%{_kde4_libdir}/libkmm_plugin.so.* -%{_kde4_libdir}/libkmm_widgets.so.* +%{_datadir}/mime/packages/x-kmymoney.xml %{_kde4_applicationsdir}/kmymoney.desktop +%{_kde4_appsdir}/kmm_*/ +%{_kde4_appsdir}/kmymoney/ +%{_kde4_bindir}/kmymoney +%config %{_kde4_configkcfgdir}/kmymoney.kcfg %{_kde4_iconsdir}/*/*/*/kmy.png %{_kde4_iconsdir}/*/*/*/kmymoney.png -%{_kde4_appsdir}/kmm_csvimport/ -%{_kde4_appsdir}/kmm_icalendarexport/ -%{_kde4_appsdir}/kmm_kbanking/ -%{_kde4_appsdir}/kmm_ofximport/ -%{_kde4_appsdir}/kmm_printcheck/ -%{_kde4_appsdir}/kmymoney/ -%{_kde4_sharedir}/config.kcfg/kmymoney.kcfg -%{_kde4_servicesdir}/kcm_kmm_icalendarexport.desktop -%{_kde4_servicesdir}/kcm_kmm_printcheck.desktop -%{_kde4_servicesdir}/kmm_csvimport.desktop -%{_kde4_servicesdir}/kmm_icalendarexport.desktop -%{_kde4_servicesdir}/kmm_kbanking.desktop -%{_kde4_servicesdir}/kmm_ofximport.desktop -%{_kde4_servicesdir}/kmm_printcheck.desktop -%{_kde4_servicesdir}/kmm_reconciliationreport.desktop +%{_kde4_libdir}/libkmm_*.so.* +%doc %{_kde4_mandir}/man1/kmymoney.1%{ext_man} +%{_kde4_modulesdir}/kcm_kmm_*.so +%{_kde4_modulesdir}/kmm_*.so +%{_kde4_servicesdir}/kcm_kmm_*.desktop +%{_kde4_servicesdir}/kmm_*.desktop %{_kde4_servicetypesdir}/kmymoneyimporterplugin.desktop %{_kde4_servicetypesdir}/kmymoneyplugin.desktop -%{_kde4_mandir}/man1/kmymoney.1%{ext_man} -%{_datadir}/mime/packages/x-kmymoney.xml %files devel %defattr(-,root,root,-) @@ -143,4 +131,12 @@ %{_kde4_libdir}/libkmm_plugin.so %{_kde4_libdir}/libkmm_widgets.so +%files lang -f %{name}.lang +%defattr(-,root,root,-) +%exclude %{_kde4_htmldir} + +%files doc +%defattr(-,root,root,-) +%doc %{_kde4_htmldir} + %changelog ++++++ bnc723728_fix_gnucash_import.diff ++++++ --- kmymoney/converter/mymoneygncreader.cpp 2011/08/15 20:52:27 1247411 +++ kmymoney/converter/mymoneygncreader.cpp 2011/08/15 20:53:11 1247412 @@ -1267,6 +1267,7 @@ if (bAnonymize) setFileHideFactor(); //m_defaultPayee = createPayee (i18n("Unknown payee")); + MyMoneyFile::instance()->attachStorage(m_storage); MyMoneyFileTransaction ft; m_xr = new XmlReader(this); try { @@ -1277,6 +1278,7 @@ KMessageBox::error(0, i18n("Import failed:\n\n%1", e->what()), PACKAGE); qWarning("%s", qPrintable(e->what())); } // end catch + MyMoneyFile::instance()->detachStorage(m_storage); signalProgress(0, 1, i18n("Import complete")); // switch off progress bar delete m_xr; qDebug("Exiting gnucash importer"); ++++++ kmymoney-4.6.0.tar.bz2 ++++++ openSUSE:Factory/kmymoney/kmymoney-4.6.0.tar.bz2 /mounts/work_src_done/STABLE/kmymoney/kmymoney-4.6.0.tar.bz2 differ: char 3235618, line 12649 continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org