rpms/kmymoney2/EL-5 .cvsignore, 1.8, 1.9 kmymoney2.spec, 1.18, 1.19 sources, 1.7, 1.8

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2331

Modified Files:
	.cvsignore kmymoney2.spec sources 
Log Message:
* Wed Dec 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.8-1
- kmymoney2-0.8.8
- --enable-kbanking



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	13 Mar 2007 13:38:46 -0000	1.8
+++ .cvsignore	21 Dec 2007 20:21:20 -0000	1.9
@@ -1,3 +1,3 @@
 clog
-kmymoney2-0.8.5.tar.bz2
-kmymoney2-0.8.6.tar.gz
+kmymoney2-0.8.7.tar.gz
+kmymoney2-0.8.8.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/kmymoney2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kmymoney2.spec	13 Mar 2007 13:38:46 -0000	1.18
+++ kmymoney2.spec	21 Dec 2007 20:21:20 -0000	1.19
@@ -1,36 +1,38 @@
 
-#if 0%{?fedora} > 2 || %{?rhel} > 3
+%define _enable_kbanking --enable-kbanking
 %define _enable_ofxbanking --enable-ofxbanking --enable-ofxplugin 
 %define ofx_deps libofx-devel, openjade-devel >= 1.3.2
-#endif
 
 %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.6
+Version: 0.8.8
 Release: 1%{?dist}
 
-License: GPL
+License: GPLv2+
 Url:	 http://kmymoney2.sourceforge.net/
 Group:	 Applications/Productivity
-Source:	 http://dl.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 # Upstream (and rpmforge) call this kmymoney, so we'll get ready.
 Obsoletes: kmymoney < %{version}-%{release}
 Provides:  kmymoney = %{version}-%{release}
 
+%{?_enable_kbanking:BuildRequires: kbanking-devel qbanking-devel}
 BuildRequires: gettext
-BuildRequires: libxml2-devel
 BuildRequires: ghostscript
+%if 0%{?fedora} > 6 
+BuildRequires: kdelibs3-devel
+%else
 BuildRequires: kdelibs-devel
+%endif
+BuildRequires: libxml2-devel
 %{?_enable_ofxbanking:BuildRequires: %{ofx_deps}}
 %{?_with_check:BuildRequires: cppunit-devel >= 1.8.0}
-%{?_enable_kbanking:BuildRequires: aqbanking-devel}
 
 %description
 KMyMoney is striving to be a full-featured replacement for your
@@ -40,7 +42,8 @@
 %package devel
 Summary: Development files for %{name}
 Group:   Development/Libraries
-Provides: kmymoney-devel = %{version}-%{release}
+Obsoletes: kmymoney-devel < %{version}-%{release}
+Provides:  kmymoney-devel = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 %description devel
 %{summary}.
@@ -55,7 +58,6 @@
 
 %configure \
   --disable-rpath \
-  --disable-gcc-hidden-visibility \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependancy-tracking --disable-final \
@@ -67,17 +69,17 @@
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
 ## File lists
 # locale's
 %find_lang %{name}
 # HTML (1.0)
 HTML_DIR=$(kde-config --expandvars --install html)
-if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
-for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+if [ -d %{buildroot}$HTML_DIR ]; then
+for lang_dir in %{buildroot}$HTML_DIR/* ; do
   if [ -d $lang_dir ]; then
     lang=$(basename $lang_dir)
     echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
@@ -92,7 +94,7 @@
 fi
 
 # Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
 
 
 # Currently broken w/--enable-final: http://bugs.kde.org/115863
@@ -131,6 +133,10 @@
 %if "%{?_enable_ofxbanking:1}" == "1"
 %{_libdir}/kde3/kmm_ofximport.*
 %endif
+%if "%{?_enable_kbanking:1}" == "1"
+%{_libdir}/kde3/kmm_kbanking.*
+%{_datadir}/apps/kmm_kbanking/
+%endif
 %{_mandir}/man?/*
 
 %files devel
@@ -139,12 +145,30 @@
 %{_libdir}/lib*.so
 
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.8-1
+- kmymoney2-0.8.8
+- --enable-kbanking
+
+* Sat Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.7-5
+- BR: kdelibs3-devel
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.7-4
+- respin (BuildID)
+
+* Thu Aug 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.7-3
+- License: GPLv2+
+
+* Wed Jul 25 2007 Jesse Keating <jkeating at redhat.com> 0.8.7-2
+- Rebuild for RH #249435
+
+* Mon Jul 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.7-1
+- kmymoney2-0.8.7
+
 * Sat Mar 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.8.6-1
 - kmymoney2-0.8.6
 - fix Obsoletes: kmymoney


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	13 Mar 2007 13:38:46 -0000	1.7
+++ sources	21 Dec 2007 20:21:20 -0000	1.8
@@ -1 +1 @@
-4a1f1ff16c1f02d4e6ce3263c44daf74  kmymoney2-0.8.6.tar.gz
+3b31f026b6065ce65a1948fb91e804d0  kmymoney2-0.8.8.tar.bz2