summaryrefslogtreecommitdiffstats
path: root/redhat/applications/k3b
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/k3b')
-rw-r--r--redhat/applications/k3b/k3b-i18n-trinity.patch81
-rw-r--r--redhat/applications/k3b/trinity-k3b-3.5.12.spec9
-rw-r--r--redhat/applications/k3b/trinity-k3b-3.5.13.spec39
3 files changed, 109 insertions, 20 deletions
diff --git a/redhat/applications/k3b/k3b-i18n-trinity.patch b/redhat/applications/k3b/k3b-i18n-trinity.patch
new file mode 100644
index 000000000..0b85e98cf
--- /dev/null
+++ b/redhat/applications/k3b/k3b-i18n-trinity.patch
@@ -0,0 +1,81 @@
+--- k3b-i18n-1.0.5/acinclude.m4.ORI 2011-10-30 11:45:36.484658442 +0100
++++ k3b-i18n-1.0.5/acinclude.m4 2011-10-30 11:53:00.134646577 +0100
+@@ -479,14 +479,14 @@
+ if test "$kde_qtver" = "2"; then
+ kde_moduledir='\${libdir}/kde2'
+ else
+- kde_moduledir='\${libdir}/kde3'
++ kde_moduledir='\${libdir}/trinity'
+ fi
+ fi
+ if test -z "$kde_styledir"; then
+- kde_styledir='\${libdir}/kde3/plugins/styles'
++ kde_styledir='\${libdir}/trinity/plugins/styles'
+ fi
+ if test -z "$kde_widgetdir"; then
+- kde_widgetdir='\${libdir}/kde3/plugins/designer'
++ kde_widgetdir='\${libdir}/trinity/plugins/designer'
+ fi
+ if test -z "$xdg_appsdir"; then
+ xdg_appsdir='\${datadir}/applications/kde'
+@@ -546,7 +546,7 @@
+
+ AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
+ [
+- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
++ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/trinity/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+ test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
+ if test -n "$KDEDIRS"; then
+ kde_save_IFS=$IFS
+@@ -612,7 +612,7 @@
+ KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
+
+ if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
+- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
++ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde3/share /opt/kde/share $prefix/share"
+ test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
+ AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
+ if test "$KDE_XSL_STYLESHEET" = "NO"; then
+@@ -1817,7 +1817,7 @@
+
+ if test -z "$1"; then
+
+-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
++kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+ test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
+ kde_incdirs="$ac_kde_includes $kde_incdirs"
+ AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
+@@ -1829,7 +1829,7 @@
+ So, check this please and use another prefix!])
+ fi
+
+-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
++kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+ test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
+ kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
+ AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
+@@ -1837,7 +1837,7 @@
+
+ kde_widgetdir=NO
+ dnl this might be somewhere else
+-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
++AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+
+ if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
+ AC_MSG_ERROR([
+@@ -1845,7 +1845,7 @@
+ So, check this please and use another prefix!])
+ fi
+
+-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
++if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
+ 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 <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
diff --git a/redhat/applications/k3b/trinity-k3b-3.5.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
index 22f1c4238..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 <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
Group: Applications/Archiving
License: GPLv2+
+
Source0: k3b-%{version}.tar.gz
Source1: k3b-i18n-1.0.5.tar.bz2
Source2: k3brc
@@ -42,6 +46,8 @@ Patch4: k3b-1.0.4-manualbufsize.patch
# RHEL6: Fix K3B icon
Patch106: trinity-k3b-icons.patch
+# TDE 3.5.13 library directory changed
+Patch107: k3b-i18n-trinity.patch
BuildRequires: trinity-kdelibs-devel
BuildRequires: desktop-file-utils
@@ -51,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
@@ -90,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}.
@@ -115,6 +123,8 @@ Requires: %{name}-libs = %{version}-%{release}
# set in k3brc too
%patch4 -p1 -b .manualbufsize
%patch106 -p1 -b .desktopfile
+%patch107
+
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -155,27 +165,22 @@ CXXFLAGS="%optflags -fno-strict-aliasing" \
# Build for i18n tarball
pushd k3b-i18n-1.0.5
+autoreconf
%configure
%__make %{?_smp_mflags}
popd
%install
%__rm -rf %{buildroot}
-%make_install
-%make_install -C k3b-i18n-1.0.5
-%{__install} -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
+%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C k3b-i18n-1.0.5
+%__install -D -m 644 -p %{SOURCE2} %{buildroot}%{_datadir}/config/k3brc
# remove the .la files
-%{__rm} -f %{buildroot}%{_libdir}/libk3b*.la
+%__rm -f %{buildroot}%{_libdir}/libk3b*.la
# remove i18n for Plattdeutsch (Low Saxon)
-%{__rm} -fr %{buildroot}%{_datadir}/locale/nds
-
-%find_lang k3b --with-kde
-%find_lang k3bsetup
-%find_lang libk3b
-%find_lang libk3bdevice
-cat k3b.lang k3bsetup.lang libk3b.lang libk3bdevice.lang >> all.lang
+%__rm -fr %{buildroot}%{_datadir}/locale/nds
%check
@@ -212,11 +217,12 @@ update-desktop-database -q &> /dev/null
%{_bindir}/k3b
%{tde_libdir}/*.so
%{tde_libdir}/*.la
-%doc %{tde_docdir}/HTML/*/k3b/*
+%doc %{_docdir}/HTML/*/k3b/*
-%files common -f all.lang
+%files common
%defattr(-,root,root,-)
%{_datadir}/applications/kde/*.desktop
+%{_datadir}/applnk/.hidden/*.desktop
%{_datadir}/apps/k3b/
%{_datadir}/apps/konqueror/servicemenus/*.desktop
%{_datadir}/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
@@ -240,5 +246,8 @@ update-desktop-database -q &> /dev/null
%changelog
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
+- Initial release for RHEL 6, RHEL 5 and Fedora 15
+
* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
- Import to GIT