rpms/kmymoney2/devel kmymoney2.spec, 1.15, 1.16 needs.rebuild, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Removed Files:
	needs.rebuild 
Log Message:
* Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.4-2
- --disable-final (for now)
- BR: gettext



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kmymoney2.spec	22 May 2006 11:39:06 -0000	1.15
+++ kmymoney2.spec	29 Aug 2006 15:30:37 -0000	1.16
@@ -1,23 +1,17 @@
 
-%if "%{?fedora}" > "2"
+#if "%{?fedora}" > "2" || "%{?rhel}" > "3"
 %define _with_ofxbanking --with-ofxbanking
 %define ofx_deps libofx-devel, openjade-devel >= 1.3.2
-%endif
+#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.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -29,6 +23,7 @@
 
 BuildRequires: desktop-file-utils
 BuildRequires: automake
+BuildRequires: gettext
 BuildRequires: libxml2-devel
 BuildRequires: ghostscript
 BuildRequires: kdelibs-devel
@@ -54,19 +49,18 @@
 %prep
 %setup -q
 
-%patch1 -p0 -b .enable_final
+#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 \
+  --disable-dependancy-tracking --disable-final \
   %{?_with_kbanking: --enable-kbanking } %{!?_with_kbanking: --disable-kbanking } \
   %{?_with_ofxbanking: --enable-ofxbanking --enable-ofxplugin } \
   %{!?_with_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
@@ -85,7 +79,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 +152,10 @@
 
 
 %changelog
+* 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
 


--- needs.rebuild DELETED ---