[kmymoney] 4.6.3-1

[Rex Dieter]

commit 93d5bdb3119ebe2a7509372a13243e0814ad2cec
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Sep 19 09:54:39 2012 -0500

    4.6.3-1
    
    - kmymoney-4.6.3
    - -libs: Requires: kdelibs4 ...
    - -doc subpkg

 .gitignore                      |    3 +--
 kmymoney-4.6.0-docbook_fr.patch |   12 ------------
 kmymoney.spec                   |   39 ++++++++++++++++++++++++---------------
 sources                         |    2 +-
 4 files changed, 26 insertions(+), 30 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 916bd9f..74bb6f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/kmymoney-4.5.3.tar.bz2
 /kmymoney-4.6.1.tar.bz2
-/kmymoney-4.6.2.tar.bz2
+/kmymoney-4.6.3.tar.bz2
diff --git a/kmymoney.spec b/kmymoney.spec
index c5ee4ae..c9d02ea 100644
--- a/kmymoney.spec
+++ b/kmymoney.spec
@@ -1,18 +1,14 @@
 
 Summary: Personal finance 
 Name:    kmymoney
-Version: 4.6.2
-Release: 4%{?dist}
+Version: 4.6.3
+Release: 1%{?dist}
 
 # kmm itself is GPLv2+ 
 # bundled kdchart is GPLv2 or GPLv3, but currently not using it
 License: GPLv2+
 Url:     http://kmymoney2.sourceforge.net/
-Group:   Applications/Productivity
 Source0: http://downloads.sourceforge.net/sourceforge/kmymoney2/kmymoney-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-
-Patch0: kmymoney-4.6.0-docbook_fr.patch
 
 ## upstreamable patches
 
@@ -26,6 +22,7 @@ BuildRequires: gettext
 BuildRequires: gpgme-devel
 BuildRequires: gmp-devel
 BuildRequires: kdchart-devel
+BuildRequires: kdelibs4-devel >= 4.7.0
 BuildRequires: kdepimlibs-devel
 BuildRequires: pkgconfig(aqbanking) >= 5.0
 BuildRequires: pkgconfig(libalkimia)
@@ -55,29 +52,35 @@ The ultimate objectives of KMyMoney are...
 
 %package libs
 Summary: Run-time libraries for %{name}
-Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
+# doesn't seem to require or use much of kde-runtime yet, so let's try
+# just a minimalistic versioned kdelibs dep for now -- rex
+Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}}
 Obsoletes: kmymoney2-libs < 2
 %description libs
 %{summary}.
 
 %package devel
 Summary: Development files for %{name}
-Group:   Development/Libraries
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: kdelibs4-devel
 Obsoletes: kmymoney2-devel < 2
 %description devel
 %{summary}.
 
+%package doc
+Summary: Application handbook, documentation, translations
+# for upgrade path
+Obsoletes: kmymoney < 4.6.3
+Requires:  %{name} = %{version}-%{release}
+BuildArch: noarch
+%description doc
+%{summary}.
+
 
 %prep
 %setup -q -n kmymoney-%{version}
 
-%if "%{?_kde4_version}" < "4.7.0"
-%patch0 -p1
-%endif
-
 ## kdchart munging begin
 sed -i.kdchart -e 's|ADD_SUBDIRECTORY( libkdchart )|#ADD_SUBDIRECTORY( libkdchart )|' CMakeLists.txt
 sed -i.kdchart -e 's|kmm_kdchart|kdchart|' kmymoney/CMakeLists.txt
@@ -130,12 +133,12 @@ update-desktop-database -q &> /dev/null ||:
 update-mime-database %{_kde4_datadir}/mime &> /dev/null ||:
 
 %files -f kmymoney.lang
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING TODO
 %doc README.Fileformats README.ofx
 %{_kde4_bindir}/kmymoney
 %{_kde4_appsdir}/kmymoney/
 %{_kde4_appsdir}/kmm_*/
+%{_kde4_configdir}/csvimporterrc
 %{_kde4_datadir}/applications/kde4/kmymoney.desktop
 %{_kde4_datadir}/config.kcfg/kmymoney.kcfg
 %{_kde4_datadir}/kde4/services/*.desktop
@@ -150,22 +153,28 @@ update-mime-database %{_kde4_datadir}/mime &> /dev/null ||:
 %postun libs -p /sbin/ldconfig
 
 %files libs
-%defattr(-,root,root,-)
 %{_kde4_libdir}/libkmm_mymoney.so.4*
 %{_kde4_libdir}/libkmm_plugin.so.4*
 %{_kde4_libdir}/libkmm_widgets.so.4*
 
 %files devel
-%defattr(-,root,root,-)
 %{_kde4_includedir}/kmymoney/
 %{_kde4_libdir}/libkmm_*.so
 
+%files doc -f kmymoney.lang
+
 
 %clean
 rm -rf %{buildroot}
 
 
 %changelog
+* Tue Sep 11 2012 Rex Dieter <rdieter at fedoraproject.org>
+- 4.6.3-1
+- kmymoney-4.6.3 
+- -libs: Requires: kdelibs4 ...
+- -doc subpkg
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.6.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 43e9b5b..95b16df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5659706cbe85416cbabfa000a29b19b5  kmymoney-4.6.2.tar.bz2
+756bc76d182aa7cbac7033f4469b6687  kmymoney-4.6.3.tar.bz2