summaryrefslogtreecommitdiffstats
path: root/redhat/applications/k3b/trinity-k3b-3.5.12.spec
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-04 12:48:59 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-04 12:48:59 -0500
commit169853a068683db6540e3b77542d5139bb7867d1 (patch)
tree2163209e7dc0569f9b0f68cf15284fe80f8c9e2e /redhat/applications/k3b/trinity-k3b-3.5.12.spec
parent7acfaa9e6409ed0ebdbc2e6fb67e8bc9b64b33d2 (diff)
parent43240f192dbdd0c0d267bc7c4a96f123704f0e2b (diff)
downloadtde-packaging-169853a068683db6540e3b77542d5139bb7867d1.tar.gz
tde-packaging-169853a068683db6540e3b77542d5139bb7867d1.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/applications/k3b/trinity-k3b-3.5.12.spec')
-rw-r--r--redhat/applications/k3b/trinity-k3b-3.5.12.spec9
1 files changed, 4 insertions, 5 deletions
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.12.spec b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
index 423655f54..e58543d38 100644
--- a/redhat/applications/k3b/trinity-k3b-3.5.12.spec
+++ b/redhat/applications/k3b/trinity-k3b-3.5.12.spec
@@ -26,6 +26,9 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
+Prefix: %{_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
%if "%{?_prefix}" == "/usr"
Obsoletes: k3b
%endif
@@ -33,10 +36,6 @@ Obsoletes: k3b
Group: Applications/Archiving
License: GPLv2+
-Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-
Source0: k3b-%{version}.tar.gz
Source1: k3b-i18n-1.0.5.tar.bz2
Source2: k3brc
@@ -62,7 +61,7 @@ BuildRequires: dbus-qt-devel hal-devel
BuildRequires: flac-devel
BuildRequires: gettext
BuildRequires: libdvdread-devel
-%if 0%{?fedora} >= 15 || 0%{?rhel} && 0%{?rhel} <= 5
+%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5
BuildRequires: libmpcdec-devel
%else
BuildRequires: musepack-tools-devel