rpms/kmymoney2/EL-5 .cvsignore, 1.9, 1.10 kmymoney2.spec, 1.19, 1.20 sources, 1.8, 1.9

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8876

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Wed Mar 26 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.9-1
- kmymoney2-0.8.9
- --disable-kbanking (requires aqbanking,kbanking fix/update)
- drop multilib upgrade hack



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	21 Dec 2007 20:21:20 -0000	1.9
+++ .cvsignore	15 Apr 2008 20:09:49 -0000	1.10
@@ -1,3 +1 @@
-clog
-kmymoney2-0.8.7.tar.gz
-kmymoney2-0.8.8.tar.bz2
+kmymoney2-0.8.9.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/kmymoney2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kmymoney2.spec	21 Dec 2007 20:21:20 -0000	1.19
+++ kmymoney2.spec	15 Apr 2008 20:09:49 -0000	1.20
@@ -1,5 +1,6 @@
 
-%define _enable_kbanking --enable-kbanking
+# FIXME/TODO: Requires aqbanking (v3?) + latest kmm_kbanking plugin.  arg. -- Rex
+#define _enable_kbanking --enable-kbanking
 %define _enable_ofxbanking --enable-ofxbanking --enable-ofxplugin 
 %define ofx_deps libofx-devel, openjade-devel >= 1.3.2
 
@@ -7,9 +8,14 @@
 %define ofx_deps libofx-devel opensp-devel
 %endif
 
+%if 0%{?fedora} > 8 || 0%{?rhel} > 3
+# make -libs subpkg
+%define libs 1
+%endif
+
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.8.8
+Version: 0.8.9
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -22,6 +28,15 @@
 Obsoletes: kmymoney < %{version}-%{release}
 Provides:  kmymoney = %{version}-%{release}
 
+%if 0%{?libs}
+Requires: %{name}-libs = %{version}-%{release}
+%else
+Obsoletes: %{name}-libs < %{version}-%{release}
+Provides:  %{name}-libs = %{version}-%{release}
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+%endif
+
 %{?_enable_kbanking:BuildRequires: kbanking-devel qbanking-devel}
 BuildRequires: gettext
 BuildRequires: ghostscript
@@ -39,12 +54,21 @@
 Windows-based finance software.  We are a full double-entry accounting
 software package, for personal or small-business use.
 
+%if 0%{?libs}
+%package libs
+Summary: %{name} runtime libraries
+Group:   System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+%endif
+
 %package devel
 Summary: Development files for %{name}
 Group:   Development/Libraries
 Obsoletes: kmymoney-devel < %{version}-%{release}
 Provides:  kmymoney-devel = %{version}-%{release}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 %description devel
 %{summary}.
 
@@ -102,8 +126,14 @@
 %{?_with_check:make check }
 
 
+%if 0%{?libs}
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+%endif
+
 %post
-/sbin/ldconfig
+%{!?libs:/sbin/ldconfig}
 for icon_theme in hicolor locolor ; do
   touch --no-create %{_datadir}/icons/${icon_theme} ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
@@ -111,7 +141,7 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-/sbin/ldconfig 
+%{!?libs:/sbin/ldconfig}
 for icon_theme in hicolor locolor ; do
   touch --no-create %{_datadir}/icons/${icon_theme} ||:
   gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
@@ -129,7 +159,6 @@
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
-%{_libdir}/lib*.so.*
 %if "%{?_enable_ofxbanking:1}" == "1"
 %{_libdir}/kde3/kmm_ofximport.*
 %endif
@@ -139,6 +168,12 @@
 %endif
 %{_mandir}/man?/*
 
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/lib*.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
@@ -150,6 +185,18 @@
 
 
 %changelog
+* Wed Mar 26 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.9-1
+- kmymoney2-0.8.9
+- --disable-kbanking (requires aqbanking,kbanking fix/update)
+- drop multilib upgrade hack
+
+* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.8-3
+- gcc43 patch (#434398)
+- multiarch conflicts, -libs subpkg (#341821)
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.8.8-2
+- Autorebuild for GCC 4.3
+
 * Wed Dec 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.8-1
 - kmymoney2-0.8.8
 - --enable-kbanking


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Dec 2007 20:21:20 -0000	1.8
+++ sources	15 Apr 2008 20:09:49 -0000	1.9
@@ -1 +1 @@
-3b31f026b6065ce65a1948fb91e804d0  kmymoney2-0.8.8.tar.bz2
+1f0c412f88b9344c18562fbca3c10717  kmymoney2-0.8.9.tar.bz2