Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

16 files changed, 232 insertions, 20 deletions

diff --git a/redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch b/redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch
new file mode 100644
index 000000000..d0efe3ef8
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-genkdmconf_Xsession_location.patch
@@ -0,0 +1,11 @@
+--- kdebase/kdm/kfrontend/genkdmconf.c.ORI	2011-11-01 21:59:14.450046357 +0100
++++ kdebase/kdm/kfrontend/genkdmconf.c	2011-11-01 21:59:34.449045801 +0100
+@@ -676,7 +676,7 @@
+ "    ;;\n"
+ "esac\n"
+ "# invoke global X session script\n"
+-". /etc/X11/Xsession\n";
++". /etc/X11/xinit/Xsession\n";
+ 
+ static const char def_background[] =
+ "[Desktop0]\n"
diff --git a/redhat/kdebase/kdebase-3.5.13-startkde_ldpreload.patch b/redhat/kdebase/kdebase-3.5.13-startkde_ldpreload.patch
new file mode 100644
index 000000000..1b39a59ff
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-startkde_ldpreload.patch
@@ -0,0 +1,13 @@
+--- kdebase/startkde.ORI	2011-11-01 22:17:52.000000000 +0100
++++ kdebase/startkde	2011-11-01 22:18:14.000000000 +0100
+@@ -413,7 +413,9 @@
+ fi
+ 
+ if [ -n $KGTK_PRELOAD ]; then
+-  if [ -e /usr/lib/libnspr4.so ]; then
++  if [ -e /usr/lib64/libnspr4.so ]; then
++    KGTK_NSPR_PRELOAD="/usr/lib64/libnspr4.so:"
++  elif [ -e /usr/lib/libnspr4.so ]; then
+     KGTK_NSPR_PRELOAD="/usr/lib/libnspr4.so:"
+   fi
+   export LD_PRELOAD=$KGTK_PRELOAD:$KGTK_NSPR_PRELOAD$LD_PRELOAD
diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.el5 b/redhat/kdebase/pamd.kcheckpass-trinity.el5
new file mode 100644
index 000000000..56939d5a9
--- /dev/null
+++ b/redhat/kdebase/pamd.kcheckpass-trinity.el5
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth       include     system-auth
+account    required	pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    include	system-auth
+session    required    pam_loginuid.so
+session    optional    pam_selinux.so
+session    optional	pam_console.so
diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.el6 b/redhat/kdebase/pamd.kcheckpass-trinity.el6
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kcheckpass-trinity.el6
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.fc15 b/redhat/kdebase/pamd.kcheckpass-trinity.fc15
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kcheckpass-trinity.fc15
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/kdebase/pamd.kdm-trinity-np.el5 b/redhat/kdebase/pamd.kdm-trinity-np.el5
new file mode 100644
index 000000000..8dc8ef34d
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity-np.el5
@@ -0,0 +1,11 @@
+#%PAM-1.0
+auth       required	pam_env.so
+auth       required	pam_nologin.so
+auth       required	pam_permit.so
+account    include	system-auth
+password   include	system-auth
+session	   optional	pam_keyinit.so force revoke
+session    include	system-auth
+session    required     pam_loginuid.so
+session    optional     pam_selinux.so
+session    optional     pam_console.so
diff --git a/redhat/kdebase/pamd.kdm-trinity-np.el6 b/redhat/kdebase/pamd.kdm-trinity-np.el6
new file mode 100644
index 000000000..c3f7172de
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity-np.el6
@@ -0,0 +1,13 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
diff --git a/redhat/kdebase/pamd.kdm-trinity-np.fc15 b/redhat/kdebase/pamd.kdm-trinity-np.fc15
new file mode 100644
index 000000000..96fcfe378
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity-np.fc15
@@ -0,0 +1,15 @@
+ #%PAM-1.0
+auth       required    pam_env.so
+auth       required    pam_permit.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+session    include     postlogin
diff --git a/redhat/kdebase/pamd.kdm-trinity.el5 b/redhat/kdebase/pamd.kdm-trinity.el5
new file mode 100644
index 000000000..30a26ae99
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity.el5
@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth       include     system-auth
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    optional    pam_keyinit.so force revoke
+session    include     system-auth
+session    required    pam_loginuid.so
+session    optional    pam_selinux.so
+session    optional    pam_console.so
diff --git a/redhat/kdebase/pamd.kdm-trinity.el6 b/redhat/kdebase/pamd.kdm-trinity.el6
new file mode 100644
index 000000000..14f4aa748
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity.el6
@@ -0,0 +1,16 @@
+#%PAM-1.0
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth       required    pam_env.so
+auth       substack    system-auth
+auth       optional    pam_gnome_keyring.so
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    optional    pam_gnome_keyring.so auto_start
+session    include     system-auth
diff --git a/redhat/kdebase/pamd.kdm-trinity.fc15 b/redhat/kdebase/pamd.kdm-trinity.fc15
new file mode 100644
index 000000000..f1d90f7f3
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity.fc15
@@ -0,0 +1,18 @@
+#%PAM-1.0
+auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
+auth       required    pam_env.so
+auth       substack    system-auth
+auth       optional    pam_gnome_keyring.so
+auth       include     postlogin
+account    required    pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    required    pam_selinux.so close
+session    required    pam_loginuid.so
+session    optional    pam_console.so
+session    required    pam_selinux.so open
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    optional    pam_gnome_keyring.so auto_start
+session    include     system-auth
+session    include     postlogin
diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.el5 b/redhat/kdebase/pamd.kscreensaver-trinity.el5
new file mode 100644
index 000000000..56939d5a9
--- /dev/null
+++ b/redhat/kdebase/pamd.kscreensaver-trinity.el5
@@ -0,0 +1,9 @@
+#%PAM-1.0
+auth       include     system-auth
+account    required	pam_nologin.so
+account    include     system-auth
+password   include     system-auth
+session    include	system-auth
+session    required    pam_loginuid.so
+session    optional    pam_selinux.so
+session    optional	pam_console.so
diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.el6 b/redhat/kdebase/pamd.kscreensaver-trinity.el6
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kscreensaver-trinity.el6
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.fc15 b/redhat/kdebase/pamd.kscreensaver-trinity.fc15
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kscreensaver-trinity.fc15
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth       include	system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec
index b3df6b097..3229fe15d 100755
--- a/redhat/kdebase/trinity-kdebase-3.5.12.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.12
 %endif
