summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2013-11-24 12:25:52 +0100
committerFran├žois Andriot <albator78@libertysurf.fr>2013-11-24 12:25:52 +0100
commit2bdb0ca57d3ad95d94d1c20a395c5bf210bbcacd (patch)
tree602c425d9c5e2beaa3210482a5cd69ab3cd989aa
parent3393e97ae67ea5094c4e10f39600c1c67f026c09 (diff)
downloadtde-packaging-2bdb0ca57d3ad95d94d1c20a395c5bf210bbcacd.tar.gz
tde-packaging-2bdb0ca57d3ad95d94d1c20a395c5bf210bbcacd.zip
RPM Packaging: add Xine 1.2 dependency
-rw-r--r--redhat/applications/amarok/amarok-14.0.0.spec17
-rw-r--r--redhat/applications/amarok/amarok-3.5.13.2.spec26
-rw-r--r--redhat/applications/kaffeine/kaffeine-14.0.0.spec18
-rw-r--r--redhat/applications/kaffeine/kaffeine-3.5.13.2.spec19
-rw-r--r--redhat/applications/kmplayer/kmplayer-14.0.0.spec29
-rw-r--r--redhat/applications/kmplayer/kmplayer-3.5.13.2.spec33
-rw-r--r--redhat/packages.mga6
-rw-r--r--redhat/tdemultimedia/tdemultimedia-14.0.0.spec2
-rw-r--r--redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec7
9 files changed, 117 insertions, 40 deletions
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index 478e7f58e..c17360fff 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -26,7 +26,7 @@
Name: trinity-%{tde_pkg}
Summary: Media player
Version: 1.4.10
-Release: %{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:13}%{?preversion:12_%{preversion}}%{?dist}%{?_variant}
Group: Applications/Multimedia
License: GPLv2+
@@ -144,13 +144,16 @@ BuildRequires: %{_lib}inotifytools-devel
%endif
# XINE support
-%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires: libxine-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xine1.2-devel
%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: xine-lib-devel
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libxine-devel
%endif
%endif
@@ -432,5 +435,5 @@ done
%changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-12
+* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-13
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec
index a4e345197..46998a8b3 100644
--- a/redhat/applications/amarok/amarok-3.5.13.2.spec
+++ b/redhat/applications/amarok/amarok-3.5.13.2.spec
@@ -26,7 +26,7 @@
Name: trinity-%{tde_pkg}
Summary: Media player
Version: 1.4.10
-Release: %{?!preversion:11}%{?preversion:10_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}%{?_variant}
Group: Applications/Multimedia
License: GPLv2+
@@ -144,13 +144,16 @@ BuildRequires: %{_lib}inotifytools-devel
%endif
# XINE support
-%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires: libxine-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xine1.2-devel
%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: xine-lib-devel
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libxine-devel
%endif
%endif
@@ -367,10 +370,10 @@ if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
@@ -433,6 +436,9 @@ done
%changelog
+* Sun Nov 24 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-12
+- Mageia 3: rebuild against Xine 1.2
+
* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-11
- Build for Fedora 19
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index d8ea7107a..776e36730 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -26,7 +26,7 @@ Name: trinity-%{tde_pkg}
Summary: Xine-based media player
Version: 0.8.8
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
@@ -99,11 +99,17 @@ BuildRequires: libgstreamer-plugins-base-devel >= 0.10
%endif
# XINE support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires: libxine-devel
+%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_xine 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xine1.2-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libxine-devel
%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: xine-lib-devel
%endif
# LAME support
@@ -271,5 +277,5 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-7
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-8
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
index d75eca278..020bf801c 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
@@ -26,7 +26,7 @@ Name: trinity-%{tde_pkg}
Summary: Xine-based media player
Version: 0.8.8
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
@@ -99,11 +99,17 @@ BuildRequires: libgstreamer-plugins-base-devel >= 0.10
%endif
# XINE support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires: libxine-devel
+%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_xine 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xine1.2-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libxine-devel
%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires: xine-lib-devel
%endif
# LAME support
@@ -271,6 +277,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Nov 24 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-7
+- Mageia 3: rebuild against Xine 1.2
+
* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-6
- Build for Fedora 19
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
index e56a2595a..9502a7b7e 100644
--- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec
+++ b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: media player for Trinity
Version: 0.10.0c
-Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
@@ -74,6 +74,20 @@ BuildRequires: gstreamer-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
%endif
+# XINE support
+%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_xine 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xine1.2-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libxine-devel
+%endif
+%endif
+
# X11 stuff
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libxv-devel
@@ -88,6 +102,16 @@ BuildRequires: xorg-x11-devel
BuildRequires: xorg-x11-libXv-devel
%endif
+# GTK2 stuff
+BuildRequires: gtk2-devel
+
+# DBUS stuff
+%if 0%{?suse_version}
+BuildRequires: dbus-1-glib-devel
+%else
+BuildRequires: dbus-glib-devel
+%endif
+
Requires: %{name}-base = %{version}-%{release}
%description
@@ -236,7 +260,6 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
-
%files doc
%defattr(-,root,root,-)
%{tde_tdedocdir}/HTML/*/kmplayer
@@ -251,5 +274,5 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-7
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-8
- Initial release for TDE 14.0.0
diff --git a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
index c369f8af8..9cd8ffe9b 100644
--- a/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
+++ b/redhat/applications/kmplayer/kmplayer-3.5.13.2.spec
@@ -27,7 +27,7 @@
Name: trinity-%{tde_pkg}
Summary: media player for Trinity
Version: 0.10.0c
-Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
@@ -74,8 +74,23 @@ BuildRequires: gstreamer-0_10-devel
BuildRequires: gstreamer-0_10-plugins-base-devel
%endif
+# XINE support
+%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_xine 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xine1.2-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel}
+BuildRequires: xine-lib-devel
+%endif
+%if 0%{?suse_version}
+BuildRequires: libxine-devel
+%endif
+%endif
+
# X11 stuff
%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: libxt-devel
BuildRequires: libxv-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
@@ -88,6 +103,16 @@ BuildRequires: xorg-x11-devel
BuildRequires: xorg-x11-libXv-devel
%endif
+# GTK2 stuff
+BuildRequires: gtk2-devel
+
+# DBUS stuff
+%if 0%{?suse_version}
+BuildRequires: dbus-1-glib-devel
+%else
+BuildRequires: dbus-glib-devel
+%endif
+
Requires: %{name}-base = %{version}-%{release}
%description
@@ -171,7 +196,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--enable-closure \
--enable-rpath
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install
@@ -235,7 +260,6 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/mimelnk/application/x-kmplayer.desktop
%{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
-
%files doc
%defattr(-,root,root,-)
%{tde_tdedocdir}/HTML/*/kmplayer
@@ -250,6 +274,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
+* Sun Nov 24 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-7
+- Mageia 3: rebuild against Xine 1.2
+
* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-6
- Build for Fedora 19
diff --git a/redhat/packages.mga b/redhat/packages.mga
index e1a331fd8..f5f7f6fb2 100644
--- a/redhat/packages.mga
+++ b/redhat/packages.mga
@@ -1,5 +1,6 @@
rpm-build
ccache
+cmake
mysql-devel
unixODBC-devel
libpq-devel
@@ -91,8 +92,8 @@ libgstreamer0.10-devel
lib64gstreamer0.10-devel
libxxf86dga-devel
lib64xxf86dga-devel
-libxine-devel
-lib64xine-devel
+libxine1.2-devel
+lib64xine1.2-devel
gnokii-devel
gpgme-devel
flex
@@ -240,7 +241,6 @@ cdparanoia
libcdda-devel
lib64gstreamer0.10-devel
lib64xxf86dga-devel
-lib64xine-devel
lib64lame-devel
rpm-devel
SDL-devel
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index d1210121a..eaa7eb077 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -129,7 +129,7 @@ BuildRequires: libXt-devel
%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xine-devel
+BuildRequires: %{_lib}xine1.2-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
diff --git a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
index 89c8d9e6f..62e718f27 100644
--- a/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
+++ b/redhat/tdemultimedia/tdemultimedia-3.5.13.2.spec
@@ -28,7 +28,7 @@
Name: trinity-tdemultimedia
Summary: Multimedia applications for the Trinity Desktop Environment (TDE)
Version: %{tde_version}
-Release: %{?!preversion:4}%{?preversion:3_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
License: GPLv2
Group: Applications/Multimedia
@@ -131,7 +131,7 @@ BuildRequires: libXt-devel
%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_xine 1
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}xine-devel
+BuildRequires: %{_lib}xine1.2-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: xine-lib-devel
@@ -1206,6 +1206,9 @@ chmod go-w %{buildroot}%{tde_datadir}/apps/kscd/*
%changelog
+* Sun Nov 24 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-5
+- Mageia 3: rebuild against Xine 1.2
+
* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-4
- Build for Fedora 19