rpms/kmymoney2/F-11 kmymoney2-1.0.1-no_it_locale.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 kmymoney2.spec, 1.38, 1.39 sources, 1.14, 1.15

Rex Dieter rdieter at fedoraproject.org
Thu Sep 24 17:02:34 UTC 2009 

Author: rdieter

Update of /cvs/pkgs/rpms/kmymoney2/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28726

Modified Files:
	.cvsignore kmymoney2.spec sources 
Added Files:
	kmymoney2-1.0.1-no_it_locale.patch 
Log Message:
* Sun Sep 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
- kmymoney2-1.0.1


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

--- NEW FILE kmymoney2-1.0.1-no_it_locale.patch ---
diff -up kmymoney2-1.0.1/po/Makefile.in.no_it_locale kmymoney2-1.0.1/po/Makefile.in
--- kmymoney2-1.0.1/po/Makefile.in.no_it_locale	2009-09-05 07:54:58.000000000 -0500
+++ kmymoney2-1.0.1/po/Makefile.in	2009-09-10 19:36:25.414373555 -0500
@@ -310,8 +310,8 @@ xdg_menudir = @xdg_menudir@
 ####### kdevelop will overwrite this part!!! (end)############
 #>- POFILES = AUTO
 #>+ 2
-POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po ro.po de.po es_AR.po fr.po nl.po it.po
-GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo ro.gmo de.gmo es_AR.gmo fr.gmo nl.gmo it.gmo
+POFILES = zh_CN.po ca.po da.po cs.po fi.po gl.po lt.po pl.po pt.po ru.po sk.po sv.po tr.po en_GB.po pt_BR.po es.po ro.po de.po es_AR.po fr.po nl.po
+GMOFILES = zh_CN.gmo ca.gmo da.gmo cs.gmo fi.gmo gl.gmo lt.gmo pl.gmo pt.gmo ru.gmo sk.gmo sv.gmo tr.gmo en_GB.gmo pt_BR.gmo es.gmo ro.gmo de.gmo es_AR.gmo fr.gmo nl.gmo
 CONFIG_CLEAN_FILES = $(GMOFILES)
 #>- all: all-am
 #>+ 1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	24 Feb 2009 21:26:10 -0000	1.15
+++ .cvsignore	24 Sep 2009 17:02:33 -0000	1.16
@@ -1 +1 @@
-kmymoney2-0.9.3.tar.bz2
+kmymoney2-1.0.1.tar.bz2


Index: kmymoney2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-11/kmymoney2.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- kmymoney2.spec	25 Feb 2009 11:38:32 -0000	1.38
+++ kmymoney2.spec	24 Sep 2009 17:02:33 -0000	1.39
@@ -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
 
@@ -8,9 +6,6 @@
 %define ofx_deps libofx-devel opensp-devel libxml++-devel
 %endif
 
-# make -libs subpkg
-%define libs 1
-
 %if 0%{?fedora} > 6
 %define kdelibs3 kdelibs3
 %else
@@ -18,10 +13,12 @@
 BuildRequires: libutempter-devel
 %endif
 
+%define _with_check 1 
+
 Summary: Personal finance 
 Name:	 kmymoney2
-Version: 0.9.3
-Release: 2%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
 
 License: GPLv2+
 Url:	 http://kmymoney2.sourceforge.net/
@@ -29,26 +26,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.1-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
+# multilib upgrades, when -libs became unconditional
+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
 BuildRequires: gettext
 BuildRequires: ghostscript
 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
@@ -68,7 +68,7 @@ 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 +76,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
@@ -84,11 +88,14 @@ unset QTDIR || : ; . /etc/profile.d/qt.s
   --disable-rpath \
   --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependancy-tracking --disable-final \
-  %{?_enable_kbanking} %{!?_enable_kbanking: --disable-kbanking } \
+  --disable-dependency-tracking --disable-final \
+  %{?_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 +104,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 +130,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,32 +176,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
@@ -187,6 +212,21 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sun Sep 06 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.1-1
+- kmymoney2-1.0.1
+
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kmymoney2/F-11/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	24 Feb 2009 21:26:10 -0000	1.14
+++ sources	24 Sep 2009 17:02:33 -0000	1.15
@@ -1 +1 @@
-d33041029530091c4ac6196cd8408bda  kmymoney2-0.9.3.tar.bz2
+7c0cb96009946ee83de9160029786389  kmymoney2-1.0.1.tar.bz2

More information about the fedora-extras-commits mailing list