RHEL/Fedora: add support for MGA2/MDV2011 in many applications

1 files changed, 104 insertions, 74 deletions

diff --git a/redhat/applications/smb4k/trinity-smb4k.spec b/redhat/applications/smb4k/trinity-smb4k.spec
index dc355edfe..23ba5ba87 100644
--- a/redhat/applications/smb4k/trinity-smb4k.spec
+++ b/redhat/applications/smb4k/trinity-smb4k.spec
@@ -1,25 +1,32 @@
 # Default version for this component
 %define kdecomp smb4k
-%define version 0.9.4
-%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
 %define _variant .opt
-%define _docdir %{_datadir}/doc
 %endif
 
 # TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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_tdedocdir}
 
 
 Name:		trinity-%{kdecomp}
 Summary:	A Samba (SMB) share advanced browser for Trinity
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	0.9.4
+Release:	2%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -28,7 +35,7 @@ Vendor:		Trinity Project
 Packager:	Francois Andriot <francois.andriot@free.fr>
 URL:		http://www.trinitydesktop.org
 
-Prefix:    %{_prefix}
+Prefix:    %{tde_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
@@ -38,8 +45,8 @@ Patch1:		smb4k-3.5.13-fix_gcc47_compilation.patch
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
-BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	trinity-kdebase-devel
+BuildRequires:	trinity-tdelibs-devel
+BuildRequires:	trinity-tdebase-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
@@ -50,6 +57,74 @@ suite to access the SMB shares of the local network neighborhood. Its purpose
 is to provide a program that's easy to use and has as many features as 
 possible.
 
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%{tde_bindir}/smb4k
+%{tde_bindir}/smb4k_cat
+%{tde_bindir}/smb4k_kill
+%{tde_bindir}/smb4k_mount
+%{tde_bindir}/smb4k_mv
+%{tde_bindir}/smb4k_umount
+%{tde_libdir}/libsmb4kcore.so.2
+%{tde_libdir}/libsmb4kcore.so.2.0.0
+%{tde_libdir}/libsmb4kdialogs.la
+%{tde_libdir}/libsmb4kdialogs.so
+%{tde_tdelibdir}/konqsidebar_smb4k.la
+%{tde_tdelibdir}/konqsidebar_smb4k.so
+%{tde_tdelibdir}/libsmb4kconfigdialog.la
+%{tde_tdelibdir}/libsmb4kconfigdialog.so
+%{tde_tdelibdir}/libsmb4knetworkbrowser.la
+%{tde_tdelibdir}/libsmb4knetworkbrowser.so
+%{tde_tdelibdir}/libsmb4ksearchdialog.la
+%{tde_tdelibdir}/libsmb4ksearchdialog.so
+%{tde_tdelibdir}/libsmb4ksharesiconview.la
+%{tde_tdelibdir}/libsmb4ksharesiconview.so
+%{tde_tdelibdir}/libsmb4kshareslistview.la
+%{tde_tdelibdir}/libsmb4kshareslistview.so
+%{tde_tdeappdir}/smb4k.desktop
+%{tde_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
+%{tde_datadir}/apps/smb4k/smb4k_shell.rc
+%{tde_datadir}/apps/smb4knetworkbrowserpart/smb4knetworkbrowser_part.rc
+%{tde_datadir}/apps/smb4ksharesiconviewpart/smb4ksharesiconview_part.rc
+%{tde_datadir}/apps/smb4kshareslistviewpart/smb4kshareslistview_part.rc
+%{tde_datadir}/config.kcfg/smb4k.kcfg
+%{tde_datadir}/icons/crystalsvg/*/apps/smb4k.png
+%{tde_tdedocdir}/HTML/en/smb4k/
+
+%post
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
+/sbin/ldconfig || :
+
+%postun
+update-desktop-database %{tde_appdir} > /dev/null
+touch --no-create %{tde_datadir}/icons/crystalsvg || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || :
+/sbin/ldconfig || :
+
+##########
+
+%package devel
+Summary:		Development files for %{name}
+Group:			Development/Libraries
+Requires:		%{name} = %{version}-%{release}
+
+%description devel
+%{summary}
+
+%files devel
+%{tde_tdeincludedir}/*.h
+%{tde_libdir}/libsmb4kcore.la
+%{tde_libdir}/libsmb4kcore.so
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+##########
 
 %prep
 %setup -q -n applications/%{kdecomp}
@@ -58,8 +133,8 @@ possible.
 # Ugly hack to modify TQT include directory inside autoconf files.
 # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
 %__sed -i admin/acinclude.m4.in \
-  -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -67,82 +142,37 @@ possible.
 
 
 %build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --libdir=%{tde_libdir} \
+  --mandir=%{tde_mandir} \
+  --includedir=%{tde_tdeincludedir} \
+  --disable-rpath \
+  --with-extra-includes=%{tde_includedir}/tqt
 
 # SMP safe !
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-
+%find_lang %{kdecomp}
 
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%post
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{_datadir}/icons/crystalsvg || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-/sbin/ldconfig || :
-
-
-%files
-%defattr(-,root,root,-)
-%{_bindir}/smb4k
-%{_bindir}/smb4k_cat
-%{_bindir}/smb4k_kill
-%{_bindir}/smb4k_mount
-%{_bindir}/smb4k_mv
-%{_bindir}/smb4k_umount
-%{_includedir}/*.h
-%{_libdir}/libsmb4kcore.la
-%{_libdir}/libsmb4kcore.so
-%{_libdir}/libsmb4kcore.so.2
-%{_libdir}/libsmb4kcore.so.2.0.0
-%{_libdir}/libsmb4kdialogs.la
-%{_libdir}/libsmb4kdialogs.so
-%{tde_libdir}/konqsidebar_smb4k.la
-%{tde_libdir}/konqsidebar_smb4k.so
-%{tde_libdir}/libsmb4kconfigdialog.la
-%{tde_libdir}/libsmb4kconfigdialog.so
-%{tde_libdir}/libsmb4knetworkbrowser.la
-%{tde_libdir}/libsmb4knetworkbrowser.so
-%{tde_libdir}/libsmb4ksearchdialog.la
-%{tde_libdir}/libsmb4ksearchdialog.so
-%{tde_libdir}/libsmb4ksharesiconview.la
-%{tde_libdir}/libsmb4ksharesiconview.so
-%{tde_libdir}/libsmb4kshareslistview.la
-%{tde_libdir}/libsmb4kshareslistview.so
-%{_datadir}/applications/kde/smb4k.desktop
-%{_datadir}/apps/konqsidebartng/add/smb4k_add.desktop
-%{_datadir}/apps/smb4k/smb4k_shell.rc
-%{_datadir}/apps/smb4knetworkbrowserpart/smb4knetworkbrowser_part.rc
-%{_datadir}/apps/smb4ksharesiconviewpart/smb4ksharesiconview_part.rc
-%{_datadir}/apps/smb4kshareslistviewpart/smb4kshareslistview_part.rc
-%{_datadir}/config.kcfg/smb4k.kcfg
-%{tde_docdir}/HTML/en/smb4k
-%{_datadir}/icons/crystalsvg/*/apps/smb4k.png
-%lang(de) %{_datadir}/locale/de/LC_MESSAGES/smb4k.mo
-%lang(es) %{_datadir}/locale/es/LC_MESSAGES/smb4k.mo
-%lang(it) %{_datadir}/locale/it/LC_MESSAGES/smb4k.mo
-%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/smb4k.mo
-%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/smb4k.mo
-%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/smb4k.mo
 
 
 %Changelog