rpms/kmymoney2/devel kmymoney2.spec,1.28,1.29

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1077

Modified Files:
	kmymoney2.spec 
Log Message:
* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraprojectd.org> 0.8.8-3
- gcc43 patch (#434398)
- multiarch conflicts, -libs subpkg (#341821)



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- kmymoney2.spec	19 Feb 2008 21:21:54 -0000	1.28
+++ kmymoney2.spec	22 Feb 2008 19:33:23 -0000	1.29
@@ -7,10 +7,15 @@
 %define ofx_deps libofx-devel opensp-devel
 %endif
 
+%if 0%{?fedora} > 8
+# make -libs subpkg
+%define libs 1
+%endif
+
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.8
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2+
 Url:	 http://kmymoney2.sourceforge.net/
@@ -18,10 +23,21 @@
 Source0: http://downloads.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+Patch1: kmymoney2-0.8.8-gcc43.patch
+
 # Upstream (and rpmforge) call this kmymoney, so we'll get ready.
 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 +55,23 @@
 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}
+# helps multilib upgrades
+Obsoletes: %{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}.
 
@@ -52,6 +79,8 @@
 %prep
 %setup -q -n kmymoney2-%{version}
 
+%patch1 -p1 -b .gcc43
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -102,8 +131,15 @@
 %{?_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 +147,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 +165,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 +174,12 @@
 %endif
 %{_mandir}/man?/*
 
+%if 0%{?libs}
+%files libs
+%defattr(-,root,root,-)
+%endif
+%{_libdir}/lib*.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/*
@@ -150,6 +191,10 @@
 
 
 %changelog
+* Fri Feb 22 2008 Rex Dieter <rdieter at fedoraprojectd.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