From 0061571b57d37f17c074ba869a674fb774fb49b4 Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 30 Oct 2011 18:36:20 +0100 Subject: TDE 3.5.13 stable release for RHEL/Fedora --- redhat/applications/k3b/k3b-i18n-trinity.patch | 7 +++++++ redhat/applications/k3b/trinity-k3b-3.5.12.spec | 9 ++++----- redhat/applications/k3b/trinity-k3b-3.5.13.spec | 13 +++++++++++-- 3 files changed, 22 insertions(+), 7 deletions(-) (limited to 'redhat/applications') diff --git a/redhat/applications/k3b/k3b-i18n-trinity.patch b/redhat/applications/k3b/k3b-i18n-trinity.patch index 49ac8a816..0b85e98cf 100644 --- a/redhat/applications/k3b/k3b-i18n-trinity.patch +++ b/redhat/applications/k3b/k3b-i18n-trinity.patch @@ -72,3 +72,10 @@ AC_MSG_ERROR([ I can't find the designer plugins. These are required and should have been installed by kdelibs]) +@@ -1852,7 +1852,7 @@ + fi + + if test -n "$kde_widgetdir"; then +- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer" ++ kde_widgetdir="$kde_widgetdir/trinity/plugins/designer" + fi 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 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 diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec index 59ae57c8e..a40db17d6 100644 --- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec +++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -26,12 +26,16 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %if "%{?_prefix}" == "/usr" Obsoletes: k3b %endif Group: Applications/Archiving License: GPLv2+ + Source0: k3b-%{version}.tar.gz Source1: k3b-i18n-1.0.5.tar.bz2 Source2: k3brc @@ -53,7 +57,7 @@ BuildRequires: dbus-qt-devel hal-devel BuildRequires: flac-devel BuildRequires: gettext BuildRequires: libdvdread-devel -%if 0%{?fedora} >= 15 +%if 0%{?fedora} >= 15 || 0%{?rhel} <= 5 BuildRequires: libmpcdec-devel %else BuildRequires: musepack-tools-devel @@ -92,7 +96,9 @@ start. Summary: Common files of %{name} Group: Applications/Archiving Requires: %{name} = %{version}-%{release} +%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 BuildArch: noarch +%endif %description common %{summary}. @@ -240,5 +246,8 @@ update-desktop-database -q &> /dev/null %changelog +* Sun Oct 30 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + * Sun Sep 11 2011 Francois Andriot - 3.5.13-0 - Import to GIT -- cgit v1.2.1