From 2835777e9ae7bde053e0da2f083ee020f26ea04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 29 Jun 2015 20:17:57 +0200 Subject: RPM Packaging: massive update spec files --- redhat/applications/kmymoney/kmymoney-14.0.0.spec | 12 ++++++++---- redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch | 11 +++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch (limited to 'redhat/applications/kmymoney') diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec index b529c8547..c1b92a345 100644 --- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec +++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec @@ -1,5 +1,5 @@ # -# spec file for package kmymoney (version R14.0.0) +# spec file for package kmymoney (version R14) # # Copyright (c) 2014 Trinity Desktop Environment # @@ -17,7 +17,9 @@ # TDE variables %define tde_epoch 2 +%if "%{?tde_version}" == "" %define tde_version 14.0.0 +%endif %define tde_pkg kmymoney %define tde_prefix /opt/trinity %define tde_bindir %{tde_prefix}/bin @@ -54,6 +56,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source1: kmymoneytitlelabel.png +Patch0: kmymoney-14.0.1-ftbfs.patch BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -100,7 +103,7 @@ BuildRequires: openjade-devel BuildRequires: libtqt3-mt-sqlite3 Requires: libtqt3-mt-sqlite3 -Requires: %{name}-common == %{version}-%{release} +Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release} %description @@ -142,7 +145,7 @@ done %package common Summary: KMyMoney architecture independent files Group: Applications/Utilities -Requires: %{name} == %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description common This package contains architecture independent files needed for KMyMoney to @@ -175,7 +178,7 @@ have '%{name}' package installed, you will hardly find this package useful. %package devel Summary: KMyMoney development files Group: Development/Libraries -Requires: %{name} == %{version}-%{release} +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} %description devel This package contains development files needed for KMyMoney plugins. @@ -200,6 +203,7 @@ This package contains development files needed for KMyMoney plugins. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch0 -p1 -b .ftbfs %__install -m644 %{SOURCE1} kmymoney2/widgets/ diff --git a/redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch b/redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch new file mode 100644 index 000000000..e1a0bc572 --- /dev/null +++ b/redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch @@ -0,0 +1,11 @@ +--- trinity-kmymoney-14.0.1~pre4+bb123ba2/kmymoney2/mymoney/Makefile.am.orig 2015-06-28 12:58:53.565869007 +0200 ++++ trinity-kmymoney-14.0.1~pre4+bb123ba2/kmymoney2/mymoney/Makefile.am 2015-06-28 12:59:16.595869143 +0200 +@@ -33,7 +33,7 @@ + libkmm_mymoney_la_METASOURCES = AUTO + + libkmm_mymoney_la_SOURCES = mymoneymoney.cpp mymoneyfinancialcalculator.cpp mymoneytransactionfilter.cpp mymoneyobject.cpp mymoneykeyvaluecontainer.cpp mymoneyobserver.cpp mymoneysubject.cpp mymoneysplit.cpp mymoneyinstitution.cpp mymoneyexception.cpp mymoneyinvesttransaction.cpp mymoneyutils.cpp mymoneysecurity.cpp mymoneytransaction.cpp mymoneyscheduled.cpp mymoneypayee.cpp mymoneyfile.cpp mymoneycategory.cpp mymoneyaccount.cpp mymoneyreport.cpp mymoneystatement.cpp mymoneyprice.cpp mymoneybudget.cpp mymoneyobjectcontainer.cpp mymoneyforecast.cpp +-libkmm_mymoney_la_LDFLAGS = $(all_libraries) -version-info $(LIBVERSION) ++libkmm_mymoney_la_LDFLAGS = $(all_libraries) -version-info $(LIBVERSION) $(LIB_QT) $(LIB_TDECORE) + + SUBDIRS = storage + -- cgit v1.2.1