MGA2/MDV2012: add some applications ...

2 files changed, 61 insertions, 37 deletions

diff --git a/redhat/applications/filelight/filelight-3.5.13-disable_l10n.patch b/redhat/applications/filelight/filelight-3.5.13-disable_l10n.patch
new file mode 100644
index 000000000..be98c9a0f
--- /dev/null
+++ b/redhat/applications/filelight/filelight-3.5.13-disable_l10n.patch
@@ -0,0 +1,13 @@
+--- filelight/Makefile.am.ORI	2012-08-04 10:34:47.712896146 +0200
++++ filelight/Makefile.am	2012-08-04 10:34:52.911800735 +0200
+@@ -1,4 +1,4 @@
+-SUBDIRS = src misc doc po
++SUBDIRS = src misc doc
+ 
+ messages: rc.cpp
+ 	$(EXTRACTRC) `find . -name "*.rc" -o -name "*.ui"` >> rc.cpp
+--- filelight/doc/Makefile.am.ORI	2012-08-04 10:36:33.894947477 +0200
++++ filelight/doc/Makefile.am	2012-08-04 10:36:38.509862783 +0200
+@@ -1 +1 @@
+-SUBDIRS = $(AUTODIRS)
++SUBDIRS = filelight
diff --git a/redhat/applications/filelight/trinity-filelight-3.5.13.spec b/redhat/applications/filelight/trinity-filelight-3.5.13.spec
index 7dac5417d..77fc17afa 100644
--- a/redhat/applications/filelight/trinity-filelight-3.5.13.spec
+++ b/redhat/applications/filelight/trinity-filelight-3.5.13.spec
@@ -1,25 +1,31 @@
 # Default version for this component
 %define kdecomp filelight
-%define version 1.0
-%define release 4
 
 # 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 %{_prefix}/share/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_tdeappdir %{tde_datadir}/applications/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}
 Summary:	Graphical disk usage display
-Version:	%{?version}
-Release:	%{?release}%{?dist}%{?_variant}
+Version:	1.0
+Release:	4%{?dist}%{?_variant}
 
 License:	GPLv2+
 Group:		Applications/Utilities
@@ -33,10 +39,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{kdecomp}-3.5.13.tar.gz
 
+# [filelight] Disable translation build, it is a separate package
+Patch1:		filelight-3.5.13-disable_l10n.patch
 
 BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
 BuildRequires: desktop-file-utils
 
 %description
@@ -46,12 +54,13 @@ directories on your computer.
 
 %prep
 %setup -q -n applications/%{kdecomp}
+%patch1 -p1 -b .l10n
 
 # 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"
@@ -59,19 +68,25 @@ directories on your computer.
 
 
 %build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
 export LDFLAGS="-L%{_libdir} -I%{_includedir}"
 
 %configure \
-	--disable-rpath \
-    --with-extra-includes=%{_includedir}/tqt
+  --prefix=%{tde_prefix} \
+  --exec-prefix=%{tde_prefix} \
+  --bindir=%{tde_bindir} \
+  --datadir=%{tde_datadir} \
+  --docdir=%{tde_tdedocdir} \
+  --libdir=%{tde_libdir} \
+  --disable-rpath \
+  --with-extra-includes=%{_includedir}/tqt
 
 %__make %{?_smp_mflags}
 
 
 %install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
@@ -82,34 +97,30 @@ export PATH="%{_bindir}:${PATH}"
 
 %post
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 %postun
 for f in crystalsvg hicolor ; do
-  touch --no-create %{_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{_datadir}/icons/${f} || :
+  touch --no-create %{tde_datadir}/icons/${f} || :
+  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
 done
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/config/filelightrc
-%{_datadir}/services/*.desktop
-
-%{tde_libdir}/*.so
-%exclude %{tde_libdir}/*.la
-
-# Translations files are packaged in 'filelight-l10n'
-%exclude %{tde_docdir}/HTML/*/*/
-%exclude %{_datadir}/locale/
+%{tde_bindir}/filelight
+%{tde_tdeappdir}/filelight.desktop
+%{tde_datadir}/apps/filelight/
+%{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png
+%{tde_datadir}/icons/hicolor/*/apps/filelight.png
+%{tde_datadir}/config/filelightrc
+%{tde_datadir}/services/*.desktop
+%{tde_tdelibdir}/libfilelight.so
+%{tde_tdelibdir}/libfilelight.la
+%{tde_tdedocdir}/HTML/en/filelight/
 
 %Changelog
 * Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0-4