rpms/kmymoney2/EL-5 kmymoney2-1.0.0-no_it_locale.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 kmymoney2.spec, 1.20, 1.21 sources, 1.9, 1.10

Rex Dieter rdieter at fedoraproject.org
Thu Sep 3 19:52:34 UTC 2009 

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26838

Modified Files:
	.cvsignore kmymoney2.spec sources 
Added Files:
	kmymoney2-1.0.0-no_it_locale.patch 
Log Message:
* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
- kmymoney2-1.0.0


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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	15 Apr 2008 20:09:49 -0000	1.10
+++ .cvsignore	3 Sep 2009 19:52:33 -0000	1.11
@@ -1 +1 @@
-kmymoney2-0.8.9.tar.bz2
+kmymoney2-1.0.0.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/kmymoney2.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- kmymoney2.spec	15 Apr 2008 20:09:49 -0000	1.20
+++ kmymoney2.spec	3 Sep 2009 19:52:33 -0000	1.21
@@ -1,21 +1,21 @@
 
-# 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
 
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define ofx_deps libofx-devel opensp-devel
+%define ofx_deps libofx-devel opensp-devel libxml++-devel
 %endif
 
-%if 0%{?fedora} > 8 || 0%{?rhel} > 3
-# make -libs subpkg
-%define libs 1
+%if 0%{?fedora} > 6
+%define kdelibs3 kdelibs3
+%else
+%define kdelibs3 kdelibs
+BuildRequires: libutempter-devel
 %endif
 
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.8.9
+Version: 1.0.0 
 Release: 1%{?dist}
 
 License: GPLv2+
@@ -24,29 +24,29 @@ 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}
 
-%if 0%{?libs}
-Requires: %{name}-libs = %{version}-%{release}
-%else
-Obsoletes: %{name}-libs < %{version}-%{release}
-Provides:  %{name}-libs = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-%endif
-
-%{?_enable_kbanking:BuildRequires: kbanking-devel qbanking-devel}
+# multilib upgrades, when -libs became unconditional
+Obsoletes: kmymoney2 < 0.9.3-3
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+BuildRequires: curl-devel
+BuildRequires: desktop-file-utils
+BuildRequires: html2ps
 BuildRequires: gettext
 BuildRequires: ghostscript
-%if 0%{?fedora} > 6 
-BuildRequires: kdelibs3-devel
-%else
-BuildRequires: kdelibs-devel
-%endif
+BuildRequires: %{kdelibs3}-devel
 BuildRequires: libxml2-devel
 %{?_enable_ofxbanking:BuildRequires: %{ofx_deps}}
+# FIXME/TODO: consider packaging qt-sqlite3, 
+# http://www.kde-apps.org/content/show.php?content=23011
+# so not be tempted to use the embedded copy here
+%{?_enable_sqlite3:BuildRequires:sqlite-devel}
 %{?_with_check:BuildRequires: cppunit-devel >= 1.8.0}
 
 %description
@@ -54,21 +54,19 @@ KMyMoney is striving to be a full-featur
 Windows-based finance software.  We are a full double-entry accounting
 software package, for personal or small-business use.
 
-%if 0%{?libs}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}.
-%endif
 
 %package devel
 Summary: Development files for %{name}
 Group:   Development/Libraries
 Obsoletes: kmymoney-devel < %{version}-%{release}
 Provides:  kmymoney-devel = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
 
@@ -76,6 +74,10 @@ Requires: %{name}-libs = %{version}-%{re
 %prep
 %setup -q -n kmymoney2-%{version}
 
+%if 0%{?rhel}
+%patch1 -p1 -b .no_it_locale
+%endif
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -85,10 +87,13 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
   --disable-dependancy-tracking --disable-final \
-  %{?_enable_kbanking} %{!?_enable_kbanking: --disable-kbanking } \
+  %{?_enable_sqlite3} %{!?_enable_sqlite3:--disable-sqlite3} \
   %{?_enable_ofxbanking} %{!?_enable_ofxbanking: --disable-ofxbanking --disable-ofxplugin } \
   %{?_with_check:--disable-final}
 
+# to help doc generation
+export LANG=en_US.UTF-8
+
 make %{?_smp_mflags}
 
 
@@ -97,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}
@@ -119,34 +128,45 @@ fi
 
 # Unpackaged files
 rm -f %{buildroot}%{_libdir}/lib*.la
