rpms/kmymoney2/FC-4 .cvsignore, 1.6, 1.7 kmymoney2.spec, 1.9, 1.10 sources, 1.5, 1.6 kmymoney2-0.8.4-enable_final.patch, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24664

Modified Files:
	.cvsignore kmymoney2.spec sources 
Removed Files:
	kmymoney2-0.8.4-enable_final.patch 
Log Message:
* Thu Aug 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.5-1
- 0.8.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 May 2006 17:40:28 -0000	1.6
+++ .cvsignore	15 Sep 2006 20:05:10 -0000	1.7
@@ -1,2 +1,3 @@
 clog
 kmymoney2-0.8.4.tar.bz2
+kmymoney2-0.8.5.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/kmymoney2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kmymoney2.spec	22 May 2006 11:38:02 -0000	1.9
+++ kmymoney2.spec	15 Sep 2006 20:05:10 -0000	1.10
@@ -1,22 +1,17 @@
 
-%if "%{?fedora}" > "2"
-%define _with_ofxbanking --with-ofxbanking
+%if "%{?fedora}" > "2" || "%{?rhel}" > "3"
+%define _enable_ofxbanking --enable-ofxbanking --enable-ofxplugin 
 %define ofx_deps libofx-devel, openjade-devel >= 1.3.2
 %endif
 
-%if "%{?fedora}" > "4"
-%define _with_ofxbanking --with-ofxbanking
+%if "%{?fedora}" > "4" || "%{?rhel}" > "4"
+#define _enable_kbanking --enable-kbanking
 %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.4
+Version: 0.8.5
 Release: 1%{?dist}
 
 License: GPL
@@ -25,17 +20,14 @@
 Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-Patch1: kmymoney2-0.8.4-enable_final.patch
-
 BuildRequires: desktop-file-utils
-BuildRequires: automake
+BuildRequires: gettext
 BuildRequires: libxml2-devel
 BuildRequires: ghostscript
 BuildRequires: kdelibs-devel
-%{?_with_ofxbanking:BuildRequires: %{ofx_deps}}
+%{?_enable_ofxbanking:BuildRequires: %{ofx_deps}}
 %{?_with_check:BuildRequires: cppunit-devel >= 1.8.0}
-## FIXME/TODO
-%{?_with_kbanking:BuildRequires: aqbanking-devel >= 1.6.0}
+%{?_enable_kbanking:BuildRequires: aqbanking-devel}
 
 
 %description
@@ -54,22 +46,18 @@
 %prep
 %setup -q
 
-%patch1 -p0 -b .enable_final
-
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \
   --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependancy-tracking --enable-final \
-  %{?_with_kbanking: --enable-kbanking } %{!?_with_kbanking: --disable-kbanking } \
-  %{?_with_ofxbanking: --enable-ofxbanking --enable-ofxplugin } \
-  %{!?_with_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
+  --disable-dependancy-tracking --disable-final \
+  %{?_enable_kbanking} %{!?_enable_kbanking: --disable-kbanking } \
+  %{?_with_ofxbanking} %{!?_with_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
 
 make %{?_smp_mflags}
@@ -85,7 +73,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-  --add-category X-Fedora --vendor="" \
+  --add-category="X-Fedora" --vendor="" \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
@@ -158,6 +146,13 @@
 
 
 %changelog
+* Thu Aug 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.5-1
+- 0.8.5
+
+* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.4-2
+- --disable-final (for now)
+- BR: gettext
+
 * Sun May 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.4-1
 - 0.8.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 May 2006 11:38:02 -0000	1.5
+++ sources	15 Sep 2006 20:05:10 -0000	1.6
@@ -1 +1 @@
-edac4fad63c3a9f90c054e105e48aa7a  kmymoney2-0.8.4.tar.bz2
+a39bcd548df8b4c6b9b5cf68d574a18e  kmymoney2-0.8.5.tar.bz2


--- kmymoney2-0.8.4-enable_final.patch DELETED ---