RHEL/Fedora: updates many packaging

8 files changed, 179 insertions, 21 deletions

diff --git a/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec b/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec
index efad8aef6..01b03b014 100644
--- a/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec
+++ b/redhat/applications/kaffeine-mozilla/trinity-kaffeine-mozilla.spec
@@ -68,7 +68,8 @@ unset QTDIR; . /etc/profile.d/qt.sh
 %patch1 -p1
 
 %__cp -f "/usr/share/aclocal/libtool.m4" .
-%__cp -f "/usr/share/libtool/config/ltmain.sh" .
+%__cp -f "/usr/share/libtool/config/ltmain.sh" . || %__cp "/usr/share/libtool/ltmain.sh" .
+
 autoreconf -fiv
 
 
diff --git a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
index df4218b5d..b560c7647 100644
--- a/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
+++ b/redhat/applications/kdiff3/trinity-kdiff3-3.5.13.spec
@@ -48,8 +48,9 @@ Patch1:		bp001-9b57232f.diff
 Patch2:		bp002-d654b107.diff
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-arts-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 %description
@@ -130,7 +131,7 @@ done
 %{tde_tdedocdir}/HTML/*/*
 %{tde_datadir}/services/*.desktop
 %{tde_datadir}/applnk/Development/*.desktop
-%{tde_datadir}/applnk/.hidden/*.desktop
+%{tde_datadir}/applnk/.hidden/kdiff3plugin.desktop
 %{tde_mandir}/man*/*
 
 %{tde_tdelibdir}/*.so
diff --git a/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
index 9e01de404..dfe995a5f 100644
--- a/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
+++ b/redhat/applications/kmymoney/trinity-kmymoney-3.5.13.spec
@@ -118,7 +118,9 @@ This package contains development files needed for KMyMoney plugins.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%if 0%{?mgaversion} || 0%{?mdkversion}
 %patch5 -p1 -b .qtpluginsdir
+%endif
 
 %__install -m644 %{SOURCE1} kmymoney2/widgets/
 
diff --git a/redhat/applications/koffice/trinity-koffice-3.5.13-sru.spec b/redhat/applications/koffice/trinity-koffice-3.5.13-sru.spec
index f7ed27a99..7de29d6dc 100644
--- a/redhat/applications/koffice/trinity-koffice-3.5.13-sru.spec
+++ b/redhat/applications/koffice/trinity-koffice-3.5.13-sru.spec
@@ -102,12 +102,6 @@ BuildRequires:  libpaper-devel
 BuildRequires:	libutempter-devel
 BuildRequires:	GraphicsMagick-devel >= 1.1.0
 
-#%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-#BuildRequires:	poppler-qt-devel >= 0.1.2
-#%else
-#BuildRequires:	trinity-poppler-qt3-devel >= 0.1.2
-#%endif
-
 BuildRequires:	trinity-tdegraphics-libpoppler-tqt-devel
 
 # These libraries are either too old or too recent on distributions !
diff --git a/redhat/applications/koffice/trinity-koffice-3.5.13.spec b/redhat/applications/koffice/trinity-koffice-3.5.13.spec
index 996f785d1..255c5560f 100644
--- a/redhat/applications/koffice/trinity-koffice-3.5.13.spec
+++ b/redhat/applications/koffice/trinity-koffice-3.5.13.spec
@@ -23,7 +23,7 @@
 %define _docdir %{tde_docdir}
 
 # Disable Kross support for RHEL <= 5 (python is too old)
-%if 0%{?fedora} > 0 || 0%{?rhel} >= 6
+%if 0%{?fedora} > 0 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_kross 1
 %endif
 
@@ -38,7 +38,7 @@
 
 
 Name:		trinity-%{kdecomp}
-Summary:        An integrated office suite
+Summary:	An integrated office suite
 Version:	1.6.3
 Release:	5%{?dist}%{?_variant}
 
@@ -117,30 +117,23 @@ BuildRequires:  libpaper-devel
 BuildRequires:	libutempter-devel
 BuildRequires:	GraphicsMagick-devel >= 1.1.0
 
-#%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
-#BuildRequires:	poppler-qt-devel >= 0.1.2
-#%else
-#BuildRequires:	trinity-poppler-qt3-devel >= 0.1.2
-#%endif
-
 BuildRequires:	trinity-tdegraphics-libpoppler-tqt-devel
 
 # These libraries are either too old or too recent on distributions !
 # We always provide our versions with TDE...
 BuildRequires:	trinity-libwpd-devel
+BuildRequires:  trinity-libpqxx-devel
 
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}mesagl1-devel
 BuildRequires:	%{_lib}mesaglu1-devel
 BuildRequires:	%{_lib}xi-devel
 BuildRequires:  wv2-devel
-BuildRequires:  libpqxx-devel
 %else
 BuildRequires:  libGL-devel
 BuildRequires:	libGLU-devel
 BuildRequires:  libXi-devel
 BuildRequires:  trinity-wv2-devel
-BuildRequires:  trinity-libpqxx-devel
 %endif
 
 %description
@@ -272,12 +265,18 @@ Requires:       %{name}-core = %{version}-%{release}
 Summary:        A powerful formula editor
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{version}-%{release}
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires:		fonts-ttf-dejavu
+%else
 Requires:       lyx-cmex10-fonts
 %if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
 Requires:       dejavu-lgc-sans-fonts
 %else
 Requires:       dejavu-lgc-fonts 
 %endif
+%endif
+
 %description kformula
 %{summary}.
 
@@ -380,7 +379,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
   --with-pic --enable-shared --disable-static \
   --with-extra-libs=%{tde_libdir} \
   --enable-final \
-  --with-extra-includes=%{tde_includedir}/tqt \
+  --with-extra-includes=%{tde_includedir}/tqt:%{tde_includedir}/arts \
   --enable-closure \
   --disable-kexi-macros \
   --with-pqxx-includes=%{tde_includedir} \
@@ -422,10 +421,12 @@ desktop-file-install \
 
 ## Hack-in NoDisplay=True (http://bugzilla.redhat.com/245061)
 ## until http://bugzilla.redhat.com/245190 is fixed
+%if 0%{?rhel} || 0%{?fedora}
 for desktop_file in %{buildroot}%{tde_datadir}/applnk/.hidden/*.desktop ; do
   grep "^NoDisplay=" ${desktop_file} || \
     echo "NoDisplay=True" >> ${desktop_file}
 done
+%endif
 
 ## unpackaged files
 # fonts
diff --git a/redhat/applications/kpowersave/trinity-kpowersave-3.5.13-sru.spec b/redhat/applications/kpowersave/trinity-kpowersave-3.5.13-sru.spec
new file mode 100644
index 000000000..c160aa2ea
--- /dev/null
+++ b/redhat/applications/kpowersave/trinity-kpowersave-3.5.13-sru.spec
@@ -0,0 +1,158 @@
+# Default version for this component
+%define kdecomp kpowersave
+
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# TDE 3.5.13 specific building variables
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%define tde_docdir %{tde_datadir}/doc
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
+%define tde_appdir %{tde_datadir}/applications
+
+%define tde_tdeappdir %{tde_appdir}/kde
+%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
+
+Name:		trinity-%{kdecomp}
+Version:	0.7.3
+Release:	3%{?dist}%{?_variant}
+Summary:	HAL based power management applet for Trinityfiles or directories.
+
+License:	GPLv2+
+Group:		Applications/Utilities
+
+Vendor:		Trinity Project
+Packager:	Francois Andriot <francois.andriot@free.fr>
+URL:		http://www.trinitydesktop.org/
+
+Prefix:    %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Source0:	%{kdecomp}-3.5.13.tar.gz
+
+# [kpowersave] Switch to v3.5.13-sru branch
+Patch0:		kpowersave-3.5.13-sru-20120818.patch
+
+BuildRequires:	dbus-tqt-devel
+BuildRequires:	tqtinterface-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
+BuildRequires:	desktop-file-utils
+
+%description
+KPowersave is a TDE systray applet which allows to control the power 
+management settings and policies of your computer.
+It relies on HAL to do the heavy lifting.
+
+Current feature list:
+ * support for ACPI, APM and PMU
+ * trigger suspend to disk/ram and standby
+ * switch cpu frequency policy (between: performance, dynamic and powersave)
+ * applet icon with information about AC state, battery fill and battery
+   (warning) states
+ * applet tooltip with information about battery fill and remaining battery 
+   time/percentage
+ * autosuspend (to suspend the machine if the user has been inactive for a 
+   defined time)
+ * a global configurable blacklist with programs which prevent autosuspend
+   (e.g. videoplayer and cd burning tools)
+ * trigger lock screen and select the lock method
+ * KNotify support
+ * online help
+ * localisations for many languages
+ 
+KPowersave supports schemes with following configurable specific 
+settings for:
+ * screensaver
+ * DPMS
+ * autosuspend
+ * scheme specific blacklist for autosuspend
+ * notification settings
+
+
+%prep
+%setup -q -n applications/%{kdecomp}
+%patch0 -p1
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+	
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
+%cmake \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_SKIP_RPATH="OFF" \
+	..
+
+%__make %{?_smp_mflags}
+
+
+%install
+export PATH="%{tde_bindir}:${PATH}"
+%__rm -rf %{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
+
+
+%clean
+%__rm -rf %{buildroot}
+
+
+%post
+update-desktop-database %{tde_appdir} > /dev/null
+/sbin/ldconfig
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+%postun
+update-desktop-database %{tde_appdir} > /dev/null
+/sbin/ldconfig
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%{tde_bindir}/kpowersave
+%{tde_libdir}/libkdeinit_kpowersave.la
+%{tde_libdir}/libkdeinit_kpowersave.so
+%{tde_tdelibdir}/kpowersave.la
+%{tde_tdelibdir}/kpowersave.so
+%{tde_tdeappdir}/kpowersave.desktop
+%{tde_datadir}/apps/kpowersave/eventsrc
+%{tde_datadir}/apps/kpowersave/icons/*/*/*/*.png
+%{tde_datadir}/icons/hicolor/*/*/*.png
+%{tde_datadir}/autostart/kpowersave-autostart.desktop
+%{tde_datadir}/config/kpowersaverc
+
+%Changelog
+* Sat Aug 18 2012 Francois Andriot <francois.andriot@free.fr> - 0.7.3-3
+- Rebuilt for tdelibs-3.5.13-11
+- Switch to v3.5.13-sru branch
+
+* Sat Nov 26 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-2
+- Add missing /sbin/ldconfig
+- Add missing doc file
+
+* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.7.3-1
+- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16
diff --git a/redhat/applications/kpowersave/trinity-kpowersave.spec b/redhat/applications/kpowersave/trinity-kpowersave-3.5.13.spec
index b496d3af6..b496d3af6 100644
--- a/redhat/applications/kpowersave/trinity-kpowersave.spec
+++ b/redhat/applications/kpowersave/trinity-kpowersave-3.5.13.spec
diff --git a/redhat/applications/rosegarden/trinity-rosegarden-3.5.13.spec b/redhat/applications/rosegarden/trinity-rosegarden-3.5.13.spec
index 9ef78c80a..053e24ad0 100644
--- a/redhat/applications/rosegarden/trinity-rosegarden-3.5.13.spec
+++ b/redhat/applications/rosegarden/trinity-rosegarden-3.5.13.spec
@@ -66,6 +66,7 @@ BuildRequires:	fontconfig-devel
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}jack-devel
 %else
+BuildRequires:	lirc-devel
 BuildRequires:	jack-audio-connection-kit-devel
 %endif