From 98763f546077d8fc3e626e739a73623c95c80f35 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Feb 01 2016 13:59:41 +0000 Subject: rebuild(libalkimia), update URL, .spec cosmetics --- diff --git a/kmymoney.spec b/kmymoney.spec index 120c395..91b554e 100644 --- a/kmymoney.spec +++ b/kmymoney.spec @@ -2,12 +2,12 @@ Summary: Personal finance Name: kmymoney Version: 4.7.2 -Release: 2%{?dist} +Release: 3%{?dist} # kmm itself is GPLv2+ # bundled kdchart is GPLv2 or GPLv3, but currently not using it License: GPLv2+ -Url: http://kmymoney2.sourceforge.net/ +Url: http://kmymoney.org/ Source0: http://download.kde.org/stable/kmymoney/%{version}/src/kmymoney-%{version}.tar.xz ## upstreamable patches @@ -21,7 +21,12 @@ BuildRequires: doxygen BuildRequires: gettext BuildRequires: gpgme-devel BuildRequires: gmp-devel +%global system_kdchart 1 +%if 0%{?system_kdchart} BuildRequires: kdchart-devel +%else +Provides: bundled(kdchart) +%endif BuildRequires: kdelibs4-devel >= 4.7.0 BuildRequires: kdepimlibs-devel %if 0%{?fedora} > 20 @@ -36,8 +41,7 @@ BuildRequires: pkgconfig(libxml++-2.6) BuildRequires: pkgconfig(glibmm-2.4) Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%{?kde_runtime_requires} -%{!?kde_runtime_requires:Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}}} +Requires: kde-runtime Obsoletes: kmymoney2 < 2 Provides: kmymoney2 = %{version}-%{release} @@ -83,6 +87,7 @@ BuildArch: noarch %prep %setup -q -n kmymoney-%{version} +%if 0%{?system_kdchart} ## 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 @@ -91,10 +96,11 @@ mkdir libkdchart ln -s /usr/include/KDChart libkdchart/include ln -s /usr/include/kdchart libkdchart/kdchart ## kdchart munging end +%endif %build -mkdir -p %{_target_platform} +mkdir %{_target_platform} pushd %{_target_platform} %{cmake_kde4} .. popd @@ -109,7 +115,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %find_lang kmymoney - %check %if 0%{?fedora} > 20 appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml @@ -141,14 +146,16 @@ update-desktop-database -q &> /dev/null ||: update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || : %files -f kmymoney.lang -%doc AUTHORS ChangeLog COPYING TODO +%doc AUTHORS ChangeLog TODO %doc README.Fileformats README.ofx +%license COPYING %{_kde4_bindir}/kmymoney %{_kde4_appsdir}/kmymoney/ %{_kde4_appsdir}/kmm_*/ %{_kde4_appsdir}/kconf_update/kmymoney.upd %{_kde4_configdir}/csvimporterrc %{_kde4_datadir}/applications/kde4/kmymoney.desktop +%{_kde4_datadir}/appdata/%{name}.appdata.xml %{_kde4_datadir}/config.kcfg/kmymoney.kcfg %{_kde4_datadir}/kde4/services/*.desktop %{_kde4_datadir}/kde4/servicetypes/*.desktop @@ -156,7 +163,6 @@ update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || : %{_kde4_iconsdir}/locolor/*/*/* %{_kde4_iconsdir}/hicolor/*/*/* %{_kde4_libdir}/kde4/*.so -%{_kde4_datadir}/appdata/%{name}.appdata.xml %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig @@ -174,6 +180,9 @@ update-mime-database %{?fedora:-n} %{_kde4_datadir}/mime &> /dev/null || : %changelog +* Mon Feb 01 2016 Rex Dieter 4.7.2-3 +- rebuild(libalkimia), update URL, .spec cosmetics + * Sat Jan 23 2016 Robert Scheck - 4.7.2-2 - Rebuild for libical 2.0.0