-%define release 11
+%define release 12
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -51,6 +51,8 @@ Patch4:		http://www.trinitydesktop.org/patches/r1182808.diff
 # [kdebase] fixed an incompatibility with gcc 4.5 
 Patch8:		http://www.trinitydesktop.org/patches/r1221326.diff
 
+Patch11:	kdebase-3.5.12-kickerfix.patch
+
 # TDE Official patches (from SVN), modified
 # [kdebase/ksmserver/shutdowndlg.cpp] Fixed invalid constructor per GCC 4.5.2
 Patch7:		kdebase-3.5.12-r1220975.patch
@@ -150,7 +152,7 @@ Requires: %{name} = %{version}-%{release}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-Requires: trinity-kdelibs >= %{version}
+Requires: trinity-kdelibs
 %if "%{?_prefix}" == "/usr"
 Obsoletes: kdebase%{?_qt_suffix}-libs
 %endif
@@ -185,6 +187,7 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %if 0%{?rhel} && 0%{?rhel} < 6
 %patch10 -p1
 %endif
+%patch11 -d kicker/kicker
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh"
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index c52d2f2b0..2431e044a 100755
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 0
+%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"
@@ -15,33 +15,55 @@ BuildRequires: cmake >= 2.8
 %define tde_docdir %{_docdir}/kde
 %define tde_libdir %{_libdir}/trinity
 
+# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
+# whereas newer versions use "qt3", "qt3-devel" ...
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8
+%define _qt_suffix 3
+%endif
+
 
 Name:		trinity-kdebase
 Version:	%{?version}
 Release:	%{?release}%{?dist}%{?_variant}
 License:	GPL
 Summary:	Trinity KDE Base Programs
+Group:		User Interface/Desktops
 
 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)
 
 Source0:	kdebase-%{version}.tar.gz
 
