diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-07-22 21:26:05 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-07-22 21:26:05 +0200 |
| commit | f490f5210b1597b85d66ae1fd54a51bdab7ca779 (patch) | |
| tree | dccb24a2e302a13c2332d330578ad97e5eecc63a /redhat/applications/kmymoney | |
| parent | 3691b7f09c6fe434f1fedec711520e4b8dab37a0 (diff) | |
| download | tde-packaging-f490f5210b1597b85d66ae1fd54a51bdab7ca779.tar.gz tde-packaging-f490f5210b1597b85d66ae1fd54a51bdab7ca779.zip | |
RPM Packaging: massive updates for R14.0.1
Diffstat (limited to 'redhat/applications/kmymoney')
| -rw-r--r-- | redhat/applications/kmymoney/kmymoney-14.0.0.spec | 4 | ||||
| -rw-r--r-- | redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch | 11 |
2 files changed, 2 insertions, 13 deletions
diff --git a/redhat/applications/kmymoney/kmymoney-14.0.0.spec b/redhat/applications/kmymoney/kmymoney-14.0.0.spec index c1b92a345..da75f202a 100644 --- a/redhat/applications/kmymoney/kmymoney-14.0.0.spec +++ b/redhat/applications/kmymoney/kmymoney-14.0.0.spec @@ -33,6 +33,8 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity +# Required for Mageia >= 2: removes the ldflag '--no-undefined' +%define _disable_ld_no_undefined 1 Name: trinity-%{tde_pkg} Epoch: %{tde_epoch} @@ -56,7 +58,6 @@ 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} @@ -203,7 +204,6 @@ 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 deleted file mode 100644 index e1a0bc572..000000000 --- a/redhat/applications/kmymoney/kmymoney-14.0.1-ftbfs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - |