diff options
| -rw-r--r-- | redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch | 22 | ||||
| -rw-r--r-- | redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec | 16 |
2 files changed, 31 insertions, 7 deletions
diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch new file mode 100644 index 000000000..210fff5f1 --- /dev/null +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch @@ -0,0 +1,22 @@ +--- kaffeine-mozilla/src/jni_md.h.ORI 2012-04-26 20:44:15.080210122 +0200 ++++ kaffeine-mozilla/src/jni_md.h 2012-04-26 20:44:28.006895031 +0200 +@@ -40,7 +40,7 @@ + #ifndef JNI_MD_H + #define JNI_MD_H + +-#include <nspr/prtypes.h> /* needed for _declspec */ ++#include <nspr4/prtypes.h> /* needed for _declspec */ + + /******************************************************************************* + * WHAT'S UP WITH THIS FILE? +--- kaffeine-mozilla/src/jri_md.h.ORI 2012-04-26 20:44:20.528077329 +0200 ++++ kaffeine-mozilla/src/jri_md.h 2012-04-26 20:44:36.239694357 +0200 +@@ -43,7 +43,7 @@ + #define JRI_MD_H + + #include <assert.h> +-#include <nspr/prtypes.h> /* Needed for HAS_LONG_LONG ifdefs */ ++#include <nspr4/prtypes.h> /* Needed for HAS_LONG_LONG ifdefs */ + + #ifdef __cplusplus + extern "C" { diff --git a/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec b/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec index e693dadb9..8a037a459 100644 --- a/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec +++ b/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec @@ -1,7 +1,7 @@ # Default version for this component %define kdecomp kaffeine-mozilla -%define version 0.4.3.1.dfsg -%define release 1 +%define version 0.4.3.1 +%define release 2 %define _prefix /usr @@ -35,6 +35,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz +# Fix 'nspr' includes location +Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch BuildRequires: tqtinterface-devel BuildRequires: trinity-kdelibs-devel @@ -53,15 +55,12 @@ when a page containing a supported media format is loaded. %prep unset QTDIR; . /etc/profile.d/qt.sh %setup -q -n applications/%{kdecomp} +%patch1 -p1 %__cp -f "/usr/share/aclocal/libtool.m4" . %__cp -f "/usr/share/libtool/config/ltmain.sh" . -autoreconf +autoreconf -fiv -for i in src/jri_md.h src/jni_md.h; do - %__sed -i "${i}" \ - -e "s|nspr/prtypes.h|nspr4/prtypes.h|g" -done %build export PATH="%{_bindir}:${PATH}" @@ -105,6 +104,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %Changelog +* Thu Apr 26 2012 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1-2 +- Rebuild with nicer patch. + * Sat Dec 03 2011 Francois Andriot <francois.andriot@free.fr> - 0.4.3.1.dfsg-1 - Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 |