diff --git a/.gitignore b/.gitignore index e0f33d9..abd635c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /kmymoney-4.5.3.tar.bz2 +/kmymoney-4.6.0.tar.bz2 diff --git a/kmymoney-4.5.2-hicolor_icons.patch b/kmymoney-4.5.2-hicolor_icons.patch deleted file mode 100644 index 2068d9b..0000000 --- a/kmymoney-4.5.2-hicolor_icons.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -up kmymoney-4.5.2/kmymoney/CMakeLists.txt.hicolor kmymoney-4.5.2/kmymoney/CMakeLists.txt ---- kmymoney-4.5.2/kmymoney/CMakeLists.txt.hicolor 2011-02-07 10:34:33.897673195 -0600 -+++ kmymoney-4.5.2/kmymoney/CMakeLists.txt 2011-02-07 10:48:37.897102852 -0600 -@@ -109,47 +109,47 @@ INSTALL(DIRECTORY icons/oxygen - PATTERN ".svn" EXCLUDE - ) - INSTALL(FILES hi16-app-kmymoney.png -- DESTINATION ${ICON_INSTALL_DIR}/oxygen/16x16/apps -+ DESTINATION ${ICON_INSTALL_DIR}/hicolor/16x16/apps - RENAME kmymoney.png - ) - INSTALL(FILES mimetype_kmy_16x16.png -- DESTINATION ${ICON_INSTALL_DIR}/oxygen/16x16/mimetypes -+ DESTINATION ${ICON_INSTALL_DIR}/hicolor/16x16/mimetypes - RENAME kmy.png - ) - INSTALL(FILES hi32-app-kmymoney.png -- DESTINATION ${ICON_INSTALL_DIR}/oxygen/32x32/apps -+ DESTINATION ${ICON_INSTALL_DIR}/hicolor/32x32/apps - RENAME kmymoney.png - ) - INSTALL(FILES mimetype_kmy_22x22.png -- DESTINATION ${ICON_INSTALL_DIR}/oxygen/22x22/mimetypes -+ DESTINATION ${ICON_INSTALL_DIR}/hicolor/22x22/mimetypes - RENAME kmy.png - ) - INSTALL(FILES mimetype_kmy_32x32.png -- DESTINATION ${ICON_INSTALL_DIR}/oxygen/32x32/mimetypes -+ DESTINATION ${ICON_INSTALL_DIR}/hicolor/32x32/mimetypes - RENAME kmy.png - ) - INSTALL(FILES hi48-app-kmymoney.png -- DESTINATION ${ICON_INSTALL_DIR}/oxygen/48x48/apps -+ DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/apps - RENAME kmymoney.png - ) - INSTALL(FILES mimetype_kmy_48x48.png -- DESTINATION ${ICON_INSTALL_DIR}/oxygen/48x48/mimetypes -+ DESTINATION ${ICON_INSTALL_DIR}/hicolor/48x48/mimetypes - RENAME kmy.png - ) - INSTALL(FILES hi64-app-kmymoney.png -- DESTINATION ${ICON_INSTALL_DIR}/oxygen/64x64/apps -+ DESTINATION ${ICON_INSTALL_DIR}/hicolor/64x64/apps - RENAME kmymoney.png - ) - INSTALL(FILES mimetype_kmy_64x64.png -- DESTINATION ${ICON_INSTALL_DIR}/oxygen/64x64/mimetypes -+ DESTINATION ${ICON_INSTALL_DIR}/hicolor/64x64/mimetypes - RENAME kmy.png - ) - INSTALL(FILES hi128-app-kmymoney.png -- DESTINATION ${ICON_INSTALL_DIR}/oxygen/128x128/apps -+ DESTINATION ${ICON_INSTALL_DIR}/hicolor/128x128/apps - RENAME kmymoney.png - ) - INSTALL(FILES mimetype_kmy_128x128.png -- DESTINATION ${ICON_INSTALL_DIR}/oxygen/128x128/mimetypes -+ DESTINATION ${ICON_INSTALL_DIR}/hicolor/128x128/mimetypes - RENAME kmy.png - ) - INSTALL(FILES lo16-app-kmymoney.png diff --git a/kmymoney.spec b/kmymoney.spec index e6bfbd9..c85463d 100644 --- a/kmymoney.spec +++ b/kmymoney.spec @@ -1,8 +1,8 @@ Summary: Personal finance Name: kmymoney -Version: 4.5.3 -Release: 1%{?dist}.1 +Version: 4.6.0 +Release: 1%{?dist} # kmm itself is GPLv2+ , but kdchart is GPLv2 or GPLv3 License: GPLv2 or GPLv3 @@ -12,24 +12,25 @@ Source0: http://downloads.sourceforge.net/sourceforge/kmymoney2/kmymoney-%{versi BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## upstreamable patches -# install icons to hicolor instead of oxygen, so available outside of kde too -Patch51: kmymoney-4.5.2-hicolor_icons.patch ## upstream patches -BuildRequires: aqbanking-devel >= 5.0 BuildRequires: boost-devel BuildRequires: cppunit-devel BuildRequires: desktop-file-utils +BuildRequires: doxygen BuildRequires: gettext BuildRequires: gpgme-devel -BuildRequires: glibmm24-devel +BuildRequires: gmp-devel BuildRequires: kdchart-devel BuildRequires: kdepimlibs-devel -BuildRequires: libical-devel -BuildRequires: libxml2-devel -BuildRequires: libofx-devel -BuildRequires: libxml++-devel +BuildRequires: pkgconfig(aqbanking) >= 5.0 +BuildRequires: pkgconfig(libalkimia) +BuildRequires: pkgconfig(libical) +BuildRequires: pkgconfig(libofx) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(libxml++-2.6) +BuildRequires: pkgconfig(glibmm-2.4) Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -70,11 +71,6 @@ Obsoletes: kmymoney2-devel < 2 %prep %setup -q -n kmymoney-%{version} -%patch51 -p1 -b .hicolor_icons - -# nuke .directory files -rm -fv kmymoney/pics/l10n/*/.directory - ## kdchart munging begin sed -i.kdchart -e 's|ADD_SUBDIRECTORY( libkdchart )|#ADD_SUBDIRECTORY( libkdchart )|' CMakeLists.txt sed -i.kdchart -e 's|kmm_kdchart|kdchart|' kmymoney/CMakeLists.txt @@ -88,16 +84,11 @@ ln -s /usr/include/kdchart libkdchart/kdchart %build mkdir -p %{_target_platform} pushd %{_target_platform} -# -DKDE4_BUILD_TESTS:BOOL=ON -# %{?_cmake_skip_rpath} %{cmake_kde4} .. popd make %{?_smp_mflags} -C %{_target_platform} -# fix world writable perms -find . -type f -name 'ui_*.h' -exec chmod 0644 {} ';' - %install rm -rf %{buildroot} @@ -110,9 +101,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/kmymoney.desktop # make test -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig %post touch --no-create %{_datadir}/icons/locolor &> /dev/null || : @@ -120,19 +108,20 @@ touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : %postun if [ $1 -eq 0 ] ; then - update-desktop-database -q &> /dev/null - update-mime-database %{_kde4_datadir}/mime &> /dev/null - touch --no-create %{_datadir}/icons/locolor &> /dev/null - touch --no-create %{_datadir}/icons/hicolor &> /dev/null - gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || : - gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : +touch --no-create %{_datadir}/icons/locolor &> /dev/null +touch --no-create %{_datadir}/icons/hicolor &> /dev/null +gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || : +gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : +update-desktop-database -q &> /dev/null ||: +update-mime-database %{_kde4_datadir}/mime &> /dev/null ||: fi %posttrans -update-desktop-database -q &> /dev/null -update-mime-database %{_kde4_datadir}/mime &> /dev/null gtk-update-icon-cache %{_datadir}/icons/locolor &> /dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : +update-desktop-database -q &> /dev/null ||: +update-mime-database %{_kde4_datadir}/mime &> /dev/null ||: + %files -f kmymoney.lang @@ -152,6 +141,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_libdir}/kde4/*.so +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig + %files libs %defattr(-,root,root,-) %{_kde4_libdir}/libkmm_mymoney.so.4* @@ -168,6 +160,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || : rm -rf %{buildroot} %changelog +* Sun Aug 21 2011 Rex Dieter 4.6.0-1 +- 4.6.0 +- use more pkgconfig-type build deps + * Thu Feb 17 2011 Rex Dieter 4.5.3-1.1 - BR: aqbanking-devel >= 5.0 diff --git a/sources b/sources index 26c359a..f621968 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7104b5267822cf1708a118af29af75b kmymoney-4.5.3.tar.bz2 +166131b53da426643bd40a0ca6f5c022 kmymoney-4.6.0.tar.bz2