RHEL/fedora: updates for K3B

3 files changed, 10 insertions, 109 deletions

diff --git a/redhat/applications/k3b/k3b-i18n-1.0.5.tar.bz2 b/redhat/applications/k3b/k3b-i18n-1.0.5.tar.bz2
deleted file mode 100644
index 014b9528e..000000000
--- a/redhat/applications/k3b/k3b-i18n-1.0.5.tar.bz2
+++ /dev/null
diff --git a/redhat/applications/k3b/k3b-i18n-trinity.patch b/redhat/applications/k3b/k3b-i18n-trinity.patch
deleted file mode 100644
index 0b85e98cf..000000000
--- a/redhat/applications/k3b/k3b-i18n-trinity.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- 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.13.spec b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
index 4fd7f7221..544b3ca5b 100644
--- a/redhat/applications/k3b/trinity-k3b-3.5.13.spec
+++ b/redhat/applications/k3b/trinity-k3b-3.5.13.spec
@@ -1,13 +1,7 @@
-# Default version for this component
-%if "%{?version}" == ""
-%define version 3.5.13
-%endif
-%define release 3
-
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
@@ -19,8 +13,8 @@ BuildRequires: autoconf automake libtool m4
 
 Name:    trinity-k3b
 Summary: CD/DVD burning application
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
+Version: 3.5.13
+Release: 4%{?dist}%{?_variant}
 
 Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
@@ -37,18 +31,15 @@ Group:   Applications/Archiving
 License: GPLv2+
 
 Source0: k3b-%{version}.tar.gz
-Source1: k3b-i18n-1.0.5.tar.bz2
 Source2: k3brc
 
 # Legacy RedHat / Fedora patches
 # manual bufsize (upstream?)
 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
-
 # [k3b] Fix compilation with GCC 4.7 [Bug #958]
 Patch108:	k3b-3.5.13-fix_Range_r_3-gcc47.patch
 
@@ -71,9 +62,6 @@ BuildRequires: zlib-devel
 Obsoletes: k3b-extras < 0:1.0-1
 Provides:  k3b-extras = %{version}-%{release} 
 
-Obsoletes: %{name}-i18n
-Provides: %{name}-i18n
-
 Requires(post): coreutils
 Requires(postun): coreutils
 
@@ -117,12 +105,11 @@ Requires: %{name}-libs = %{version}-%{release}
 
 
 %prep
-%setup -q -a 1 -n applications/k3b
+%setup -q -a 0 -n applications/k3b
 
 # set in k3brc too 
 %patch4 -p1 -b .manualbufsize
 %patch106 -p1 -b .desktopfile
-%patch107
 %patch108 -p1
 
 
@@ -164,24 +151,16 @@ CXXFLAGS="%optflags -fno-strict-aliasing" \
 
 %__make %{?_smp_mflags}
 
-# Build for i18n tarball
-pushd k3b-i18n-1.0.5
-autoreconf
-%configure
-%__make %{?_smp_mflags}
-popd
-
 %install
 %__rm -rf %{buildroot}
 %__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 
 
 # remove i18n for Plattdeutsch (Low Saxon)
-%__rm -fr %{buildroot}%{_datadir}/locale/nds
+#%__rm -fr %{buildroot}%{_datadir}/locale/nds
 
 
 %check
@@ -218,7 +197,7 @@ update-desktop-database -q &> /dev/null
 %{_bindir}/k3b
 %{tde_libdir}/*.so
 %{tde_libdir}/*.la
-%doc %{tde_docdir}/HTML/en/k3b
+%{tde_docdir}/HTML/en/k3b
 
 %files common
 %defattr(-,root,root,-)
@@ -247,6 +226,9 @@ update-desktop-database -q &> /dev/null
 
 
 %changelog
+* Wed May 09 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
+- Removes i18 files (built separately)
+
 * Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
 - Rebuilt for Fedora 17
 - Fix compilation with GCC 4.7 [Bug #958]