diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-11-24 12:25:52 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-11-24 12:25:52 +0100 |
| commit | 2bdb0ca57d3ad95d94d1c20a395c5bf210bbcacd (patch) | |
| tree | 602c425d9c5e2beaa3210482a5cd69ab3cd989aa /redhat/applications/amarok | |
| parent | 3393e97ae67ea5094c4e10f39600c1c67f026c09 (diff) | |
| download | tde-packaging-2bdb0ca57d3ad95d94d1c20a395c5bf210bbcacd.tar.gz tde-packaging-2bdb0ca57d3ad95d94d1c20a395c5bf210bbcacd.zip | |
RPM Packaging: add Xine 1.2 dependency
Diffstat (limited to 'redhat/applications/amarok')
| -rw-r--r-- | redhat/applications/amarok/amarok-14.0.0.spec | 17 | ||||
| -rw-r--r-- | redhat/applications/amarok/amarok-3.5.13.2.spec | 26 |
2 files changed, 26 insertions, 17 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 |