+# Wrapper script to prevent Plasma launch at Trinity Startup
+Source1:	plasma-desktop
+
+# Pam configuration files for RHEL / Fedora
+Source2:	pamd.kdm-trinity%{?dist}
+Source3:	pamd.kdm-trinity-np%{?dist}
+Source4:	pamd.kcheckpass-trinity%{?dist}
+Source5:	pamd.kscreensaver-trinity%{?dist}
+
+
 # TDE for RHEL/Fedora specific patches
 # [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
 Patch3:		kdebase-3.5.13-kdesu-noignorebutton.patch
 # [kdebase/kdesktop] Modifies "open terminal here" on desktop
 Patch5:		kdebase-3.5.12-desktop-openterminalhere.patch
-# [kdebase/kioslave]: Forces HAL backend to use HAL mount options
+# [kdebase/kioslave] Forces HAL backend to use HAL mount options
 Patch6:		kdebase-3.5.12-halmountoptions.patch
+# [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
+Patch7:		kdebase-3.5.13-genkdmconf_Xsession_location.patch
+# [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64
+Patch8:		kdebase-3.5.13-startkde_ldpreload.patch
 
 BuildRequires:	tqtinterface-devel
 BuildRequires:	trinity-arts-devel
 BuildRequires:	trinity-kdelibs-devel
-BuildRequires:	qt3-devel >= 3.3.8d
+BuildRequires:	qt%{?_qt_suffix}-devel
 BuildRequires:	openssl-devel
 BuildRequires:	avahi-devel avahi-qt3-devel
 BuildRequires:	imake
@@ -52,7 +74,7 @@ BuildRequires:	dbus-devel dbus-qt-devel
 BuildRequires:	lm_sensors-devel
 BuildRequires:	libfontenc-devel
 BuildRequires:	hal-devel
-BuildRequires:	audiofile-devel
+BuildRequires:	audiofile-devel alsa-lib-devel
 BuildRequires:	jack-audio-connection-kit-devel
 BuildRequires:	libraw1394-devel
 BuildRequires:	openldap-devel
@@ -60,15 +82,22 @@ BuildRequires:	libvorbis-devel
 BuildRequires:	pam-devel
 BuildRequires:	libXdmcp-devel
 BuildRequires:	libxkbfile-devel
+BuildRequires:	libusb-devel
+BuildRequires:	esound-devel glib2-devel nas-devel
+BuildRequires:	libXcomposite-devel
 BuildRequires:	dbus-tqt-devel
+BuildRequires:	libXtst-devel
+BuildRequires:	libXdamage-devel
 
 Requires:	tqtinterface
 Requires:	trinity-arts
 Requires:	trinity-kdelibs
-Requires:	qt3 >= 3.3.8d
+Requires:	qt%{?_qt_suffix}
 Requires:	openssl
 Requires:	avahi avahi-qt3
 Requires:	dbus-tqt
+# Provides the global Xsession script (/etc/X11/xinit/Xsession)
+Requires:	xorg-x11-xinit
 
 
 # RHEL 6 Configuration files are provided in separate packages
@@ -90,11 +119,11 @@ kfontmanager, kmenuedit).
 
 %package devel
 Requires:	%{name}
-Requires:	%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	trinity-kdelibs-devel
 Summary:	%{summary} - Development files
 %if "%{?_prefix}" == "/usr"
-Obsoletes:	kdebase3-devel
+Obsoletes:	kdebase%{?_qt_suffix}-devel
 %endif
 Group:		Development/Libraries
 %description devel
@@ -106,7 +135,7 @@ Kate plugins or KWin styles.
 %package extras
 Summary: Extra applications from %{name}
 Group: User Interface/Desktops
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description extras
 %{summary}, including:
  * kappfinder
@@ -118,11 +147,11 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %package libs
 Summary: %{name} runtime libraries
 Group:   System Environment/Libraries
-Requires: trinity-kdelibs >= %{version}
+Requires: trinity-kdelibs
 %if "%{?_prefix}" == "/usr"
-Obsoletes: kdebase3-libs
+Obsoletes: kdebase%{?_qt_suffix}-libs
 %endif
-Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 %description libs
 %{summary}
 
