rpms/kmymoney2/FC-6 .cvsignore, 1.7, 1.8 kmymoney2.spec, 1.17, 1.18 sources, 1.6, 1.7

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Sat Mar 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.6-1
- kmymoney2-0.8.6
- fix Obsoletes: kmymoney



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-6/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	1 Sep 2006 02:56:34 -0000	1.7
+++ .cvsignore	13 Mar 2007 13:38:46 -0000	1.8
@@ -1,3 +1,3 @@
 clog
-kmymoney2-0.8.4.tar.bz2
 kmymoney2-0.8.5.tar.bz2
+kmymoney2-0.8.6.tar.gz


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-6/kmymoney2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kmymoney2.spec	1 Sep 2006 02:56:34 -0000	1.17
+++ kmymoney2.spec	13 Mar 2007 13:38:46 -0000	1.18
@@ -1,35 +1,36 @@
 
-#if "%{?fedora}" > "2" || "%{?rhel}" > "3"
-%define _with_ofxbanking --with-ofxbanking
+#if 0%{?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"
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
+#define _enable_kbanking --enable-kbanking
 %define ofx_deps libofx-devel opensp-devel
 %endif
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.8.5
+Version: 0.8.6
 Release: 1%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
 Group:	 Applications/Productivity
-Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
+Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-BuildRequires: desktop-file-utils
-BuildRequires: automake
+# Upstream (and rpmforge) call this kmymoney, so we'll get ready.
+Obsoletes: kmymoney < %{version}-%{release}
+Provides:  kmymoney = %{version}-%{release}
+
 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
 KMyMoney is striving to be a full-featured replacement for your
@@ -39,13 +40,14 @@
 %package devel
 Summary: Development files for %{name}
 Group:   Development/Libraries
+Provides: kmymoney-devel = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 %description devel
 %{summary}.
 
 
 %prep
-%setup -q
+%setup -q -n kmymoney2-%{version}
 
 
 %build
@@ -57,31 +59,21 @@
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --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 } \
+  %{?_enable_kbanking} %{!?_enable_kbanking: --disable-kbanking } \
+  %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
 
 make %{?_smp_mflags}
 
-# Currently broken w/--enable-final: http://bugs.kde.org/115863
-%check ||:
-%{?_with_check:make check }
-
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install \
-  --add-category="X-Fedora" --vendor="" \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
-
 ## File lists
 # locale's
-%find_lang %{name} || touch %{name}.lang
+%find_lang %{name}
 # HTML (1.0)
 HTML_DIR=$(kde-config --expandvars --install html)
 if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
@@ -103,6 +95,11 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 
+# Currently broken w/--enable-final: http://bugs.kde.org/115863
+%check 
+%{?_with_check:make check }
+
+
 %post
 /sbin/ldconfig
 for icon_theme in hicolor locolor ; do
@@ -131,7 +128,7 @@
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
 %{_libdir}/lib*.so.*
-%if "%{?_with_ofxbanking:1}" == "1"
+%if "%{?_enable_ofxbanking:1}" == "1"
 %{_libdir}/kde3/kmm_ofximport.*
 %endif
 %{_mandir}/man?/*
@@ -148,6 +145,17 @@
 
 
 %changelog
+* Sat Mar 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.6-1
+- kmymoney2-0.8.6
+- fix Obsoletes: kmymoney
+
+* Thu Jan 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.5-3
+- fix _enable_ofxbanking macro usage to re-enable ofx support
+
+* Tue Nov 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.5-2
+- drop desktop-file-utils bits
+- Ob/Pr: kmymoney(-devel), upstream/rpmforge calls it kmymoney
+
 * Thu Aug 31 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.5-1
 - 0.8.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Sep 2006 02:56:34 -0000	1.6
+++ sources	13 Mar 2007 13:38:46 -0000	1.7
@@ -1 +1 @@
-a39bcd548df8b4c6b9b5cf68d574a18e  kmymoney2-0.8.5.tar.bz2
+4a1f1ff16c1f02d4e6ce3263c44daf74  kmymoney2-0.8.6.tar.gz