diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-08-31 15:38:14 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-08-31 15:38:14 +0200 |
| commit | cdec7ede2cd93dedf437e5b10597433ea9d9eabe (patch) | |
| tree | 723b1f74f1d9d264363e9b535466dd461be8fef6 /redhat/applications/kmymoney | |
| parent | 1af57210e2e55d40eb39a274fcf48779c6b9e7d5 (diff) | |
| download | tde-packaging-cdec7ede2cd93dedf437e5b10597433ea9d9eabe.tar.gz tde-packaging-cdec7ede2cd93dedf437e5b10597433ea9d9eabe.zip | |
RPM Packaging: update 3.5.13.2 for openSUSE 13.1
Diffstat (limited to 'redhat/applications/kmymoney')
| -rw-r--r-- | redhat/applications/kmymoney/admin-fix-parallel-test.diff | 11 | ||||
| -rw-r--r-- | redhat/applications/kmymoney/kmymoney-3.5.13.2.spec | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/redhat/applications/kmymoney/admin-fix-parallel-test.diff b/redhat/applications/kmymoney/admin-fix-parallel-test.diff new file mode 100644 index 000000000..9f6f46ba8 --- /dev/null +++ b/redhat/applications/kmymoney/admin-fix-parallel-test.diff @@ -0,0 +1,11 @@ +--- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113 2013-06-26 22:35:42.000000000 +0200 ++++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh 2013-08-29 22:27:18.546349736 +0200 +@@ -123,7 +123,7 @@ + fi + + echo "*** Creating Makefile templates" +-$AUTOMAKE || exit 1 ++$AUTOMAKE --add-missing || exit 1 + + if test "$UNSERMAKE" = no; then + echo "*** Postprocessing Makefile templates" diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec index 972e753e9..a7ccc0a4d 100644 --- a/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec +++ b/redhat/applications/kmymoney/kmymoney-3.5.13.2.spec @@ -59,6 +59,9 @@ Source1: kmymoneytitlelabel.png # [kmymoney] Fix FTBFS Patch1: kmymoney-3.5.13.2-ftbfs.patch +# [admin] Fix automake 1.13 build issue +Patch2: admin-fix-parallel-test.diff + # [kmymoney] Missing LDFLAGS causing FTBFS Patch4: kmymoney-3.5.13-missing_ldflags.patch @@ -126,14 +129,11 @@ This package contains development files needed for KMyMoney plugins. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch1 -p1 -b .ftbfs +%patch2 -p1 -b .automake113 %if 0%{?mgaversion} || 0%{?mdkversion} %patch5 -p1 -b .qtpluginsdir %endif -%if 0%{?mgaversion} >= 3 || 0%{?pclinuxos} >= 2013 || 0%{?fedora} >= 19 -%__cp /usr/share/automake-1.13/test-driver admin/ -%endif - %__install -m644 %{SOURCE1} kmymoney2/widgets/ %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" |