@@ -143,10 +172,9 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %patch3 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
-# Gets the cmake modules in current build directory
-%__mkdir_p cmake/modules
-%__cp -f %{_datadir}/cmake/*.* cmake/modules
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -165,7 +193,11 @@ cd build
   -DWITH_XCOMPOSITE=ON \
   -DWITH_XCURSOR=ON \
   -DWITH_XFIXES=ON \
+%if 0%{?fedora} || 0%{?rhel} > 5
   -DWITH_XRANDR=ON \
+%else
+  -DWITH_XRANDR=OFF \
+%endif
   -DWITH_XRENDER=ON \
   -DWITH_XDAMAGE=ON \
   -DWITH_XEXT=ON \
@@ -179,14 +211,16 @@ cd build
   -DWITH_I8K=OFF \
   -DWITH_HAL=ON \
   -DBUILD_ALL=ON \
+  -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \
+  -DKDM_PAM_SERVICE="kdm-trinity" \
+  -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" \
   ..
 
 %__make %{?_smp_mflags} 
 
 %install
 %__rm -rf %{?buildroot}
-%__mkdir_p %{?buildroot}
-%make_install -C build
+%__make install DESTDIR=%{?buildroot} -C build
 
 # Adds a GDM/KDM/XDM session called 'TDE'
 %if "%{?_prefix}" != "/usr"
@@ -201,6 +235,18 @@ sed -i "%{?buildroot}%{_bindir}/startkde" \
 # Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
 mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
 
+# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
+%if "%{?_prefix}" != "/usr"
+%__cp -f "%{SOURCE1}" "%{?buildroot}%{_bindir}"
+%endif
+
+# PAM configuration files
+%__mkdir_p "%{?buildroot}%{_sysconfdir}/pam.d"
+%__install -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity"
+%__install -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/kdm-trinity-np"
+%__install -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
+%__install -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
+
 %clean
 %__rm -rf %{?buildroot}
 
@@ -288,6 +334,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %exclude %{_datadir}/applnk/Utilities/kpager.desktop
 %exclude %{_datadir}/icons/hicolor/*/apps/kpager.png
 
+# Pam configuration
+%{_sysconfdir}/pam.d/*
+
 %doc AUTHORS COPYING README
 %{tde_docdir}/HTML/en/*
 %config(noreplace) %{_sysconfdir}/ksysguarddrc.tde
@@ -321,7 +370,6 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_bindir}/konqueror
 %{_bindir}/konsole
 %{_bindir}/krandom.kss
-%{_bindir}/krandrtray
 %{_bindir}/krdb
 %{_bindir}/kreadconfig
 %{_bindir}/ksmserver
@@ -369,6 +417,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_bindir}/khc_mansearch.pl
 %{_bindir}/kicker
 %{_bindir}/knetattach
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+%{_bindir}/krandrtray
+%endif
 %{_bindir}/kompmgr
 %{_bindir}/kpm
 %{_bindir}/ksplash
@@ -398,12 +449,17 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{tde_libdir}/*
 %{_libdir}/libkdeinit_*.*
 %{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
+%if 0%{?fedora} >= 15 && "%{?_prefix}" != "/usr"
+%exclude %{_sysconfdir}/xdg/menus/kde-information.menu
+%else
 %{_sysconfdir}/xdg/menus/kde-information.menu
+%endif
 %{_sysconfdir}/xdg/menus/kde-screensavers.menu
 %{_sysconfdir}/xdg/menus/kde-settings.menu
 /usr/share/xsessions/*.desktop
 # Remove conflicts with redhat-menus
 %if "%{?_prefix}" != "/usr"
+%{_bindir}/plasma-desktop
 %config(noreplace) %{_datadir}/config/*
 %else
 %exclude %{_datadir}/config
@@ -420,6 +476,8 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 # New in TDE 3.5.13
 %{_bindir}/krootbacking
+%{_bindir}/tsak
+%attr(4511,root,root) %{_bindir}/kdmtsak
 
 %files libs
 %defattr(-,root,root,-)
@@ -455,6 +513,12 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/cmake/*.cmake
 
 %changelog
-* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12.99-0
+* Tue Nov 01 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
+- Add 'patch8' to fix LD_PRELOAD variable set by 'startkde' under x86_64
+
+* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
+- Initial release for RHEL 6, RHEL 5 and Fedora 15
+
+* Sat Sep 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0
 - Import to GIT
 - Use TDE 3.5.13, cmake, QT3.3.3.8d