diff options
Diffstat (limited to 'redhat/applications/kaffeine-mozilla')
| -rw-r--r-- | redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch | 22 | ||||
| -rw-r--r-- | redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec | 120 | ||||
| -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 | 131 | ||||
| -rw-r--r-- | redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec | 110 | ||||
| -rw-r--r-- | redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec (renamed from redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec) | 14 |
6 files changed, 9 insertions, 399 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 deleted file mode 100644 index 210fff5f1..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13-fix_nspr_include.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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/kaffeine-mozilla-3.5.13.1.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec deleted file mode 100644 index e00b81a06..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.1.spec +++ /dev/null @@ -1,120 +0,0 @@ -# Default version for this component -%define kdecomp kaffeine-mozilla - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] -Version: 0.4.3.1 -Release: 3%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{kdecomp}-3.5.13.1.tar.gz - -# Fix 'nspr' includes location -Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch - -BuildRequires: trinity-tqtinterface-devel >= 3.5.13.1 -BuildRequires: trinity-tdelibs-devel >= 3.5.13.1 -BuildRequires: trinity-tdebase-devel >= 3.5.13.1 -BuildRequires: desktop-file-utils - -%if 0%{?suse_version} -BuildRequires: mozilla-nspr-devel -%else -BuildRequires: nspr-devel -%endif - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xaw-devel -%else -BuildRequires: libXaw-devel -%endif - -Requires: trinity-kaffeine - -%description -This mozilla plugin launches kaffeine, the xine-based media player for KDE, -when a page containing a supported media format is loaded. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%prep -unset QTDIR; . /etc/profile.d/qt3.sh -%setup -q -n %{kdecomp}-3.5.13.1 -%patch1 -p1 - -%__cp -f "/usr/share/aclocal/libtool.m4" . -%__cp -f "/usr/share/libtool/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" . - -autoreconf -fiv - - -%build -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure \ - --prefix=%{_libdir}/mozilla - -%__make %{?_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Remove useless filess -%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -# These files are installed outside TDE prefix -%{_libdir}/mozilla/plugins/kaffeineplugin.la -%{_libdir}/mozilla/plugins/kaffeineplugin.so - - -%changelog 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 deleted file mode 100644 index e4a255dce..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2-fix_automake.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index b2230c6b3..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.2.spec +++ /dev/null @@ -1,131 +0,0 @@ -# Default version for this component -%define tde_pkg kaffeine-mozilla -%define tde_version 3.5.13.2 - -# TDE specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{tde_pkg} -Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] -Version: 0.4.3.1 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -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 -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} -BuildRequires: desktop-file-utils - -%if 0%{?suse_version} -BuildRequires: mozilla-nspr-devel -%else -BuildRequires: nspr-devel -%endif - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xaw-devel -%endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 -BuildRequires: libXaw-devel -%endif - -Requires: trinity-kaffeine - -%description -This mozilla plugin launches kaffeine, the xine-based media player for TDE, -when a page containing a supported media format is loaded. - - -%if 0%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - - -%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/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR QTINC QTLIB -. /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" - -%configure \ - --prefix=%{_libdir}/mozilla \ - \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath - -%__make %{?_smp_mflags} - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Remove useless filess -%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a - - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -# These files are installed outside TDE prefix -%{_libdir}/mozilla/plugins/kaffeineplugin.la -%{_libdir}/mozilla/plugins/kaffeineplugin.so - - -%changelog diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec deleted file mode 100644 index fdaafa4b0..000000000 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-3.5.13.spec +++ /dev/null @@ -1,110 +0,0 @@ -# Default version for this component -%define kdecomp kaffeine-mozilla - -# TDE 3.5.13 specific building variables -%define tde_bindir %{tde_prefix}/bin -%define tde_datadir %{tde_prefix}/share -%define tde_docdir %{tde_datadir}/doc -%define tde_includedir %{tde_prefix}/include -%define tde_libdir %{tde_prefix}/%{_lib} -%define tde_mandir %{tde_datadir}/man -%define tde_appdir %{tde_datadir}/applications - -%define tde_tdeappdir %{tde_appdir}/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -Name: trinity-%{kdecomp} -Summary: mozilla plugin that lanches kaffeine for supported media types [Trinity] -Version: 0.4.3.1 -Release: 2%{?dist} - -License: GPLv2+ -Group: Applications/Multimedia - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -Prefix: %{tde_prefix} -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-tdelibs-devel -BuildRequires: trinity-tdebase-devel -BuildRequires: desktop-file-utils -BuildRequires: nspr-devel - -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}xaw-devel -%else -BuildRequires: libXaw-devel -%endif - -Requires: trinity-kaffeine - -%description -This mozilla plugin launches kaffeine, the xine-based media player for KDE, -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/"*"/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" . - -autoreconf -fiv - - -%build -export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" - -%configure \ - --disable-rpath \ - --with-extra-includes=%{tde_includedir}/tqt \ - --enable-closure \ - --prefix=%{_libdir}/mozilla - -%__make %{?_smp_mflags} - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -# Remove useless filess -%__rm -f %{?buildroot}%{_libdir}/mozilla/plugins/kaffeineplugin.a - -%clean -%__rm -rf %{buildroot} - - -%post -/sbin/ldconfig || : - -%postun -/sbin/ldconfig || : - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING README -# These files are installed outside TDE prefix -%{_libdir}/mozilla/plugins/kaffeineplugin.la -%{_libdir}/mozilla/plugins/kaffeineplugin.so - - -%changelog diff --git a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec index f9d3be544..775501caa 100644 --- a/redhat/applications/kaffeine-mozilla/kaffeine-mozilla-14.0.0.spec +++ b/redhat/applications/kaffeine-mozilla/kaffeine-mozilla.spec @@ -17,8 +17,9 @@ # Default version for this component %define tde_pkg kaffeine-mozilla +%define tde_prefix /opt/trinity %if "%{?tde_version}" == "" -%define tde_version 14.0.0 +%define tde_version 14.1.0 %endif # TDE specific building variables @@ -37,7 +38,7 @@ %define _docdir %{tde_docdir} -%if 0%{?fedora} >= 27 +%if 0%{?fedora} >= 27 || 0%{?mgaversion} >= 7 || 0%{?rhel} >= 8 %define debug_package %{nil} %endif @@ -58,8 +59,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -# Fix 'nspr' includes location -Patch1: kaffeine-mozilla-3.5.13-fix_nspr_include.patch +BuildRequires: autoconf automake libtool m4 +BuildRequires: gcc-c++ +BuildRequires: pkgconfig +BuildRequires: libtool BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -94,7 +97,6 @@ when a page containing a supported media format is loaded. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .nspr %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "ltmain.sh" @@ -136,6 +138,8 @@ export PATH="%{tde_bindir}:${PATH}" %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README # These files are installed outside TDE prefix +%dir %{_libdir}/mozilla +%dir %{_libdir}/mozilla/plugins %{_libdir}/mozilla/plugins/kaffeineplugin.la %{_libdir}/mozilla/plugins/kaffeineplugin.so |