diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-04-04 22:47:12 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-04-04 22:47:12 +0200 |
| commit | 2bccc67f69c937e4db4e12f77182be57dbbb9a6a (patch) | |
| tree | b5e373b52fbb70d9965dd446300766b449cf524d /redhat/applications/kaffeine-mozilla | |
| parent | 7b26da834f79b8b6eb2d8e99a1467ffea2791380 (diff) | |
| download | tde-packaging-2bccc67f69c937e4db4e12f77182be57dbbb9a6a.tar.gz tde-packaging-2bccc67f69c937e4db4e12f77182be57dbbb9a6a.zip | |
RPM Packaging: update 3.5.13.2 packages
Diffstat (limited to 'redhat/applications/kaffeine-mozilla')
| -rw-r--r-- | redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch | 11 | ||||
| -rw-r--r-- | redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec | 6 |
2 files changed, 16 insertions, 1 deletions
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch new file mode 100644 index 000000000..e4a255dce --- /dev/null +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch @@ -0,0 +1,11 @@ +--- trinity-kaffeine-mozilla-3.5.13.2/admin/cvs.sh.ORI 2014-03-23 11:29:59.873837637 +0100 ++++ trinity-kaffeine-mozilla-3.5.13.2/admin/cvs.sh 2014-03-23 11:30:39.942924217 +0100 +@@ -130,7 +130,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/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec index e1e3ded56..21fc166b0 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec @@ -43,6 +43,8 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz # Fix 'nspr' includes location Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch +# Fix build with newer automake +Patch2: kaffeine-mozilla-3.5.13.2-fix_automake.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -78,6 +80,7 @@ when a page containing a supported media format is loaded. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch1 -p1 -b .nspr +%patch2 -p1 -b .automake %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/config/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh" @@ -85,7 +88,8 @@ when a page containing a supported media format is loaded. %build -unset QTDIR; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" %configure \ |