From ef2a2df551cf118be3d008a90e23405f2b8030ee Mon Sep 17 00:00:00 2001 From: Ben Cail Date: Apr 07 2013 02:46:03 +0000 Subject: build 4.5.3 for EL6 --- diff --git a/kmymoney-4.5.2-hicolor_icons.patch b/kmymoney-4.5.2-hicolor_icons.patch new file mode 100644 index 0000000..2068d9b --- /dev/null +++ b/kmymoney-4.5.2-hicolor_icons.patch @@ -0,0 +1,62 @@ +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 feb1293..658edd1 100644 --- a/kmymoney.spec +++ b/kmymoney.spec @@ -1,45 +1,32 @@ Summary: Personal finance Name: kmymoney -Version: 4.6.3 -Release: 4%{?dist}.2 +Version: 4.5.3 +Release: 1%{?dist}.1 -# kmm itself is GPLv2+ -# bundled kdchart is GPLv2 or GPLv3, but currently not using it -License: GPLv2+ +# kmm itself is GPLv2+ , but kdchart is GPLv2 or GPLv3 +License: GPLv2 or GPLv3 Url: http://kmymoney2.sourceforge.net/ +Group: Applications/Productivity Source0: http://downloads.sourceforge.net/sourceforge/kmymoney2/kmymoney-%{version}.tar.bz2 +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: boost-devel -BuildRequires: cppunit-devel -BuildRequires: desktop-file-utils -BuildRequires: doxygen -BuildRequires: gettext BuildRequires: gpgme-devel -BuildRequires: gmp-devel -BuildRequires: kdchart-devel -BuildRequires: kdelibs4-devel >= 4.7.0 BuildRequires: kdepimlibs-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) +BuildRequires: libofx-devel +BuildRequires: libxml++-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} Obsoletes: kmymoney2 < 2 Provides: kmymoney2 = %{version}-%{release} -Obsoletes: kmymoney2-aqbanking < 2 -Provides: kmymoney2-aqbanking = %{version}-%{release} - %description KMyMoney strives to be the best personal finance manager. The ultimate objectives of KMyMoney are... @@ -52,67 +39,58 @@ The ultimate objectives of KMyMoney are... %package libs Summary: Run-time libraries for %{name} +Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -# doesn't seem to require or use much of kde-runtime yet, so let's try -# just a minimalistic versioned kdelibs dep for now -- rex -Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}} Obsoletes: kmymoney2-libs < 2 %description libs %{summary}. %package devel Summary: Development files for %{name} +Group: Development/Libraries Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: kdelibs4-devel Obsoletes: kmymoney2-devel < 2 %description devel %{summary}. -%package doc -Summary: Application handbook, documentation, translations -# for upgrade path -Obsoletes: kmymoney < 4.6.3 -Requires: %{name} = %{version}-%{release} -BuildArch: noarch -%description doc -%{summary}. - %prep %setup -q -n kmymoney-%{version} -## 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 -mv libkdchart libkdchart.kdchart -mkdir libkdchart -ln -s /usr/include/KDChart libkdchart/include -ln -s /usr/include/kdchart libkdchart/kdchart -## kdchart munging end +%patch51 -p1 -b .hicolor_icons +# nuke .directory files +rm -fv kmymoney/pics/l10n/*/.directory %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} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} -%find_lang kmymoney --with-kde --without-mo && mv kmymoney.lang kmymoney-doc.lang -%find_lang kmymoney - +%find_lang kmymoney --with-kde %check 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,27 +98,28 @@ touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : %postun if [ $1 -eq 0 ] ; then -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 ||: + 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 || : 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 +%defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING TODO %doc README.Fileformats README.ofx %{_kde4_bindir}/kmymoney %{_kde4_appsdir}/kmymoney/ %{_kde4_appsdir}/kmm_*/ -%{_kde4_configdir}/csvimporterrc %{_kde4_datadir}/applications/kde4/kmymoney.desktop %{_kde4_datadir}/config.kcfg/kmymoney.kcfg %{_kde4_datadir}/kde4/services/*.desktop @@ -151,67 +130,26 @@ update-mime-database %{_kde4_datadir}/mime &> /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* %{_kde4_libdir}/libkmm_plugin.so.4* %{_kde4_libdir}/libkmm_widgets.so.4* +%{_kde4_libdir}/libkmm_kdchart.so.4 +%{_kde4_libdir}/libkmm_kdchart.so.4.3.0 %files devel +%defattr(-,root,root,-) %{_kde4_includedir}/kmymoney/ %{_kde4_libdir}/libkmm_*.so -%files doc -f kmymoney-doc.lang +%clean +rm -rf %{buildroot} %changelog -* Mon Mar 04 2013 Rex Dieter 4.6.3-4.2 -- rebuild (calligra-kdchart) - -* Mon Feb 04 2013 Rex Dieter 4.6.3-4 -- Only american english language available (#902501) - -* Wed Nov 07 2012 Rex Dieter 4.6.3-3 -- rebuild (calligra-kdchart) - -* Fri Sep 21 2012 Rex Dieter 4.6.3-2 -- file conflicts between kmymoney and kmymoney-doc (#859495) - -* Tue Sep 11 2012 Rex Dieter -- 4.6.3-1 -- kmymoney-4.6.3 -- -libs: Requires: kdelibs4 ... -- -doc subpkg - -* Thu Jul 19 2012 Fedora Release Engineering - 4.6.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jul 10 2012 Rex Dieter 4.6.2-3 -- rebuild (libofx) - -* Sun Jun 17 2012 Rex Dieter 4.6.2-2 -- rebuild (kdchart) - -* Sat Mar 03 2012 Rex Dieter 4.6.2-1.1 -- rebuild (calligra/kdchart) - -* Sun Feb 19 2012 Rex Dieter 4.6.2-1 -- 4.6.2 - -* Fri Jan 13 2012 Fedora Release Engineering - 4.6.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Nov 07 2011 Rex Dieter 4.6.1-1 -- 4.6.1 - -* Wed Nov 02 2011 Rex Dieter 4.6.0-2 -- rebuild (gmp) - -* Sun Aug 21 2011 Rex Dieter 4.6.0-1 -- 4.6.0 -- use more pkgconfig-type build deps +* Wed Mar 27 2013 Ben Cail 4.5.3-1.1 +- rebuild Fedora 15 package for EL6. * Thu Feb 17 2011 Rex Dieter 4.5.3-1.1 - BR: aqbanking-devel >= 5.0 diff --git a/sources b/sources index 95b16df..0c9529e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 756bc76d182aa7cbac7033f4469b6687 kmymoney-4.6.3.tar.bz2 +b9a3e1601a98d3585d828843490c47d6 kmymoney-4.5.2-hicolor_icons.patch