Author: rdieter
Update of /cvs/extras/rpms/kmymoney2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17775
Modified Files:
.cvsignore kmymoney2.spec sources
Removed Files:
kmymoney2-0.8.1-qt335.patch
Log Message:
* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
- 0.8.2
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 10 Nov 2005 20:23:11 -0000 1.2
+++ .cvsignore 1 Jan 2006 10:39:42 -0000 1.3
@@ -1 +1 @@
-kmymoney2-0.8.1.tar.bz2
+kmymoney2-0.8.2.tar.bz2
Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/kmymoney2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmymoney2.spec 15 Dec 2005 15:08:28 -0000 1.4
+++ kmymoney2.spec 1 Jan 2006 10:39:42 -0000 1.5
@@ -1,35 +1,38 @@
%if "%{?fedora}" > "2"
%define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
+%endif
+
+%if "%{?fedora}" > "4"
+%define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel opensp-devel
%endif
%if "%{?rhel}" > "3"
%define _with_ofxbanking --with-ofxbanking
+%define ofx_deps libofx-devel, openjade-devel >= 1.3.2
%endif
Summary: Personal finance
Name: kmymoney2
-Version: 0.8.1
-Release: 4%{?dist}
+Version: 0.8.2
+Release: 1%{?dist}
License: GPL
Url:
http://kmymoney2.sourceforge.net/
Group: Applications/Productivity
-Source:
http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-0.8.1.tar.bz2
+Source:
http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# inspired by
http://article.gmane.org/gmane.comp.kde.kmymoney2.devel/3467
-Patch1: kmymoney2-0.8.1-qt335.patch
-
BuildRequires: desktop-file-utils
BuildRequires: automake
BuildRequires: libxml2-devel
BuildRequires: ghostscript
BuildRequires: kdelibs-devel >= 6:3.3
+%{?_with_ofxbanking:BuildRequires: %{ofx_deps}}
%{?_with_check:BuildRequires: cppunit-devel >= 1.8.0}
-%{?_with_ofxbanking:BuildRequires: openjade-devel >= 1.3.2, libofx-devel}
-## TODO
-#define _with_kbanking --with-kbanking
+## FIXME/TODO
%{?_with_kbanking:BuildRequires: aqbanking-devel >= 1.6.0}
@@ -49,8 +52,6 @@
%prep
%setup -q
-%patch1 -p1 -b .qt335
-
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -58,7 +59,8 @@
%configure \
--disable-rpath \
- --disable-debug --disable-warnings --disable-dependency-tracking --enable-final \
+ --disable-debug --disable-warnings \
+ --disable-dependency-tracking --enable-final \
%{?_with_kbanking: --enable-kbanking } %{!?_with_kbanking: --disable-kbanking } \
%{?_with_ofxbanking: --enable-ofxbanking --enable-ofxplugin } \
%{!?_with_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
@@ -109,18 +111,18 @@
%post
/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+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 ||:
+done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%postun
/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor ||:
-touch --no-create %{_datadir}/icons/locolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/locolor 2> /dev/null ||:
+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 ||:
+done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
@@ -130,8 +132,8 @@
%{_bindir}/kmymoney*
%{_datadir}/apps/kmymoney2
%{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/*
-%{_datadir}/icons/locolor/*/*
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/icons/locolor/*/*/*
%{_datadir}/mimelnk/*/*.desktop
%{_datadir}/service*/*.desktop
%{_libdir}/lib*.so.*
@@ -152,6 +154,19 @@
%changelog
+* Sat Dec 31 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.2-1
+- 0.8.2
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-7
+- gcc41 patch
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-6
+- cleanup ofx deps
+
+* Fri Dec 23 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-5
+- cleanup %%post
+- fc5 respin for new(er) libofx
+
* Mon Nov 14 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.1-4
- relax BR: kdelibs-devel to 3.3 (for aurora/sparc, #173133)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 10 Nov 2005 20:23:11 -0000 1.2
+++ sources 1 Jan 2006 10:39:42 -0000 1.3
@@ -1 +1 @@
-266fd411098cdce53d7db202960f07d5 kmymoney2-0.8.1.tar.bz2
+ffb09eaba4f93cd47e9600a2cb6b02c5 kmymoney2-0.8.2.tar.bz2
--- kmymoney2-0.8.1-qt335.patch DELETED ---