rpms/kmymoney2/devel kmymoney2-1.0.0-no_it_locale.patch, NONE, 1.1 kmymoney2.spec, 1.42, 1.43

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11955

Modified Files:
	kmymoney2.spec 
Added Files:
	kmymoney2-1.0.0-no_it_locale.patch 
Log Message:
sync changes from EL-5 branch


kmymoney2-1.0.0-no_it_locale.patch:
 Makefile.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kmymoney2-1.0.0-no_it_locale.patch ---
diff -up kmymoney2-1.0.0/po/Makefile.in.no_it kmymoney2-1.0.0/po/Makefile.in
--- kmymoney2-1.0.0/po/Makefile.in.no_it	2009-08-16 23:43:29.000000000 -0500
+++ kmymoney2-1.0.0/po/Makefile.in	2009-09-03 14:39:56.000000000 -0500
@@ -309,8 +309,8 @@ xdg_menudir = @xdg_menudir@
 ####### kdevelop will overwrite this part!!! (end)############
 #>- POFILES = AUTO
 #>+ 2
-POFILES = ru.po it.po lt.po pt_BR.po da.po sk.po ca.po nl.po es_AR.po fi.po gl.po fr.po pl.po de.po en_GB.po es.po tr.po cs.po sv.po ro.po pt.po zh_CN.po
-GMOFILES = ru.gmo it.gmo lt.gmo pt_BR.gmo da.gmo sk.gmo ca.gmo nl.gmo es_AR.gmo fi.gmo gl.gmo fr.gmo pl.gmo de.gmo en_GB.gmo es.gmo tr.gmo cs.gmo sv.gmo ro.gmo pt.gmo zh_CN.gmo
+POFILES = ru.po lt.po pt_BR.po da.po sk.po ca.po nl.po es_AR.po fi.po gl.po fr.po pl.po de.po en_GB.po es.po tr.po cs.po sv.po ro.po pt.po zh_CN.po
+GMOFILES = ru.gmo lt.gmo pt_BR.gmo da.gmo sk.gmo ca.gmo nl.gmo es_AR.gmo fi.gmo gl.gmo fr.gmo pl.gmo de.gmo en_GB.gmo es.gmo tr.gmo cs.gmo sv.gmo ro.gmo pt.gmo zh_CN.gmo
 CONFIG_CLEAN_FILES = $(GMOFILES)
 #>- all: all-am
 #>+ 1


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- kmymoney2.spec	20 Aug 2009 14:03:58 -0000	1.42
+++ kmymoney2.spec	4 Sep 2009 13:26:15 -0000	1.43
@@ -1,6 +1,4 @@
 
-# FIXME/TODO: Requires aqbanking (v3?) + latest kmm_kbanking plugin.  arg. -- Rex
-#define _enable_kbanking --enable-kbanking
 %define _enable_ofxbanking --enable-ofxbanking --enable-ofxplugin 
 %define ofx_deps libofx-devel, openjade-devel >= 1.3.2
 
@@ -26,6 +24,9 @@ Group:	 Applications/Productivity
 Source0: http://downloads.sourceforge.net/sourceforge/kmymoney2/kmymoney2-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+# RHEL5's gettext doesn't grok it.po
+Patch1: kmymoney2-1.0.0-no_it_locale.patch
+
 # Upstream (and rpmforge) call this kmymoney, so we'll get ready.
 Obsoletes: kmymoney < %{version}-%{release}
 Provides:  kmymoney = %{version}-%{release}
@@ -34,7 +35,6 @@ Provides:  kmymoney = %{version}-%{relea
 Obsoletes: kmymoney2 < 0.9.3-3
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
-%{?_enable_kbanking:BuildRequires: kbanking-devel qbanking-devel}
 BuildRequires: curl-devel
 BuildRequires: desktop-file-utils
 BuildRequires: html2ps
@@ -74,6 +74,10 @@ Requires: %{name}-libs%{?_isa} = %{versi
 %prep
 %setup -q -n kmymoney2-%{version}
 
+%if 0%{?rhel}
+%patch1 -p1 -b .no_it_locale
+%endif
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -84,7 +88,6 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --disable-debug --disable-warnings \
   --disable-dependancy-tracking --disable-final \
   %{?_enable_sqlite3} %{!?_enable_sqlite3:--disable-sqlite3} \
-  %{?_enable_kbanking} %{!?_enable_kbanking: --disable-kbanking } \
   %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
 
@@ -99,6 +102,10 @@ rm -rf %{buildroot}
 
 make install DESTDIR=%{buildroot}
 
+desktop-file-install \
+  --vendor="" --dir=%{buildroot}%{_datadir}/applications/kde/ \
+  %{buildroot}%{_datadir}/applications/kde/kmymoney2.desktop
+
 ## File lists
 # locale's
 %find_lang %{name}
@@ -125,7 +132,6 @@ rm -rf %{buildroot}%{_datadir}/icons/*/s
 
 
 %check 
-desktop-file-validate %{buildroot}%{_datadir}/applications/kde/kmymoney2.desktop
 # Currently broken w/--enable-final: http://bugs.kde.org/115863
 %{?_with_check:make check }