+rm -rf %{buildroot}%{_datadir}/icons/*/scalable
 
 
-# Currently broken w/--enable-final: http://bugs.kde.org/115863
 %check 
+# Currently broken w/--enable-final: http://bugs.kde.org/115863
 %{?_with_check:make check }
 
 
-%if 0%{?libs}
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
-%endif
 
 %post
-%{!?libs:/sbin/ldconfig}
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/locolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/oxygen &> /dev/null || :
+touch --no-create %{_datadir}/icons/Tango &> /dev/null || :
+
 
 %postun
-%{!?libs:/sbin/ldconfig}
-for icon_theme in hicolor locolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+if [ $1 -eq 0 ] ; then
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/icons/hicolor &> /dev/null 
+  touch --no-create %{_datadir}/icons/locolor &> /dev/null
+  touch --no-create %{_datadir}/icons/oxygen &> /dev/null
+  touch --no-create %{_datadir}/icons/Tango &> /dev/null
+  gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
+  gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
+
+fi
+
+%posttrans
+update-desktop-database -q &> /dev/null
+gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/oxygen &> /dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/Tango &> /dev/null || :
 
 
 %files -f %{name}.lang
@@ -154,30 +174,35 @@ update-desktop-database %{_datadir}/appl
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kmymoney*
 %{_datadir}/apps/kmymoney2/
-%{_datadir}/applications/kde/*.desktop
+%{_datadir}/applications/kde/kmymoney2.desktop
+%{_datadir}/config.kcfg/kmymoney2.kcfg
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
+%{_datadir}/icons/oxygen/*/*/*
+%{_datadir}/icons/Tango/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
 %{_datadir}/service*/*.desktop
-%if "%{?_enable_ofxbanking:1}" == "1"
+%if 0%{?_enable_ofxbanking:1}
+%{_datadir}/apps/kmm_ofximport/
 %{_libdir}/kde3/kmm_ofximport.*
 %endif
-%if "%{?_enable_kbanking:1}" == "1"
+%if 0%{?_enable_kbanking:1}
 %{_libdir}/kde3/kmm_kbanking.*
 %{_datadir}/apps/kmm_kbanking/
 %endif
 %{_mandir}/man?/*
 
-%if 0%{?libs}
 %files libs
 %defattr(-,root,root,-)
-%endif
-%{_libdir}/lib*.so.*
+%{_libdir}/libkmm_kdchart.so.0*
+%{_libdir}/libkmm_mymoney.so.5*
+%{_libdir}/libkmm_plugin.so.0*
+%{?_enable_sqlite3:%{_libdir}/qt-3.3/plugins/sqldrivers/*.so}
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/*
-%{_libdir}/lib*.so
+%{_includedir}/kmymoney
+%{_libdir}/libkmm_*.so
 
 
 %clean
@@ -185,6 +210,36 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Aug 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.0-1
+- kmymoney2-1.0.0
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Jul 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 0.9.3-3
+- validate .desktop file
+- -libs unconditional
+- use %%_isa where appropriate
+- optimize scriptlets
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 24 2009 Rex Dieter <rdieter at fedoraproject.org> 0.9.3-1
+- kmymoney2-0.9.3
+
+* Mon Sep 15 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-3
+- respun tarball 
+
+* Sun Sep 14 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-1
+- kmymoney2-0.9.2
+
+* Tue Sep  9 2008 Bill Nottingham <notting at redhat.com> 0.9-2
+- rebuild for new libofx ABI
+
+* Wed May 14 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9-1
+- kmymoney2-0.9
+
 * Wed Mar 26 2008 Rex Dieter <rdieter at fedoraproject.org> 0.8.9-1
 - kmymoney2-0.8.9
 - --disable-kbanking (requires aqbanking,kbanking fix/update)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	15 Apr 2008 20:09:49 -0000	1.9
+++ sources	3 Sep 2009 19:52:33 -0000	1.10
@@ -1 +1 @@
-1f0c412f88b9344c18562fbca3c10717  kmymoney2-0.8.9.tar.bz2
+f702ea77ff5bf6aec727768da34d98ec  kmymoney2-1.0.0.tar.bz2

More information about the scm-commits mailing list