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

33 files changed, 2694 insertions, 0 deletions

diff --git a/mandriva/2010.2/dependencies/arts/arts-1.5.3-mcop-msgkill.patch b/mandriva/2010.2/dependencies/arts/arts-1.5.3-mcop-msgkill.patch
new file mode 100644
index 000000000..1a2323267
--- /dev/null
+++ b/mandriva/2010.2/dependencies/arts/arts-1.5.3-mcop-msgkill.patch
@@ -0,0 +1,13 @@
+--- arts-1.5.3/mcop/mcoputils.cc	2005-12-22 21:20:23.000000000 -0200
++++ arts-1.5.3/mcop/mcoputils.cc.new	2006-07-19 14:44:08.000000000 -0300
+@@ -371,7 +371,9 @@
+ 	}
+ 	if (!mcop_dir)
+ 	{
+-	   arts_fatal("can't create mcop directory");
++      return "Unable to create mcop directory";
++
++	   // arts_fatal("can't create mcop directory");
+ 	}
+ 	string tmpdir = mcop_dir;
+ 	return tmpdir+"/"+name;
diff --git a/mandriva/2010.2/dependencies/arts/arts-1.5.3-resmgr.patch b/mandriva/2010.2/dependencies/arts/arts-1.5.3-resmgr.patch
new file mode 100644
index 000000000..2adce7f91
--- /dev/null
+++ b/mandriva/2010.2/dependencies/arts/arts-1.5.3-resmgr.patch
@@ -0,0 +1,70 @@
+? flow/audioiooss.cc,v
+? flow/audioioossthreaded.cc,v
+Index: flow/Makefile.am
+===================================================================
+RCS file: /home/kde/arts/flow/Makefile.am,v
+retrieving revision 1.79
+diff -u -3 -p -r1.79 Makefile.am
+--- flow/Makefile.am	18 Nov 2004 20:19:59 -0000	1.79
++++ flow/Makefile.am	25 Feb 2005 13:58:07 -0000
+@@ -9,7 +9,7 @@ lib_LTLIBRARIES = libartsflow_idl.la lib
+ 
+ libartsflow_idl_la_SOURCES = artsflow.cc
+ libartsflow_idl_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
+-libartsflow_idl_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPOSIX4)
++libartsflow_idl_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPOSIX4) -lresmgr
+ 
+ libartsflow_la_LIBADD = $(top_builddir)/mcop/libmcop.la libartsflow_idl.la $(top_builddir)/flow/gslpp/libgslpp.la $(LIBAUDIOFILE) $(LIBASOUND) $(LIBAUDIOIO) $(LIBOSSAUDIO) $(LIBAUDIONAS) $(LIBCSL) $(SGILIBAUDIO) $(LIBESD) $(LIBMAS) $(JACK_LIBADD) -lm \
+   $(top_builddir)/flow/gsl/libgsl.la
+Index: flow/audioiooss.cc
+===================================================================
+RCS file: /home/kde/arts/flow/audioiooss.cc,v
+retrieving revision 1.17
+diff -u -3 -p -r1.17 audioiooss.cc
+--- flow/audioiooss.cc	20 Nov 2004 04:55:21 -0000	1.17
++++ flow/audioiooss.cc	25 Feb 2005 13:58:07 -0000
+@@ -49,6 +49,7 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <resmgr.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -157,7 +158,9 @@ bool AudioIOOSS::open()
+ 		return false;
+ 	}
+ 
+-	audio_fd = ::open(_deviceName.c_str(), mode, 0);
++	audio_fd = ::rsm_open_device(_deviceName.c_str(), mode);
++	if(audio_fd == -1)
++		audio_fd = ::open(_deviceName.c_str(), mode, 0);
+ 
+ 	if(audio_fd == -1)
+ 	{
+Index: flow/audioioossthreaded.cc
+===================================================================
+RCS file: /home/kde/arts/flow/audioioossthreaded.cc,v
+retrieving revision 1.6
+diff -u -3 -p -r1.6 audioioossthreaded.cc
+--- flow/audioioossthreaded.cc	20 Jan 2005 12:34:01 -0000	1.6
++++ flow/audioioossthreaded.cc	25 Feb 2005 13:58:07 -0000
+@@ -50,6 +50,7 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <resmgr.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -202,7 +203,9 @@ bool AudioIOOSSThreaded::open()
+ 		return false;
+ 	}
+ 
+-	audio_fd = ::open(_deviceName.c_str(), mode, 0);
++	audio_fd = ::rsm_open_device(_deviceName.c_str(), mode);
++	if(audio_fd == -1)
++		audio_fd = ::open(_deviceName.c_str(), mode, 0);
+ 
+ 	if(audio_fd == -1)
+ 	{
diff --git a/mandriva/2010.2/dependencies/arts/arts-1.5.9-gcc4.3.x-compile.patch b/mandriva/2010.2/dependencies/arts/arts-1.5.9-gcc4.3.x-compile.patch
new file mode 100644
index 000000000..d5de29ace
--- /dev/null
+++ b/mandriva/2010.2/dependencies/arts/arts-1.5.9-gcc4.3.x-compile.patch
@@ -0,0 +1,20 @@
+--- arts-1.5.9/mcop/mcoputils.cc.orig	2008-06-02 09:28:23.000000000 -0300
++++ arts-1.5.9/mcop/mcoputils.cc	2008-06-02 09:28:42.000000000 -0300
+@@ -28,6 +28,7 @@
+ #include <sys/types.h>
+ #include <fcntl.h>
+ #include <unistd.h>
++#include <limits.h>
+ #include <netdb.h>
+ #include <errno.h>
+ #include <config.h>
+--- arts-1.5.9/artsc/artsdsp.c.orig	2008-06-02 09:27:24.000000000 -0300
++++ arts-1.5.9/artsc/artsdsp.c	2008-06-02 09:27:52.000000000 -0300
+@@ -21,6 +21,7 @@
+  */
+ 
+ #define _GNU_SOURCE 1
++#undef _FORTIFY_SOURCE
+ 
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
diff --git a/mandriva/2010.2/dependencies/arts/arts3.spec b/mandriva/2010.2/dependencies/arts/arts3.spec
new file mode 100644
index 000000000..ab0bb5d6c
--- /dev/null
+++ b/mandriva/2010.2/dependencies/arts/arts3.spec
@@ -0,0 +1,347 @@
+%define compile_apidox 1
+%{?_no_apidox: %{expand: %%global compile_apidox 0}}
+%define oname arts
+%define epoch_arts 30000001
+
+# Define short-cuts for libification
+%define major	1
+
+%define libname	%mklibname arts %{major}
+
+%define lib_name_orig libarts
+
+Name: arts3
+Summary: Arts - Libraries
+Version: 1.5.12
+Release: %mkrel 1
+Epoch: %{epoch_arts}
+Group: Graphical desktop/KDE3
+License: ARTISTIC BSD GPL_V2 LGPL_V2 QPL_V1.0
+BuildRoot: %_tmppath/%name-%version-%release-root
+Requires(pre): %{libname} = %{epoch_arts}:%version-%release
+URL: http://www.kde.org
+Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
+Patch0: arts-1.5.3-resmgr.patch
+Patch2: arts-1.5.3-mcop-msgkill.patch
+Patch4: arts-1.5.9-gcc4.3.x-compile.patch
+Patch5: kde-3.5.10-acinclude.patch
+BuildRequires: kde3-macros
+BuildRequires: audiofile-devel
+BuildRequires: qt3-devel
+BuildRequires: glib2-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: resmgr-devel
+BuildRequires: X11-devel
+%if %mdkversion < 201000
+BuildRequires: autoconf <= 1:2.63
+%endif
+BuildRequires: autoconf >= 1:2.65
+BuildRequires:	esound-devel
+BuildRequires:	multiarch-utils >= 1.0.3
+BuildRequires:	jackit-devel
+BuildRequires:  libvorbis-devel
+BuildRequires: libtqtinterface-devel >= 3.5.12
+BuildConflicts: mas-devel
+Obsoletes:	aethera =< 0.9.3-5mdk
+Obsoletes: brahms =< 1.02-3mdk
+Obsoletes: dotNETStyle =< 0.9.2-2mdk 
+Obsoletes: drivetweak-kde- =< 0.9.1-1mdk 
+Obsoletes: guarddog =< 1.9.14-1mdk
+Obsoletes:  k3b =< 0.5.1-2mdk
+Obsoletes: karchiver =< 2.0.5-3mdk
+Obsoletes: kdestudio =< 2.0.0-10mdk 
+Obsoletes: kdevmon =< 0.4.5-2mdk
+Obsoletes: keduca =< 0.4-6mdk
+Obsoletes: keurocalc =< 0.5.8-1mdk
+Obsoletes:  kfontinst =< 0.10-1mdk
+Obsoletes: kgesture =< 0.3-6mdk
+Obsoletes: kguitar =< 0.4-2mdk 
+Obsoletes: kinkatta =< 1.00-1mdk
+Obsoletes: kmag =< 0.7-1mdk
+Obsoletes: kmymoney2 =< 0.4-1mdk
+Obsoletes: knetfilter =< 2.2.5-1mdk 
+Obsoletes: komba2 =< 0.72-1mdk 
+Obsoletes: koncd =< 1.0rc2-2mdk
+Obsoletes: konnector =< 0.5-4mdk
+Obsoletes:	konverse =< 0.2-3mdk
+Obsoletes: kover =< 0.8.3-2mdk
+Obsoletes: kreatecd =< 1.1.0-2mdk
+Obsoletes: krpmbuilder =< 0.2.6-4mdk
+Obsoletes: krusader =< 1.01-1mdk
+Obsoletes: kshowmail =< 2.2.3-1mdk
+Obsoletes: ksnuffle =< 2.2-6mdk
+Obsoletes: ksplashml =< 0.92-1mdk
+Obsoletes: kstars =< 0.8.5-1mdk
+Obsoletes: kstocks =< 2.0.2-8mdk
+Obsoletes: ktexmaker2 =< 1.7-2mdk
+Obsoletes: ktouch =< 1.0-4mdk
+Obsoletes: kuickshow =< 0.8.2-3mdk
+Obsoletes:  kwatch =< 2.2.0-1mdk
+Obsoletes: kwave =< 0.6.3-3mdk
+Obsoletes: kwintv =< 0.8.11-5mdk
+Obsoletes: kxicq2 =< 0.7.6-1mdk
+Obsoletes: kxmleditor =< 0.7.1-2mdk
+Obsoletes: libbrahms0 =< 1.02-3mdk
+Obsoletes: libkarchiver2 =< 2.0.5-3mdk
+Obsoletes: libkguitar1 =< 0.4-2mdk
+Obsoletes: libxmms-kde1 =< 6.5-5mdk
+Obsoletes: sakuraplayer =< 1.0.6-1mdk umlmodeller =< 1.0.3-5mdk 
+Obsoletes: cervisia =< 1.4.1-7mdk
+Obsoletes: kbiff =< 3.5.4-3mdk
+Obsoletes:  kcpuload =< 1.90-11mdk
+Obsoletes: kdbg =< 1.2.5-1mdk
+Obsoletes: kdeaddons3
+Obsoletes: kdeadmin3
+Obsoletes: kdeartwork3
+Obsoletes: kdebindings3
+Obsoletes: kdemultimedia3
+Obsoletes: kdemultimedia3-aktion
+Obsoletes: kdenetwork3
+Obsoletes: kdepim3
+Obsoletes: kdesdk3
+Obsoletes: kdetoys3
+Obsoletes: kdeutils3
+Obsoletes: kdevelop3
+Obsoletes: klogic =< 1.35-1mdk
+Obsoletes: klyx =< 2.0-17mdk
+Obsoletes: kmago =< 1.1.2-5mdk
+Obsoletes: knetload =< 1.91-8mdk
+Obsoletes: koffice =< 1.1.1-14mdk
+Obsoletes: kpl2 =< 2.3.0-1mdk
+Obsoletes: krootwarning =< 8.2-13mdk
+Obsoletes: krozat =< 8.2-13mdk
+Obsoletes: ksetiwatch =< 2.2.5-1mdk
+Obsoletes: ktelnet =< 0.7b1-13mdk
+Obsoletes: kvirc =< 2.1.1-5mdk
+Obsoletes: libqt2-devel =< 2.3.1-29mdk
+Obsoletes: licq-kde =< 1.0.4-2mdk
+Obsoletes: qt2-designer =< 2.3.1-29mdk
+Obsoletes: qtrans =< 0.1.1-7mdk
+Obsoletes: quanta =< 2.0.1-2mdk
+Obsoletes: kdelibs-sound 
+Obsoletes:	%{libname}-static-devel
+Obsoletes:  arts3 < %{epoch_arts}:1.5.3
+Provides:	arts3 = %{epoch_arts}:%version-%release
+BuildConflicts:	unsermake
+Conflicts: arts < 30000001:1.5.10-4
+Provides: arts = %epoch_arts:%version-%release
+
+%description
+aRts is a short form for "analog realtime synthesizer". The idea of the whole 
+thing is to create/process sound using small modules which do certain tasks. 
+These may be create a waveform (oscillators), play samples, filter data, add 
+signals, perform effects like delay/flanger/chorus, or output the data to the
+soundcard.
+
+%files
+%defattr(-,root,root,-)
+%_kde3_bindir/artscat
+%_kde3_bindir/artsd    
+%_kde3_bindir/artsplay  
+%_kde3_bindir/artsshell    
+%_kde3_bindir/artsdsp  
+%_kde3_bindir/artsrec   
+%_kde3_bindir/artswrapper
+
+#----------------------------------------------------------------------
+
+%package -n %{libname}
+Group:      System/Libraries
+Summary:    The libraries for arts 
+Obsoletes:  libarts2, libarts3
+Requires: libtqtinterface >= 3.5.12-1
+
+%description -n %{libname}
+Libraries needed for arts.
+
+%if %mdkversion < 200900
+%post -n %{libname} -p /sbin/ldconfig
+%endif
+%if %mdkversion < 200900
+%postun -n %{libname} -p /sbin/ldconfig
+%endif
+
+%files -n %{libname}
+%defattr(-,root,root,-)
+%_kde3_libdir/*.la
+%_kde3_libdir/*.so.*
+%dir %_kde3_libdir/mcop/
+%_kde3_libdir/mcop/*
+%_sysconfdir/ld.so.conf.d/*
+
+#----------------------------------------------------------------------
+
+%package devel
+Group: Development/KDE and Qt
+Summary:	Development files for arts
+Requires: %{libname} = %{epoch_arts}:%version-%release
+Obsoletes: %{_lib}arts1-devel
+Obsoletes: libarts2-devel
+Obsoletes: libarts3-devel
+Provides: arts-devel
+Provides: libarts-devel
+Conflicts: arts <= %epoch_arts:1.5.3-5mdv2007
+
+%description devel
+Development libraries for arts.
+
+%files devel
+%defattr(-,root,root,-)
+%_kde3_bindir/artsc-config
+%multiarch %_kde3_bindir/*/artsc-config
+%_kde3_bindir/mcopidl
+%_kde3_libdir/*.so
+%_kde3_includedir/*
+
+#----------------------------------------------------------------------
+
+%prep
+%setup -q -n %oname-%version
+%patch0 -p0 -b .resmgr
+%patch2 -p1 -b .msgkill
+%patch4 -p1 -b .gcc4.3
+%patch5 -p1
+
+%build
+# Patch from resmgr needs rebuild builsystem
+make -f admin/Makefile.common
+QTDIR=%qt3dir
+export QTDIR
+PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
+
+%configure_kde3 \
+	--without-nas \
+
+%make
+
+
+%install
+rm -fr %buildroot
+
+%makeinstall_std
+%multiarch_binaries $RPM_BUILD_ROOT%{_kde3_bindir}/artsc-config
+%multiarch_includes $RPM_BUILD_ROOT%{_kde3_includedir}/arts/gsl/gslconfig.h
+
+install -d %buildroot/%_sysconfdir/ld.so.conf.d
+cat > %buildroot/%_sysconfdir/ld.so.conf.d/%{libname}.conf <<EOF
+%_kde3_libdir
+EOF
+
+
+%clean
+rm -fr %buildroot
+
+
+
+
+
+%changelog
+* Thu Feb 03 2011 Tim Williams <tim@my-place.org.uk> 30000001:1.5.12-11mdf2010.2
++ Add Trinity KDE 3.5.12 sources
++ Add libtqtinterface dependencies
+- Remove arts-1.5.0-check_tmp_dir.patch and fix_autotools.patch, no longer necessary
+
+* Tue May 04 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 30000001:1.5.10-11mvt2010.1
++ Rebuild
+
+* Sat Jan 16 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 30000001:1.5.10-11mvt2010.0
++ Use automake 1.11 and above
++ Patch for built with autoconf 2.65
++ Fix package group
+
+* Tue Nov 14 2009 Tim Williams <tim@my-place.org.uk> 30000001:1.5.10-10mdv2010.0
+- Remove some of the obsoletes which are causing problems
+
+* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 30000001:1.5.10-9mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Sat Mar 28 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-8mdv2009.1
++ Revision: 361978
+- fix apparent typo in provides/conflicts change of r356949
+
+* Fri Mar 27 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-7mdv2009.1
++ Revision: 361677
+- fix new obsolete for biarch
+
+* Wed Mar 25 2009 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.10-6mdv2009.1
++ Revision: 361121
+- The return of undead. Changing name from libarts1-devel to a real arts3-devel
+
+* Tue Mar 17 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.10-5mdv2009.1
++ Revision: 356949
+- Add provides
+
+* Sun Mar 15 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.10-4mdv2009.1
++ Revision: 355208
+- Remove old spec file
+- Update to new name
+- Change arts to arts3 ( kde3 reintroduction step 1 )
+
+* Sat Feb 28 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-3mdv2009.1
++ Revision: 345972
+- rebuild due to removed i586 binaries
+
+* Sat Nov 08 2008 Adam Williamson <awilliamson@mandriva.org> 30000001:1.5.10-2mdv2009.1
++ Revision: 300956
+- rebuild for xcb changes
+
+* Tue Aug 26 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.10-1mdv2009.0
++ Revision: 276164
+- Update for probably the last upstream arts from kde3
+
+* Wed Aug 06 2008 Thierry Vignaud <tvignaud@mandriva.com> 30000001:1.5.9-8mdv2009.0
++ Revision: 264319
+- rebuild early 2009.0 package (before pixel changes)
+
+  + Pixel <pixel@mandriva.com>
+    - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
+
+* Mon Jun 02 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-7mdv2009.0
++ Revision: 214278
+- Fix compilations against gcc 4.3.x. Close bug https://qa.mandriva.com/show_bug.cgi?id=41171
+
+  + Funda Wang <fundawang@mandriva.org>
+    - rebuild for new qt3
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - Rebuild because of qt3 move
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-3mdv2009.0
++ Revision: 200792
+- Begin changes for kde. Time to go to /opt
+- Added arts.conf on ld.so.conf.d
+
+* Sat Mar 22 2008 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.9-2mdv2008.1
++ Revision: 189485
+- Fix groups ( tks to pterjan)
+
+* Thu Feb 14 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-1mdv2008.1
++ Revision: 167752
+- Last arts ever arrived. 1.5.9. This will be the last update for old codebase and closing the cycle of stable releases of KDE3
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - fix description-line-too-long
+    - kill re-definition of %%buildroot on Pixel's request
+
+  + Olivier Blin <oblin@mandriva.com>
+    - restore BuildRoot
+
+* Tue Oct 23 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.8-1mdv2008.1
++ Revision: 101650
+- Arts 1.5.8 from kde 3.5.8
+- Add Patch5, it fixes problems between aRts and Knotify
+
+  + Per Øyvind Karlsen <peroyvind@mandriva.org>
+    - add buildconflict on unsermake as it gets used by default if installed and breaks building
+
+  + Anssi Hannula <anssi@mandriva.org>
+    - remove hardcoded packager tag
+
+* Mon May 21 2007 Olivier Blin <oblin@mandriva.com> 30000001:1.5.7-2mdv2008.0
++ Revision: 29295
+- build with esound support
+
+* Wed May 16 2007 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.7-1mdv2008.0
++ Revision: 27452
+- 1.5.7 release
+
diff --git a/mandriva/2010.2/dependencies/kde3-macros/kde3-macros.spec b/mandriva/2010.2/dependencies/kde3-macros/kde3-macros.spec
new file mode 100644
index 000000000..7d9a65452
--- /dev/null
+++ b/mandriva/2010.2/dependencies/kde3-macros/kde3-macros.spec
@@ -0,0 +1,116 @@
+Name: kde3-macros
+Version: 3.5.12
+Release: %mkrel 1
+Group: Development/KDE and Qt
+Summary: Base install macros for kde 3
+Source: kde3.macros
+URL: http://www.mandriva.com
+License: GPL
+BuildArch: noarch
+Requires: rpm-manbo-setup-build >= 2-7
+BuildRoot: %{_tmppath}/%{name}-buildroot
+
+%description
+Base install macros for kde 3
+
+%files 
+%defattr(-,root,root)
+%_sysconfdir/rpm/macros.d/kde3.macros
+
+%install
+rm -rf %buildroot
+install -d -m 755 %buildroot%_sysconfdir/rpm/macros.d
+install -m 644 %SOURCE0 %buildroot%_sysconfdir/rpm/macros.d/
+
+%clean
+rm -rf %buildroot
+
+
+
+
+%changelog
+* Thu Feb 16 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvt2010.1
++ Rebuild for Trinity 3.5.12
++ Add extra-libs and extra-includes so build can find tqtinterface
++ Add --enable-closure
+
+* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 3.5.10-5mvt2010.1
++ Rebuild for MDV 2010.1
+
+* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 3.5.10-4mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Mon Oct 27 2008 Funda Wang <fundawang@mandriva.org> 3.5.10-3mdv2009.1
++ Revision: 297523
+- specify qt3 dir
+
+* Wed Sep 24 2008 Funda Wang <fundawang@mandriva.org> 3.5.10-2mdv2009.0
++ Revision: 287688
+- add libdir to pkgconfig dir
+
+* Tue Sep 16 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.10-1mdv2009.0
++ Revision: 285306
+- Update version and fix bug 43876 - /etc/profile.d/91kde3.sh should contain redefination of PKG_CONFIG_PATH
+
+* Wed Aug 06 2008 Thierry Vignaud <tvignaud@mandriva.com> 3.5.9-15mdv2009.0
++ Revision: 264759
+- rebuild early 2009.0 package (before pixel changes)
+
+* Fri Jun 06 2008 Funda Wang <fundawang@mandriva.org> 3.5.9-14mdv2009.0
++ Revision: 216405
+- Requires rpm-manbo-setup-build for %%before_configure
+
+* Thu Jun 05 2008 Funda Wang <fundawang@mandriva.org> 3.5.9-13mdv2009.0
++ Revision: 215104
+- change configure_kde3 to use %%before_configure
+
+* Fri May 30 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-12mdv2009.0
++ Revision: 213551
+- Proper new qtdir libraries
+
+* Wed May 28 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-11mdv2009.0
++ Revision: 212725
+- Revert of the previous commit
+
+* Wed May 28 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-10mdv2009.0
++ Revision: 212717
+- Fix macros
+
+* Fri May 09 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-9mdv2009.0
++ Revision: 205308
+- Fix typo
+
+* Thu May 08 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-8mdv2009.0
++ Revision: 204698
+- Add clean_kde3_icon_cache and update_kde3_icon_cache macros
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-7mdv2009.0
++ Revision: 200791
+- Yes, we need a copy. Sometimes we loose a lot of time that we don't have
+  because some nitpicking pointing.
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-6mdv2009.0
++ Revision: 200553
+- Using again configure2_5x. Some impatient people can't wait some work in progress...
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-4mdv2009.0
++ Revision: 200535
+- Added xinerama and alsa
+
+* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-3mdv2009.0
++ Revision: 200534
+- Added mitshm and enable-libfam
+
+* Fri May 02 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-2mdv2009.0
++ Revision: 200518
+- Created configure_kde macro to make kde3 build easier too like kde4 and make transition to /opt less painfull. Thanks to Blino for the help.
+  There's no need anymore add all define switches, even for libsuffix detection, so if you want:
+- Disable enable-final: use --define _disable_final=1
+- Compile with debug full: use --define _unstable=1
+- Compile in non 32bits arch: No need add the usual lib test
+
+* Sun Apr 13 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-1mdv2009.0
++ Revision: 192655
+- import kde3-macros
+
+
diff --git a/mandriva/2010.2/dependencies/kde3-macros/kde3.macros b/mandriva/2010.2/dependencies/kde3-macros/kde3.macros
new file mode 100644
index 000000000..688ee04f6
--- /dev/null
+++ b/mandriva/2010.2/dependencies/kde3-macros/kde3.macros
@@ -0,0 +1,57 @@
+%use_enable_final %{!?_disable_final:--enable-final}
+%use_unstable %{?_unstable:--enable-debug=full}
+
+%_kde3_prefix /opt/kde3
+%_kde3_libdir %_kde3_prefix/%_lib
+%_kde3_iconsdir %_kde3_prefix/share/icons
+%_kde3_sysconfdir %_sysconfdir
+%_kde3_datadir %_kde3_prefix/share
+%_kde3_configdir %_kde3_datadir/config
+%_kde3_appsdir %_kde3_datadir/apps
+%_kde3_docdir %_kde3_prefix/share/doc
+%_kde3_bindir %_kde3_prefix/bin
+%_kde3_sbindir %_kde3_prefix/sbin
+%_kde3_includedir %_kde3_prefix/include
+%_kde3_mandir %_kde3_prefix/share/man
+%_kde3_autostart %_kde3_prefix/share/autostart
+
+%configure_kde3 \\\
+  %before_configure ; \
+  %{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
+  [ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
+  CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
+  PKG_CONFIG_PATH="%{_kde3_libdir}/pkgconfig:%{_libdir}/pkgconfig:${PKG_CONFIG_PATH}" \
+  $CONFIGURE_TOP/configure --build=%{_target_platform} \\\
+	--prefix=%{_kde3_prefix} \\\
+	--bindir=%{_kde3_bindir} \\\
+	--sbindir=%{_kde3_sbindir} \\\
+	--sysconfdir=%{_sysconfdir} \\\
+	--datadir=%{_kde3_datadir} \\\
+	--includedir=%{_kde3_includedir} \\\
+	--libdir=%{_kde3_libdir} %use_unstable %use_enable_final \\\
+	--infodir=%{_infodir} \\\
+	--mandir=%{_mandir} \\\
+	--disable-static \\\
+	--enable-mitshm \\\
+	--with-ipv6-lookup=auto \\\
+	--with-pic \\\
+	--with-xinerama \\\
+	--with-alsa \\\
+	--enable-libfam \\\
+	--enable-pcre \\\
+	--with-qt-dir=%{qt3dir} --with-qt-includes=%{qt3include} --with-qt-libraries=%{qt3lib}\\\
+        --with-extra-libs=%{_kde3_libdir} --with-extra-includes=%{_kde3_includedir}/tqt \\\
+	%if "%{_lib}" != "lib" \
+	--enable-libsuffix="%(A=%{_lib}; echo ${A/lib/})" \\\
+	%endif \
+	--disable-rpath \\\
+        --enable-closure \\\
+	$CONFIGURE_XPATH
+# Rebuild icon cache
+%update_kde3_icon_cache() if [ -x %{_update_icon_cache_bin} ]; then \
+%{_update_icon_cache_bin} --force --quiet %{_kde3_iconsdir}/%{1} || true; fi \
+%{nil}
+
+%clean_kde3_icon_cache() if [ -x %{_update_icon_cache_bin} -a -r %{_kde3_iconsdir}/%{1}/index.theme ]; then \
+%{_update_icon_cache_bin} --force --quiet %{_kde3_iconsdir}/%{1} || true ; fi \
+%{nil}
diff --git a/mandriva/2010.2/dependencies/libtqtinterface/libtqtinterface.spec b/mandriva/2010.2/dependencies/libtqtinterface/libtqtinterface.spec
new file mode 100644
index 000000000..3bba9bb56
--- /dev/null
+++ b/mandriva/2010.2/dependencies/libtqtinterface/libtqtinterface.spec
@@ -0,0 +1,135 @@
+# TODO
+# - for some unknown reason to me it creates dead symlinks instead of libtqt shared library
+#   libtool: install: /usr/bin/install -c -p .libs/libtqt.so.4.2.0 /tmp/xxx/usr/lib64/libtqt.so.4.2.0
+#   /usr/bin/install: cannot stat `.libs/libtqt.so.4.2.0': No such file or directory
+#   workarounded in spec r1.2 commit
+#
+# Conditional build:
+%bcond_with		qt4     # Enable Qt4 support (this will disable all Qt3 support)
+
+%define epoch_kdelibs 30000000
+
+Summary:	Interface and abstraction library for Qt and Trinity
+Name:		libtqtinterface
+Version:	3.5.12
+Release:	%mkrel 1
+#Epoch:          %epoch_kdelibs
+License:	GPL v2
+Group:		Graphical desktop/KDE3
+Source0:	http://mirror.its.uidaho.edu/pub/trinity/releases/%{version}/dependencies/tqtinterface-%{version}.tar.gz
+# Source0-md5:	361c45961184f01f95d3b771138c8229
+Patch0:         tqt-comments.patch
+Patch1:         tqglobal-comments.patch
+Patch2: 	tqt-r1217318.diff
+URL:		http://trinity.pearsoncomputing.net/
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libltdl-devel
+BuildRequires:	libtool
+BuildRequires:	pkgconfig
+BuildRequires:	qt3-devel
+BuildRequires:	sed >= 4.0
+#BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRoot: %_tmppath/%name-%version-%release-root
+
+
+%description
+This package includes libraries that abstract the underlying Qt system
+from the actual Trinity code, allowing easy, complete upgrades to new
+versions of Qt.
+
+It also contains various functions that have been removed from newer
+versions of Qt, but are completely portable and isolated from other
+APIs such as Xorg. This allows the Trinity project to efficiently
+perform certain operations that are infeasible or unneccessarily
+difficult when using pure Qt4 or above.
+
+%package devel
+Summary:	Header files for libtqtinterface library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libtqtinterface
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+Header files for libtqtinterface library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libtqtinterface.
+
+%prep
+%setup -qc
+mv dependencies/tqtinterface/* .
+%patch0 -p0
+%patch1 -p0
+%patch2 -p2
+
+# libtool copy
+rm -r libltdl
+%{__sed} -i -e '/ltdl.m4/d' Makefile.am.in
+
+# remove copy of QtCore and QtGui devel headers
+rm -r qtinterface/qt4 qtinterface/tqt4
+%{__sed} -i -e /tqt4/d qtinterface/Makefile.am
+
+%build
+make -f admin/Makefile.common cvs
+
+QTDIR=%qt3dir ; export QTDIR;
+PATH=%{qt3dir}/bin:$PATH; export PATH;
+export xdg_menudir=%_sysconfdir/xdg/kde/menus
+
+%configure_kde3 \
+        --includedir=%{_kde3_includedir}/tqt \
+%if "%{_lib}" == "lib64"
+	--enable-libsuffix=64 \
+%endif
+	%{?with_qt4:--enable-qt4}
+
+%{__make} \
+	LIBTOOL="%{_bindir}/libtool -v"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+# force -j1 or USE_QTX is replaced _after_ file is installed
+%{__make} -j1 install \
+	DESTDIR=$RPM_BUILD_ROOT \
+
+# --disable-static did not work, rm it again
+#rm $RPM_BUILD_ROOT%{_libdir}/libtqt.a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_kde3_libdir}/libtqt.so.*.*.*
+%attr(755,root,root) %{_kde3_libdir}/libtqt.a
+%ghost %attr(755,root,root) %{_kde3_libdir}/libtqt.so.4
+
+%files devel
+%defattr(644,root,root,755)
+%doc AUTHORS COPYING README
+%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt1
+%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt2
+%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt3
+%attr(755,root,root) %{_kde3_bindir}/dcopidl-tqt
+%attr(755,root,root) %{_kde3_bindir}/dcopidl2cpp-tqt
+%attr(755,root,root) %{_kde3_bindir}/dcopidlng-tqt
+%attr(755,root,root) %{_kde3_bindir}/mcopidl-tqt
+%attr(755,root,root) %{_kde3_bindir}/moc-tqt
+%attr(755,root,root) %{_kde3_bindir}/tqt-replace
+%attr(755,root,root) %{_kde3_bindir}/tqt-replace-stream
+%dir %{_kde3_includedir}/tqt
+%{_kde3_includedir}/tqt/tq*.h
+%{_kde3_libdir}/libtqt.la
+%{_kde3_libdir}/libtqt.so
+
+%define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
+%changelog
+* Wed Feb 1 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-1mvf2010.2
++ Rewrite for MDV 2010.2
++ Spec based on revision 1.4 from PLD linux
++ Add tqt-comments.patch, tqglobal-comments.patch. My compiler doesn't like // comments.
diff --git a/mandriva/2010.2/dependencies/libtqtinterface/tqglobal-comments.patch b/mandriva/2010.2/dependencies/libtqtinterface/tqglobal-comments.patch
new file mode 100644
index 000000000..332a7d57c
--- /dev/null
+++ b/mandriva/2010.2/dependencies/libtqtinterface/tqglobal-comments.patch
@@ -0,0 +1,26 @@
+--- qtinterface/tqglobal.h.orig	2011-02-04 12:35:10.215472605 +0000
++++ qtinterface/tqglobal.h	2011-02-04 12:35:45.537474675 +0000
+@@ -26,18 +26,18 @@
+ 
+ #ifdef USE_QT3
+ 
+-// Pull in all Qt3 global defines
++/* Pull in all Qt3 global defines */
+ 
+ #include <qglobal.h>
+ 
+-#endif // USE_QT3
++#endif /* USE_QT3 */
+ 
+ #ifdef USE_QT4
+ 
+-// Pull in all Qt4 global defines
++/* Pull in all Qt4 global defines */
+ 
+ #include <Qt/qglobal.h>
+ 
+-#endif // USE_QT4
++#endif /* USE_QT4 */
+ 
+ #endif /* TQGLOBAL_H */
+\ No newline at end of file
diff --git a/mandriva/2010.2/dependencies/libtqtinterface/tqt-comments.patch b/mandriva/2010.2/dependencies/libtqtinterface/tqt-comments.patch
new file mode 100644
index 000000000..e367613f8
--- /dev/null
+++ b/mandriva/2010.2/dependencies/libtqtinterface/tqt-comments.patch
@@ -0,0 +1,23 @@
+--- qtinterface/tqt.h.orig	2010-08-31 00:37:01.000000000 +0100
++++ qtinterface/tqt.h	2011-02-03 13:48:47.483987570 +0000
+@@ -42,7 +42,7 @@
+ #define TQT_METHOD(a)	METHOD(a)
+ #define TQT_SLOT(a)	SLOT(a)
+ #define TQT_SIGNAL(a)	SIGNAL(a)
+-#endif // __cplusplus
++#endif
+ 
+ #ifdef USE_QT3
+ #define qint64			long
+@@ -1319,11 +1319,4 @@
+ #define TQXmlDefaultHandler QXmlDefaultHandler
+ #endif
+ 
+-// Undo any damage caused by the tqt-replace utility
+-//#define QCStringList TQCStringList
+-//#define QtWIN TQtWIN
+-
+-//#include "kdemacros.h.in"
+-//#define TQT_EXPORT KDE_EXPORT
+-
+ #endif /* TQT_H */
diff --git a/mandriva/2010.2/dependencies/libtqtinterface/tqt-r1217318.diff b/mandriva/2010.2/dependencies/libtqtinterface/tqt-r1217318.diff
new file mode 100644
index 000000000..cd9ca03bd
--- /dev/null
+++ b/mandriva/2010.2/dependencies/libtqtinterface/tqt-r1217318.diff
@@ -0,0 +1,12 @@
+Index: dependencies/tqtinterface/qtinterface/tqt.h
+===================================================================
+--- dependencies/tqtinterface/qtinterface/tqt.h	(revision 1217317)
++++ dependencies/tqtinterface/qtinterface/tqt.h	(revision 1217318)
+@@ -85,6 +85,7 @@
+ #define TQ_ControlButton	ControlButton
+ #define TQ_AltButton		AltButton
+ #define TQ_MetaButton		MetaButton
++#define TQ_WFlags		TQt::WFlags
+ #define TQIODevice_OpenModeFlag int
+ 
+ #define TQAlignCenter AlignCenter
diff --git a/mandriva/2010.2/dependencies/mandriva-kde3-config/fix_kdmtheme.patch b/mandriva/2010.2/dependencies/mandriva-kde3-config/fix_kdmtheme.patch
new file mode 100644
index 000000000..c901da7a1
--- /dev/null
+++ b/mandriva/2010.2/dependencies/mandriva-kde3-config/fix_kdmtheme.patch
@@ -0,0 +1,35 @@
+diff -Naur mandriva-kde-config-2009.0/kdm/backgroundrc mandriva-kde-config.yeni/kdm/backgroundrc
+--- mandriva-kde-config-2009.0/kdm/backgroundrc	2006-08-23 20:58:15.000000000 +0300
++++ mandriva-kde-config.yeni/kdm/backgroundrc	2009-11-24 21:35:26.592448000 +0200
+@@ -13,6 +13,6 @@
+ Program=
+ ReverseBlending=false
+ UseSHM=false
+-Wallpaper=/usr/share/mdk/backgrounds/default.png
++Wallpaper=/usr/share/mdk/backgrounds/default.jpg
+ WallpaperList=
+ WallpaperMode=Scaled
+diff -Naur mandriva-kde-config-2009.0/kdm/kdmrc mandriva-kde-config.yeni/kdm/kdmrc
+--- mandriva-kde-config-2009.0/kdm/kdmrc	2008-06-23 21:03:31.000000000 +0300
++++ mandriva-kde-config.yeni/kdm/kdmrc	2009-12-15 00:27:11.727822403 +0200
+@@ -451,7 +451,7 @@
+ # The theme to use for the greeter. Can point to either a directory or an XML
+ # file.
+ # Default is ""
+-Theme=/usr/share/mdk/dm
++Theme=/opt/kde3/share/config/kdm/themes/2010
+ 
+ # Core config for local displays
+ [X-:*-Core]
+diff -Naur mandriva-kde-config-2009.0/kdm/themes/2008/2008.xml mandriva-kde-config.yeni/kdm/themes/2008/2008.xml
+--- mandriva-kde-config-2009.0/kdm/themes/2008/2008.xml	2007-09-12 01:17:40.000000000 +0300
++++ mandriva-kde-config.yeni/kdm/themes/2008/2008.xml	2009-11-25 02:13:17.273313000 +0200
+@@ -2,7 +2,7 @@
+ <!DOCTYPE greeter SYSTEM "greeter.dtd">
+ <greeter>
+   <item type="pixmap">
+-    <normal file="/usr/share/mdk/backgrounds/default.png"/>
++    <normal file="/usr/share/mdk/backgrounds/default.jpg"/>
+     <pos x="0" y="0" width="100%" height="100%"/>
+   </item>
+ 
diff --git a/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde-config-2010.2.tar.bz2 b/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde-config-2010.2.tar.bz2
new file mode 100644
index 000000000..ac58f6a1e
--- /dev/null
+++ b/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde-config-2010.2.tar.bz2
diff --git a/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde3-config.spec b/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde3-config.spec
new file mode 100644
index 000000000..5bb7c8d31
--- /dev/null
+++ b/mandriva/2010.2/dependencies/mandriva-kde3-config/mandriva-kde3-config.spec
@@ -0,0 +1,907 @@
+%define epoch_kdelibs 30000000
+%define oname mandriva-kde-config
+
+Name: mandriva-kde3-config
+Summary: Mandriva KDE configuration
+Version: 2010.2
+Release: %mkrel 1
+URL: http://www.mandriva.com
+Group: Graphical desktop/KDE3
+BuildRoot: %_tmppath/%name-buildroot
+BuildRequires: kde3-macros
+Source0: %{oname}-%{version}.tar.bz2
+# OpenOffice.org icons. Should be in a separate package
+# in the future, since they're shared between kde, OOo
+# and maybe others
+Source1: ooo-icons.tar.bz2
+Source2: opendocument-mime.tar.bz2
+Patch0: fix_kdmtheme.patch
+License: GPL
+BuildArch: noarch
+Obsoletes: %{name} < %version-%release
+Obsoletes: mandriva-kde-config
+Provides: mandriva-kde-config = %version-%release
+
+
+%description
+This package regroups all specific Mandriva config file for KDE.
+(kicker config etc.)
+
+#--------------------------------------------------------------------
+
+%package common
+Group: Graphical desktop/KDE3
+Summary: Common configs used for Mandriva theme
+Requires(pre): update-alternatives
+Requires: urw-fonts
+Obsoletes: %{name}-common < %version-%release
+Obsoletes: mandriva-kde-config-common
+Provides: mandriva-kde-config-common = %version-%release
+
+%description common
+common configs used for Mandriva theme
+
+%post common
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/common/upstream-kde-config 9
+
+%postun common
+if ! [ -e /var/lib/mandriva/kde-profiles/common/upstream-kde-config ]; then
+  update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/common/upstream-kde-config
+fi
+
+%files common
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/
+%dir %_localstatedir/lib/mandriva/kde-profiles/common
+%_localstatedir/lib/mandriva/kde-profiles/common/*
+
+#--------------------------------------------------------------------
+
+%package -n powerpack-kde3-config
+Summary: Mandriva KDE configuration 
+Group: Graphical desktop/KDE3
+Provides: kde-config-file = %version-%release
+Requires: mandriva-theme
+Requires: desktop-common-data
+Requires(pre): mandriva-kde-config-common = %version-%release
+Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
+Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Obsoletes: powerpackplus-kde-config < 2008.0 
+Provides: powerpack-kde-config = %version-%release
+Provides: powerpackplus-kde-config = %version-%release
+Obsoletes: powerpack-kde-config
+Requires(preun): mandriva-kde3-config-common
+Obsoletes: powerpack-kde3-config < %version-%release
+
+%pre -n powerpack-kde3-config
+if [ "$1" = "2" ]; then
+	[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
+fi
+if [ -d %_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/kdesktop/Desktop ]; then
+  rm -rf %_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/kdesktop/Desktop
+fi
+
+%post -n powerpack-kde3-config
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/powerpack/kderc 10
+
+%postun -n powerpack-kde3-config
+if ! [ -e /var/lib/mandriva/kde-profiles/powerpack/kderc ]; then
+  update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/powerpack/kderc
+fi
+
+%description -n powerpack-kde3-config
+This package regroups all specific Mandriva config file for KDE.
+
+%files -n powerpack-kde3-config
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/kde-profiles/powerpack
+%_localstatedir/lib/mandriva/kde-profiles/powerpack/*
+
+#--------------------------------------------------------------------
+
+%package -n one-kde3-config
+Summary: Mandriva KDE configuration 
+Group: Graphical desktop/KDE3
+Provides: kde-config-file = %version-%release
+Requires: mandriva-theme
+Requires: desktop-common-data
+Requires(pre): mandriva-kde3-config-common = %version-%release
+Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
+Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Provides: one-kde-config = %version-%release
+Obsoletes: one-kde-config
+Requires(preun): mandriva-kde3-config-common
+Obsoletes: one-kde3-config < %version-%release
+
+%description -n one-kde3-config
+This package regroups all specific Mandriva config file for KDE.
+
+%pre -n one-kde3-config
+if [ "$1" = "2" ]; then
+	[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
+fi
+if [ -d %_localstatedir/lib/mandriva/kde-profiles/one/share/apps/kdesktop/Desktop ]; then
+  rm -rf %_localstatedir/lib/mandriva/kde-profiles/one/share/apps/kdesktop/Desktop
+fi
+
+%post -n one-kde3-config
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/one/kderc 10
+
+%postun -n one-kde3-config
+if ! [ -e /var/lib/mandriva/kde-profiles/one/kderc ]; then
+  update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/one/kderc
+fi
+
+%files -n one-kde3-config
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/kde-profiles/one
+%_localstatedir/lib/mandriva/kde-profiles/one/*
+
+
+#--------------------------------------------------------------------
+
+%package -n flash-kde3-config
+Summary: Mandriva KDE configuration 
+Group: Graphical desktop/KDE3
+Provides: kde-config-file = %version-%release
+Requires: mandriva-theme
+Requires: desktop-common-data
+Requires(pre): mandriva-kde3-config-common = %version-%release
+Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
+Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Provides: flash-kde-config = %version-%release
+Obsoletes: flash-kde-config
+Requires(preun): mandriva-kde3-config-common
+Obsoletes: flash-kde3-config < %version-%release
+
+%description -n flash-kde3-config
+This package regroups all specific Mandriva config file for KDE.
+
+%pre -n flash-kde3-config
+if [ "$1" = "2" ]; then
+	[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
+fi
+if [ -d %_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/kdesktop/Desktop ]; then
+  rm -rf %_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/kdesktop/Desktop
+fi
+
+%post -n flash-kde3-config
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/flash/kderc 10
+
+%postun -n flash-kde3-config
+if ! [ -e /var/lib/mandriva/kde-profiles/flash/kderc ]; then
+  update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/flash/kderc
+fi
+
+%files -n flash-kde3-config
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/kde-profiles/flash
+%_localstatedir/lib/mandriva/kde-profiles/flash/*
+
+
+#--------------------------------------------------------------------
+
+%package -n free-kde3-config
+Summary: Mandriva KDE configuration 
+Group: Graphical desktop/KDE3
+Provides: kde-config-file = %version-%release
+Requires: mandriva-theme
+Requires: qt4-style-iaora
+Requires: desktop-common-data
+Requires(pre): mandriva-kde3-config-common = %version-%release
+Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
+Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Requires(preun): mandriva-kde3-config-common
+Obsoletes: download-kde-config-2007 < 2008.0 
+Provides:	download-kde-config-2007
+Obsoletes: discovery-kde-config < 2008.0
+Provides: discovery-kde-config = %version-%release
+Provides: free-kde-config = %version-%release
+Obsoletes: free-kde-config
+Obsoletes: free-kde3-config < %version-%release
+
+%description -n free-kde3-config
+This package regroups all specific Mandriva config file for KDE.
+
+%pre -n free-kde3-config
+if [ "$1" = "2" ]; then
+	[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
+fi
+if [ -d %_localstatedir/lib/mandriva/kde-profiles/free/share/apps/kdesktop/Desktop ]; then
+  rm -rf %_localstatedir/lib/mandriva/kde-profiles/free/share/apps/kdesktop/Desktop
+fi
+
+%post -n free-kde3-config
+update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/free/kderc 10
+
+%postun -n free-kde3-config
+if ! [ -e /var/lib/mandriva/kde-profiles/free/kderc ]; then
+  update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/free/kderc
+fi
+
+%files -n free-kde3-config
+%defattr(0644,root,root,755)
+%dir %_localstatedir/lib/mandriva/kde-profiles/free
+%_localstatedir/lib/mandriva/kde-profiles/free/*
+
+
+#--------------------------------------------------------------------
+# KDM
+
+%package -n mandriva-kdm3-config
+Summary: Mandriva KDM config file
+Group: Graphical desktop/KDE3
+Obsoletes: kdebase-kdm-config-file < 2008.0
+Provides: kdm-config-file = %version-%release
+# For upgrade 
+Provides: kdebase-kdm-config-file = 2:%version 
+Conflicts: kdebase-progs <= 3.5.1-15.1.20060mdk
+Obsoletes: mandriva-kde-config-file < 2008.0
+Requires(post): perl-MDK-Common
+Obsoletes: mandriva-kdm-config
+Provides: mandriva-kdm-config = %version-%release
+
+
+%description -n mandriva-kdm3-config
+Mandriva KDM config file
+
+%trigger -n mandriva-kdm3-config -- kdebase-kdm-config-file 
+perl -MMDK::Common -e 'update_gnomekderc("%{_kde3_configdir}/kdm/kdmrc", "General", "ConsoleTTYs", "tty1,tty2,tty3,tty4,tty5,tty6", "ServerVTs", "-7")'
+
+%files -n mandriva-kdm3-config
+%defattr(0644,root,root,0755)
+%config(noreplace) %_kde3_configdir/kdm/backgroundrc
+%config(noreplace) %_kde3_configdir/kdm/kdmrc
+%_kde3_configdir/kdm/themes
+
+#---------------------------------------
+
+%prep
+%setup -q -n %{oname}-%{version} -a 1 -a 2
+%patch0 -p1
+
+%install
+rm -rf %buildroot
+# Create profile dirs
+mkdir -p %buildroot/%{_kde3_configdir}
+mkdir -p %buildroot/%_localstatedir/lib/mandriva
+
+mv kde-profiles %buildroot/%_localstatedir/lib/mandriva
+mv kdm %buildroot/%{_kde3_configdir}
+
+# openoffice icons, see #26311
+mkdir -p %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/icons/
+cp -a ooo-icons/hicolor %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/icons/
+
+# openoffice mimetypes, see #26311
+mkdir -p %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
+cp -a opendocument-mime/* %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
+# XXX we have to rename them to the same name provided by kdelibs-common, otherwise the
+# global ones are used.
+pushd %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
+    mv openoffice.org2.4-oasis-drawing.desktop vnd.oasis.opendocument.graphics.desktop
+    mv openoffice.org2.4-oasis-drawing-template.desktop vnd.oasis.opendocument.graphics-template.desktop
+    mv openoffice.org2.4-oasis-master-document.desktop vnd.oasis.opendocument.text-master.desktop
+    mv openoffice.org2.4-oasis-formula.desktop vnd.oasis.opendocument.formula.desktop
+    mv openoffice.org2.4-oasis-spreadsheet.desktop vnd.oasis.opendocument.spreadsheet.desktop
+    mv openoffice.org2.4-oasis-spreadsheet-template.desktop vnd.oasis.opendocument.spreadsheet-template.desktop
+    mv openoffice.org2.4-oasis-text.desktop vnd.oasis.opendocument.text.desktop
+    mv openoffice.org2.4-oasis-text-template.desktop vnd.oasis.opendocument.text-template.desktop
+    mv openoffice.org2.4-oasis-web-template.desktop vnd.oasis.opendocument.text-web.desktop
+    mv openoffice.org2.4-oasis-presentation.desktop vnd.oasis.opendocument.presentation.desktop
+    mv openoffice.org2.4-oasis-presentation-template.desktop vnd.oasis.opendocument.presentation-template.desktop
+    mv openoffice.org2.4-spreadsheet.desktop vnd.sun.xml.calc.desktop
+    mv openoffice.org2.4-spreadsheet-template.desktop vnd.sun.xml.calc.template.desktop
+    mv openoffice.org2.4-presentation.desktop vnd.sun.xml.impress.desktop
+    mv openoffice.org2.4-presentation-template.desktop vnd.sun.xml.impress.template.desktop
+    mv openoffice.org2.4-drawing.desktop  vnd.sun.xml.draw.desktop
+    mv openoffice.org2.4-drawing-template.desktop vnd.sun.xml.draw.template.desktop
+    mv openoffice.org2.4-text.desktop vnd.sun.xml.writer.desktop
+    mv openoffice.org2.4-text-template.desktop vnd.sun.xml.writer.template.desktop
+    mv openoffice.org2.4-master-document.desktop vnd.sun.xml.writer.master.desktop
+    mv openoffice.org2.4-formula.desktop vnd.sun.xml.math.desktop
+popd
+
+
+for name in flash free one powerpack; do
+    echo "[Directories-default]" > %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/kderc
+    echo "prefixes=/var/lib/mandriva/kde-profiles/common,%_localstatedir/lib/mandriva/kde-profiles/$name" >> %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/kderc
+	# create the symlink to the desktop data
+    mkdir -p %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/share/apps/kdesktop
+    ln -s %_datadir/mdk/desktop/$name %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/share/apps/kdesktop/DesktopLinks
+done
+
+# Upstream
+echo "[Directories-default]" > %buildroot%_localstatedir/lib/mandriva/kde-profiles/common/upstream-kde-config
+echo "prefixes=%{_kde3_prefix}" >> %buildroot%_localstatedir/lib/mandriva/kde-profiles/common/upstream-kde-config
+
+# Bookmarks
+mkdir -p %buildroot%_localstatedir/lib/mandriva/kde-profiles/{free,flash,one,powerpack}/share/apps/konqueror/
+ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-download.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/free/share/apps/konqueror/bookmarks.xml
+ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-one.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/one/share/apps/konqueror/bookmarks.xml
+ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-one.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/konqueror/bookmarks.xml
+ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-powerpack.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/konqueror/bookmarks.xml
+
+%clean
+rm -rf %buildroot
+
+
+%changelog
+* Fri Feb 4 2011 Tim Williams <tim@my-place.org.uk> 2010.2-1mvt2010.2
++ Rebuild for 2010.2
+
+* Fri Jul 16 2010 Tim Williams <tim@my-place.org.uk> 2010.1-1mvt2010.1
++ Rebuild for 2010.1
+
+* Sun Feb 07 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2010.0-3mvt2010.0
++ Prevent to install old 2009.0 packages
++ Change mandriva-kdm-config package name to mandriva-kdm3-config to avoid possible future
+conflicts. (Mandriva developer may decide to change mandriva-kdm4-config to this one)
+
+* Tue Jan 12 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2010.0-2mvt2010.0
++ Fix ksplash and wallpaper issues
+
+* Fri Jan 08 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2010.0-1mvt2010.0
++ Rebuild source for 2010.0
+  - Mandriva 2010.0 KDM theme added
+  - Mandriva 2010.0 KSplash theme added
+
+* Sun Nov 22 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2009.0-11mvt2010.0
++ Fixed pacakge name to avoid old official Mandriva package upgrade
+
+* Wed Nov 18 2009 Tim Williams <tim@my-place.org.uk> 2009.0-10mdv2010.0
++ Add konq-home.patch. Changes default start page to avoid crash when viewing the default /usr/share/doc/HTML/index.html
+
+* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 2009.0-9mdv2010.0
++ Rebuild for MDV 2010.0
+
+* Fri Sep 19 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-8mdv2009.0
++ Revision: 285971
+- Mandriva simple splash for kde3
+
+* Tue Sep 16 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-7mdv2009.0
++ Revision: 285202
+- Update Mandriva Simple kde3 splash
+
+* Mon Sep 01 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-6mdv2009.0
++ Revision: 278597
+- Fix profilerc due new .desktop files
+
+* Thu Aug 07 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-5mdv2009.0
++ Revision: 265832
+- Start to disable basic services of kde3. kde4 runs kded daemon from kde3 to enable easy way to run kde3 applications. We don't want duplicate media notifiers, writed and other similar daemons.
+
+* Mon Jul 28 2008 Anne Nicolas <anne.nicolas@mandriva.com> 2009.0-4mdv2009.0
++ Revision: 251563
+- add qt4-style-iaora require
+
+* Mon Jun 23 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2009.0-3mdv2009.0
++ Revision: 228397
+- Changing X11* references in kdmrc to /usr/share/X11...
+
+  + Pixel <pixel@mandriva.com>
+    - adapt to %%_localstatedir now being /var instead of /var/lib (#22312)
+
+* Wed May 14 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2009.0-2mdv2009.0
++ Revision: 207234
+- Update Flash design
+
+* Tue May 06 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-1mdv2009.0
++ Revision: 201967
+- Fixed kdm position of new config file. Bye bye /etc/kde
+
+* Wed Apr 02 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-27mdv2008.1
++ Revision: 191678
+- Kmenu font size
+
+* Tue Apr 01 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-26mdv2008.1
++ Revision: 191389
+- I've commited this file with a wrong dir path. Fixed now...
+- Adding support to Mentor Office Keyboard again, with VolumeKeys disabled, because
+  it's a kmilo function
+
+* Fri Mar 28 2008 Ademar de Souza Reis Jr <ademar@mandriva.com.br> 2008.1-25mdv2008.1
++ Revision: 190961
+- add openoffice icons and openoffice mimetypes so that
+  opendocuments use the latest iconset from openoffice.org.
+  Closes: #26311
+
+* Thu Mar 27 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-24mdv2008.1
++ Revision: 190675
+- Fixing Multimedia keyboard pb, by removing Mentor Office Wireless Keyboard shortcuts
+
+* Fri Mar 14 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-23mdv2008.1
++ Revision: 187866
+- Fix https://qa.mandriva.com/show_bug.cgi?id=37109
+- Line up icons by default on desktop
+
+* Wed Mar 12 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-22mdv2008.1
++ Revision: 187106
+- Fixing minipager issue, by adding a default config file acording to
+  https://qa.mandriva.com/show_bug.cgi?id=37796
+
+* Mon Mar 10 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-21mdv2008.1
++ Revision: 183669
+- Fixing lockout-buttons in kicker to save their configurations affter logout.
+
+* Fri Mar 07 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-20mdv2008.1
++ Revision: 181604
+- Bookmarking made easy...
+
+* Thu Mar 06 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-19mdv2008.1
++ Revision: 181059
+- Use the right color scheme for KDM greeter
+- Add the config for the default wallpaper for 2008.1
+
+* Wed Mar 05 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-18mdv2008.1
++ Revision: 180241
+- Houston, we're out of space icons...
+
+* Mon Mar 03 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-17mdv2008.1
++ Revision: 177993
+- Updated with transparent buttons
+- Removed scaled allowing button getting good sizing and centerd position
+
+* Fri Feb 29 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-16mdv2008.1
++ Revision: 176912
+- Fix shutdown kfm image
+
+* Fri Feb 29 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-15mdv2008.1
++ Revision: 176750
+- Make sure the right colors are used
+
+* Wed Feb 27 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-14mdv2008.1
++ Revision: 175931
+- New release containing:
+   * Fixed default colors for the kde profiles
+   * Removed shadows from the status labels of splash themes
+   * Updated kmenu icons
+   * Updated metabar images
+
+* Wed Feb 27 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-13mdv2008.1
++ Revision: 175813
+- New release updating splash themes and color schemes for 2008.1
+
+* Mon Feb 25 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-12mdv2008.1
++ Revision: 175126
+- Proper faces dir for kdm
+
+* Fri Feb 22 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-11mdv2008.1
++ Revision: 173976
+- Add a simple splash screen for the ones who don't like the full screen splash
+
+* Tue Feb 19 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-10mdv2008.1
++ Revision: 173041
+- Fix the button background colors
+
+* Fri Feb 15 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-9mdv2008.1
++ Revision: 169003
+- Add a default configuration file to minipagerapplet
+
+* Fri Feb 15 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-8mdv2008.1
++ Revision: 168879
+- No use of external player as standard
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - fix summary-not-capitalized
+
+* Fri Feb 01 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-7mdv2008.1
++ Revision: 161221
+- Change the kside top images to match the new layout
+
+* Wed Jan 09 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-6mdv2008.1
++ Revision: 147151
+- Make standard menu default again
+
+  + Olivier Blin <oblin@mandriva.com>
+    - restore BuildRoot
+
+* Fri Dec 21 2007 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-5mdv2008.1
++ Revision: 136414
+- Kicker's clockapplet was not saving their options
+  when exits only one clock on kicker. Now its working.
+
+* Tue Dec 18 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.1-4mdv2008.1
++ Revision: 132432
+- Added media applet in kicker by default
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - kill re-definition of %%buildroot on Pixel's request
+    - do not hardcode man pages extension
+
+* Thu Dec 13 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.1-3mdv2008.1
++ Revision: 119505
+- Fix upgrade from non alternatives /etc/kderc
+- Moved common kdeglobal settings for kdeglobals in common and removed the duplicated in the profiles
+- Set kspell default encoding for UTF8
+
+* Thu Nov 22 2007 Thierry Vignaud <tvignaud@mandriva.com> 2008.1-2mdv2008.1
++ Revision: 111300
+- reupload (missing on x86_64)
+
+* Fri Oct 26 2007 Nicolas Lécureuil <neoclust@mandriva.org> 2008.1-1mdv2008.1
++ Revision: 102378
+- Update tarball with merged patches
+
+* Fri Oct 26 2007 Nicolas Lécureuil <neoclust@mandriva.org> 2008.0-31mdv2008.1
++ Revision: 102229
+- Add patch to activate klipper
+
+* Tue Oct 23 2007 Olivier Blin <oblin@mandriva.com> 2008.0-30mdv2008.1
++ Revision: 101644
+- update Flash splash (from Helio)
+
+* Thu Oct 18 2007 Olivier Blin <oblin@mandriva.com> 2008.0-29mdv2008.1
++ Revision: 100018
+- add flash-kde-config
+
+* Tue Oct 02 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-28mdv2008.0
++ Revision: 94768
+- Make the Mandriva theme select the proper components (#33822)
+
+* Mon Oct 01 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-27mdv2008.0
++ Revision: 94151
+- Use the ia_ora style and colors in kdm
+
+* Fri Sep 28 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-26mdv2008.0
++ Revision: 93584
+- Restore kicker pager
+- Use official preview for moodin theme
+- Use sound notification only for session start and stop
+- Properly obsolete the discovery and powerpackplus kde config packages
+- Make all obsoletes tags versioned
+
+* Wed Sep 26 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-24mdv2008.0
++ Revision: 93095
+- Use DesktopLinks instead of Desktop to put icons on desktop (this way they get
+  copied to the user home dir (#33204)
+
+* Tue Sep 25 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-23mdv2008.0
++ Revision: 92891
+- Enforce kaffeine as the default player for One and Free
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Flatten people image on powerpack images
+
+* Fri Sep 21 2007 Anne Nicolas <anne.nicolas@mandriva.com> 2008.0-21mdv2008.0
++ Revision: 91776
+- update sources
+- add metabar themes
+
+* Wed Sep 19 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-20mdv2008.0
++ Revision: 91199
+- Add squared icons for the K menu
+
+* Wed Sep 19 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-19mdv2008.0
++ Revision: 91017
+- Fix One color scheme
+
+* Tue Sep 18 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-18mdv2008.0
++ Revision: 89764
+- Define totem as the default player for powerpack
+
+* Mon Sep 17 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-17mdv2008.0
++ Revision: 89272
+- Use the desktop icons from desktop-common-data so that they are proper
+  translated
+
+* Sat Sep 15 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-16mdv2008.0
++ Revision: 85869
+- Multimedia direction change
+
+* Sat Sep 15 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-15mdv2008.0
++ Revision: 85852
+- Fix kickoff button
+
+* Fri Sep 14 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-14mdv2008.0
++ Revision: 85758
+- KDM changes
+- Sound changes
+
+* Wed Sep 12 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-13mdv2008.0
++ Revision: 84580
+- Fixed clock position
+- Fixed "fat" menu letters
+- Fixed spacing on itens
+
+* Mon Sep 10 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-12mdv2008.0
++ Revision: 84142
+- ksmserver image change
+- kdm call grub instead of lilo
+- Proper naming
+
+* Thu Sep 06 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-11mdv2008.0
++ Revision: 81020
+- Font and config
+- kdm, kicker and Free splash update
+
+* Wed Sep 05 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-9mdv2008.0
++ Revision: 80365
+- Position text
+- New kicker buttons
+- No kdm userlist
+- New ia_ora one scheme
+
+* Tue Sep 04 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-8mdv2008.0
++ Revision: 79481
+- Updated themes
+
+* Tue Sep 04 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-7mdv2008.0
++ Revision: 78913
+- Starting migrate kde theme for 2008.0
+
+* Mon Aug 06 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-5mdv2008.0
++ Revision: 59467
+- Restore original images lost on svn crash
+
+* Thu Aug 02 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-4mdv2008.0
++ Revision: 58316
+- Fixed splash, removing Galaxy at last !
+- Removed wallpaper patch, commited on svn
+- Fixed Discovery theme
+
+  + Nicolas Lécureuil <neoclust@mandriva.org>
+    - [BUGFIX] change wallpaper link to more userfriendly one (bug #10638)'
+
+* Fri Jun 08 2007 Anssi Hannula <anssi@mandriva.org> 2008.0-3mdv2008.0
++ Revision: 37525
+- do not remove profile alternatives when upgrading package
+
+* Fri Jun 08 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-2mdv2008.0
++ Revision: 37505
+- Added possibility to change to upstream kde config, as requested by Anssi
+
+* Mon Jun 04 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-1mdv2008.0
++ Revision: 35211
+- Removed old faulty updatekdeprofiles for a solution based on update-alternatives. Simple, using
+  cascade for common avoiding symlinks, and letting have one profile read instead of a list of
+  profiles that never keep same order
+- Added hardcoded files present before on kdebase package
+- Changed konsole config for Linux schema, instead of white one
+
+
+* Fri Apr 06 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-25mdv2007.1
++ Revision: 150809
+- Fix nsplugins config
+
+* Wed Mar 28 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-24mdv2007.1
++ Revision: 149172
+- Fix kicker default icon
+
+* Tue Mar 27 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-23mdv2007.1
++ Revision: 149058
+- Fix kdesktop icon order
+
+* Thu Mar 22 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-22mdv2007.1
++ Revision: 148090
+- Fix windows key
+
+* Wed Mar 21 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-21mdv2007.1
++ Revision: 147454
+- Fix konsole default config
+
+* Wed Mar 21 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-20mdv2007.1
++ Revision: 147276
+- don't autostart klipper
+
+* Mon Mar 19 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-19mdv2007.1
++ Revision: 146426
+- Fix selected text color
+
+* Thu Mar 15 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-18mdv2007.1
++ Revision: 144247
+- Fix title text color
+
+* Wed Mar 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-17mdv2007.1
++ Revision: 143441
+- Fix kicker top
+  Fix kdesktop icons order
+
+* Mon Mar 12 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-16mdv2007.1
++ Revision: 141633
+- Update kside top
+
+* Sat Mar 10 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-15mdv2007.1
++ Revision: 140413
+- Add jam search engine
+
+* Wed Mar 07 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-14mdv2007.1
++ Revision: 134313
+- Add specific desktop file
+
+* Tue Mar 06 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-13mdv2007.1
++ Revision: 134007
+- Fix free color
+
+* Mon Mar 05 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-12mdv2007.1
++ Revision: 133018
+- Minor fix
+
+* Fri Mar 02 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-10mdv2007.1
++ Revision: 130993
+- Update preview
+
+* Thu Mar 01 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-9mdv2007.1
++ Revision: 130605
+- Update moodin picture
+
+* Tue Feb 27 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-8mdv2007.1
++ Revision: 126305
+- Fix kicker config
+
+* Fri Feb 16 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-7mdv2007.1
++ Revision: 121648
+- Fix kicker config
+
+* Fri Feb 16 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-6mdv2007.1
++ Revision: 121631
+- New kside
+
+* Fri Feb 16 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-5mdv2007.1
++ Revision: 121620
+- Fix version
+- Add kicker 16x16 icons
+
+* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-4mdv2007.1
++ Revision: 121083
+- Add kside
+
+* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-3mdv2007.1
++ Revision: 121080
+- New update
+
+* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-2mdv2007.1
++ Revision: 121001
+- Fix icons pos
+
+* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-1mdv2007.1
++ Revision: 120949
+- New version
+- New source
+
+* Thu Nov 16 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-29mdv2007.1
++ Revision: 85037
+- Touch default kdmrc to been able to provide userlist
+
+  + Laurent Montel <lmontel@mandriva.com>
+    - New package (2006-09-22 28mdv)
+      Fix kmplayer backend
+    - New package (2006-09-20 27mdv)
+      Fix migrate kdm from 2006 (thanks Pixel)
+    - New package (26mdv 2006-09-19)
+      Only description into menu for one/discovery
+
+* Tue Sep 19 2006 Laurent Montel <lmontel@mandriva.com> 2007-25mdv2007.0
++ Revision: 61919
+- New package( 2006-09-18 25mdv)
+  Fix wav encodage
+
+* Sat Sep 16 2006 Laurent Montel <lmontel@mandriva.com> 2007-24mdv2007.0
++ Revision: 61581
+- New sound
+
+* Sat Sep 16 2006 Laurent Montel <lmontel@mandriva.com> 2007-23mdv2007.0
++ Revision: 61570
+- New package (2006-09-15 23mdv)
+  Add new mdk statup function
+
+* Sat Sep 16 2006 Laurent Montel <lmontel@mandriva.com> 2007-22mdv2007.0
++ Revision: 61542
+- New package (2006-09-15 22mdv)
+  Add default sounds
+
+* Fri Sep 15 2006 Laurent Montel <lmontel@mandriva.com> 2007-21mdv2007.0
++ Revision: 61458
+- New package (2006-09-14 21mdv)
+  Use double click
+
+* Fri Sep 15 2006 Laurent Montel <lmontel@mandriva.com> 2007-20mdv2007.0
++ Revision: 61419
+- New version
+  Fix kicker right button
+
+* Wed Sep 13 2006 Laurent Montel <lmontel@mandriva.com> 2007-19mdv2007.0
++ Revision: 61072
+- New package (2006-09-12 19mdv)
+  Rename download->free
+  Fix typo
+- Add missing test
+
+* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-18mdv2007.0
++ Revision: 60840
+- New package (2006-09-11 18mdv)
+  Workaround for Requires(preun) which doesn't work
+
+* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-17mdv2007.0
++ Revision: 60830
+- New package (2006-09-11 16mdv)
+  Fix device on desktop
+
+* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-16mdv2007.0
++ Revision: 60764
+- New package (2006-09-11 16mdv)
+  Fix default color, don't display tooltip by default
+
+* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-15mdv2007.0
++ Revision: 60757
+- New package (2006-09-11 15mdv)
+  Fix kicker default apps
+
+* Sat Sep 09 2006 Laurent Montel <lmontel@mandriva.com> 2007-14mdv2007.0
++ Revision: 60598
+- New package (2006-09-08 14mdv)
+  Use by default ia_ora-kde theme
+
+* Thu Sep 07 2006 Laurent Montel <lmontel@mandriva.com> 2007-13mdv2007.0
++ Revision: 60211
+- New package (2006/09/06 -13mdv)
+  /var/lib/mandriva now is owned by this package
+  Add requires postun (need to uninstall package)
+
+* Wed Sep 06 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-12mdv2007.0
++ Revision: 60141
+- Added new configuration for kscd
+
+* Wed Sep 06 2006 Laurent Montel <lmontel@mandriva.com> 2007-11mdv2007.0
++ Revision: 60084
+- New package (2006-09-05 2007-10mdv)
+  Now each distro load correct scheme files
+- Fix typo
+
+* Fri Sep 01 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-10mdv2007.0
++ Revision: 59028
+- Xdmcp back to disabled due popular demand.
+- Fixed post update of profile ( Thanks to Nanar )
+
+* Thu Aug 31 2006 Laurent Montel <lmontel@mandriva.com> 2007-9mdv2007.0
++ Revision: 58847
+- Fix kside
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Fixed background defaults. Thanks to Laurent Montel
+    - Moved configs for a non versionated directories. Requested by Pixel and Laurent
+    - Fixed the clean generation if /etc/kderc.
+    - Fixed kcookiejar config, which for some reason is making some people getting
+      the cookies ask dialog back
+
+* Tue Aug 29 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-7mdv2007.0
++ Revision: 58364
+- Fix install for directories with space ( Galaxy )
+- Use the right tarball
+- Return to old Galaxy name for ksplash. Keep Mandriva2007 for "in the middel of
+  cooker" upgrade
+- Fixed invalid resources
+- Set 2 desktops for discovery
+
+* Fri Aug 25 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-6mdv2007.0
++ Revision: 57975
+- Moved terminal from rxvt to xterm in failsafe session of kdm. rxvt not support
+  utf-8 and most installations are using this by default
+- Fixed bug http://qa.mandriva.com/show_bug.cgi?id=24690 ( Wrong X path )
+- enabled xdmcp by default. System listen just locally.
+
+* Fri Aug 25 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-5mdv2007.0
++ Revision: 57956
+- Fixed type on ksplash theme rc
+- Fixed kdm postinstall
+
+* Thu Aug 24 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-4mdv2007.0
++ Revision: 57753
+- Fixed updatekdeprofile by Nanar ( thanks )
+- Fixed config paths
+- Fixed upgrade of kdm config
+- Uploaded Mandriva configs for svn on soft
+- Added kside images ( depends on remove switch patch on kdebase )
+- Added new ksplash theme ( will have different color ones ones ? )
+- First fully operational package. Thanks to Nanar for all help
+- import mandriva-kde-config-2007-1mdv2007.0
+
+  + Olivier Thauvin <nanardon@mandriva.org>
+    - preserv order of value
+    - the regexp need an eol marker
+    - no space around the ,
+
diff --git a/mandriva/2010.2/dependencies/mandriva-kde3-config/ooo-icons.tar.bz2 b/mandriva/2010.2/dependencies/mandriva-kde3-config/ooo-icons.tar.bz2
new file mode 100644
index 000000000..b58f085ce
--- /dev/null
+++ b/mandriva/2010.2/dependencies/mandriva-kde3-config/ooo-icons.tar.bz2
diff --git a/mandriva/2010.2/dependencies/mandriva-kde3-config/opendocument-mime.tar.bz2 b/mandriva/2010.2/dependencies/mandriva-kde3-config/opendocument-mime.tar.bz2
new file mode 100644
index 000000000..8bac1f5de
--- /dev/null
+++ b/mandriva/2010.2/dependencies/mandriva-kde3-config/opendocument-mime.tar.bz2
diff --git a/mandriva/2010.2/dependencies/pinentry/0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch b/mandriva/2010.2/dependencies/pinentry/0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch
new file mode 100644
index 000000000..353759bce
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch
@@ -0,0 +1,33 @@
+From 977d49018cebcc37d0b667713ad422f80ba9c8d2 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Fri, 16 Apr 2010 16:17:04 +0200
+Subject: [PATCH] Fix pinentry-gtk-2 SIGSEGV when unfocusing with -g argument
+
+gdk_window_set_transient_for cannot be used with parent = NULL to
+unset transient hint (unlike gtk_ version which can). Replacement
+code is taken from gtk_window_transient_parent_unrealized
+
+Applied cleanly at least over 0.8.0 and 0.7.6
+
+More info see: https://bugzilla.redhat.com/show_bug.cgi?id=520236
+---
+ gtk+-2/pinentry-gtk-2.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
+index 7cd7616..fdd5822 100644
+--- a/gtk+-2/pinentry-gtk-2.c
++++ b/gtk+-2/pinentry-gtk-2.c
+@@ -145,7 +145,8 @@ ungrab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
+ {
+   gdk_keyboard_ungrab (gdk_event_get_time (event));
+   /* Unmake window transient for the root window.  */
+-  gdk_window_set_transient_for (win->window, NULL);
++  gdk_property_delete (win->window,
++                       gdk_atom_intern_static_string ("WM_TRANSIENT_FOR"));
+ }
+ 
+ 
+-- 
+1.6.6.1
+
diff --git a/mandriva/2010.2/dependencies/pinentry/0002-Fix-sigabrt-on-fail-grab-r229.patch b/mandriva/2010.2/dependencies/pinentry/0002-Fix-sigabrt-on-fail-grab-r229.patch
new file mode 100644
index 000000000..6162ba583
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/0002-Fix-sigabrt-on-fail-grab-r229.patch
@@ -0,0 +1,35 @@
+Index: gtk+-2/pinentry-gtk-2.c
+===================================================================
+--- gtk+-2/pinentry-gtk-2.c (revision 228)
++++ gtk+-2/pinentry-gtk-2.c (revision 229)
+@@ -52,6 +52,7 @@
+ #endif
+ 
+ static pinentry_t pinentry;
++static int grab_failed;
+ static int passphrase_ok;
+ typedef enum { CONFIRM_CANCEL, CONFIRM_OK, CONFIRM_NOTOK } confirm_value_t;
+ static confirm_value_t confirm_value;
+@@ -135,7 +136,11 @@
+     return;
+ 
+   if (gdk_keyboard_grab (win->window, FALSE, gdk_event_get_time (event)))
+-    g_error ("could not grab keyboard");
++    {
++      g_critical ("could not grab keyboard");
++      grab_failed = 1;
++      gtk_main_quit ();
++    }
+ }
+ 
+ 
+@@ -520,7 +525,7 @@
+   while (gtk_events_pending ())
+     gtk_main_iteration ();
+ 
+-  if (confirm_value == CONFIRM_CANCEL)
++  if (confirm_value == CONFIRM_CANCEL || grab_failed)
+     pe->canceled = 1;
+ 
+   pinentry = NULL;
+
diff --git a/mandriva/2010.2/dependencies/pinentry/0003-pinentry-gtk-x11-race.patch b/mandriva/2010.2/dependencies/pinentry/0003-pinentry-gtk-x11-race.patch
new file mode 100644
index 000000000..86bca6ae9
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/0003-pinentry-gtk-x11-race.patch
@@ -0,0 +1,17 @@
+Index: gtk+-2/pinentry-gtk-2.c
+===================================================================
+--- gtk+-2/pinentry-gtk-2.c
++++ gtk+-2/pinentry-gtk-2.c	2010-05-13 08:17:10.000000000 +0200
+@@ -306,8 +306,11 @@
+ 	g_signal_connect (G_OBJECT (win),
+ 			  "realize", G_CALLBACK (make_transient), NULL);
+ 
++      //we need to grab the keyboard when its visible! not when its mapped (there is a difference)
++      g_object_set(G_OBJECT(win), "events", GDK_VISIBILITY_NOTIFY_MASK | GDK_STRUCTURE_MASK, NULL);
++
+       g_signal_connect (G_OBJECT (win),
+-			pinentry->grab ? "map-event" : "focus-in-event",
++            pinentry->grab ? "visibility-notify-event" : "focus-in-event",
+ 			G_CALLBACK (grab_keyboard), NULL);
+       g_signal_connect (G_OBJECT (win),
+ 			pinentry->grab ? "unmap-event" : "focus-out-event",
diff --git a/mandriva/2010.2/dependencies/pinentry/0004-Fix-qt4-pinentry-window-created-in-the-background.patch b/mandriva/2010.2/dependencies/pinentry/0004-Fix-qt4-pinentry-window-created-in-the-background.patch
new file mode 100644
index 000000000..81bfa0f3d
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/0004-Fix-qt4-pinentry-window-created-in-the-background.patch
@@ -0,0 +1,26 @@
+From 0cc3dd71213687ccb5ec0a1866864558bf03260b Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky@redhat.com>
+Date: Fri, 7 May 2010 14:45:44 +0200
+Subject: [PATCH] Fix qt4 pinentry window created in the background
+
+This is probably just a workaround. Proper fix is being investigated.
+---
+ qt4/pinentrydialog.cpp |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp
+index 8644136..6064ab9 100644
+--- a/qt4/pinentrydialog.cpp
++++ b/qt4/pinentrydialog.cpp
+@@ -63,7 +63,6 @@ void raiseWindow( QWidget* w )
+     SetForegroundWindowEx( w->winId() );
+ #endif
+     w->raise();
+-    w->activateWindow();
+ }
+ 
+ QPixmap icon( QStyle::StandardPixmap which )
+-- 
+1.6.6.1
+
+
diff --git a/mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gz b/mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gz
new file mode 100644
index 000000000..3e24fda74
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gz
diff --git a/mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gz.sig b/mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gz.sig
new file mode 100644
index 000000000..983b32057
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/pinentry-0.8.0.tar.gz.sig
diff --git a/mandriva/2010.2/dependencies/pinentry/pinentry-wrapper b/mandriva/2010.2/dependencies/pinentry/pinentry-wrapper
new file mode 100644
index 000000000..2d63a8744
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/pinentry-wrapper
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 Fedora Project
+# This file and all modifications and additions to the pristine
+# package are under the same license as the package itself.
+#
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+# Anna Bernathova <anicka@novell.com> 2006
+# Pavel Nemec <pnemec@novell.com> 2006
+# Rex Dieter <rdieter@fedoraproject.org> 2009
+#
+# use proper binary (pinentry-qt, pinentry-gtk-2 or pinentry-curses) 
+
+if [ -z "$PINENTRY_BINARY" ]; then
+
+kde_running=
+if [ -n "$KDE_FULL_SESSION" ]; then
+    kde_running=1
+elif [ -n "$DISPLAY" ]; then
+    xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
+    if test $? -eq 0; then
+        kde_running=1
+    fi
+else
+    arg=
+    display=
+    for opt in "$@"; do
+        if [ "$opt" = "--display" ]; then
+            arg=1
+        elif [ -n "$arg" ]; then
+            display="$opt"
+        else
+            arg=
+        fi
+    done
+    if [ -n "$display" ]; then
+        DISPLAY="$display" xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
+        if test $? -eq 0; then
+            kde_running=1
+        fi
+    fi
+fi
+
+# if KDE is detected and pinentry-qt exists, use pinentry-qt
+if [ -n "$kde_running" -a -x /usr/bin/pinentry-qt4 ]
+then
+    export PINENTRY_BINARY="/usr/bin/pinentry-qt4"
+# otherwise test if pinentry-gtk-2 is installed
+elif [ -x /usr/bin/pinentry-gtk-2 ] 
+then
+    export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2"
+# otherwise test if pinentry-qt4 is installed
+elif [ -x /usr/bin/pinentry-qt ]
+then
+        export PINENTRY_BINARY="/usr/bin/pinentry-qt"
+# otherwise test if pinentry-qt exists although KDE is not detected
+elif [ -x /usr/bin/pinentry-qt4 ]
+then
+    export PINENTRY_BINARY="/usr/bin/pinentry-qt4"
+# pinentry-curses is installed by default 
+else
+    export PINENTRY_BINARY="/usr/bin/pinentry-curses"
+        
+fi
+fi
+
+exec $PINENTRY_BINARY "$@"
+
diff --git a/mandriva/2010.2/dependencies/pinentry/pinentry.spec b/mandriva/2010.2/dependencies/pinentry/pinentry.spec
new file mode 100644
index 000000000..0fff9919d
--- /dev/null
+++ b/mandriva/2010.2/dependencies/pinentry/pinentry.spec
@@ -0,0 +1,310 @@
+Name: pinentry
+Version: 0.8.0
+Release: %mkrel 7
+Summary: Collection of simple PIN or passphrase entry dialogs
+Source0: ftp://ftp.gnupg.org/gcrypt/%{name}/%{name}-%{version}.tar.gz
+Source1: %{SOURCE0}.sig
+Source2: pinentry-wrapper
+Patch0:  0001-Fix-pinentry-gtk-2-SIGSEGV-when-unfocusing-with-g-ar.patch
+Patch1:  0002-Fix-sigabrt-on-fail-grab-r229.patch
+Patch2:  0003-pinentry-gtk-x11-race.patch  
+Patch3:  0004-Fix-qt4-pinentry-window-created-in-the-background.patch
+License: GPLv2+
+Group: System/Kernel and hardware
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+URL: http://www.gnupg.org/
+Requires(post): info-install
+Requires(preun):info-install
+BuildRequires: libgtk+2.0-devel
+BuildRequires: libcap-devel
+BuildRequires: ncurses-devel
+BuildRequires: qt4-devel
+BuildRequires: gettext-devel
+Obsoletes:     %name-curses < 0.8.0-2
+
+%description 
+%{name} is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project.
+
+%pre
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-curses ||:
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-gtk ||:
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt ||:
+%{_sbindir}/update-alternatives --remove pinentry %{_bindir}/pinentry-qt4 ||:
+
+%files 
+%defattr(-,root,root)
+%doc README TODO ChangeLog NEWS AUTHORS THANKS
+%{_bindir}/pinentry
+%{_bindir}/pinentry-curses
+%{_infodir}/*.info*
+
+#-----------------------------------------------------------------------------------------
+
+%package gtk2
+Summary: GTK+ interface of pinentry
+Group: System/Kernel and hardware
+Provides: %{name}-gui = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Obsoletes: pinentry-gtk
+
+%description gtk2
+%{name} is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project.
+
+This package provides GTK+ interface of the dialog.
+
+%files gtk2
+%defattr(-,root,root)
+%_bindir/pinentry-gtk-2
+
+#-----------------------------------------------------------------------------------------
+
+%package qt4
+Summary: QT4 interface of pinentry
+Group: System/Kernel and hardware
+Provides: %{name}-gui = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Obsoletes: %name-qt < 0.7.6-3
+
+%description qt4
+%{name} is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project.
+
+This package provides QT4 interface of the dialog.
+
+%files qt4
+%defattr(-,root,root)
+%{_bindir}/pinentry-qt*
+
+
+#-----------------------------------------------------------------------------------------
+%package qt3
+Summary: QT3 interface of pinentry
+Group: System/Kernel and hardware
+Provides: %{name} = %{version}-%{release}
+Provides: %{name}-qt = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+BuildRequires: qt3-devel
+
+%description qt3
+%{name} is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project.
+
+This package provides QT3 interface of the dialog.
+
+%post qt3
+update-alternatives --install /usr/bin/pinentry pinentry /usr/bin/pinentry-qt 1
+ --slave /usr/bin/pinentry-qt pinentry-qt /usr/bin/pinentry-qt
+
+%postun qt3
+if [ "$1" = "0" ]; then
+   update-alternatives --remove pinentry /usr/bin/pinentry-qt3
+fi
+
+%files qt3
+%defattr(-,root,root)
+%{_bindir}/pinentry-qt
+
+#-----------------------------------------------------------------------------------------
+
+%prep
+%setup -q 
+%patch0 -p1
+%patch1 -p0
+%patch2 -p0
+%patch3 -p1
+
+%build
+./autogen.sh
+
+%configure2_5x \
+	--disable-pinentry-gtk \
+        --enable-pinentry-qt \
+        --with-qt-dir=%qt3dir \
+	--enable-pinentry-qt4 \
+	--enable-pinentry-gtk2 \
+    --with-qt4-dir=%qt4dir \
+	--disable-rpath
+
+%make
+%install
+rm -rf %{buildroot}
+%makeinstall_std
+
+#Remove link we will use update alternative
+rm -f %{buildroot}%{_bindir}/pinentry
+
+install -p -m755 -D %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/pinentry 
+
+pushd $RPM_BUILD_ROOT%{_bindir}
+#ln -s pinentry-qt4 pinentry-qt
+popd
+
+%clean
+rm -rf %{buildroot}
+
+
+
+
+%changelog
+* Mon Jul 28 2011 Tim Williams <tim@my-place.org.uk> 0.8.0-7mdv2010.2
++ Rebuild for Trinity repo
+
+* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 0.8.0-6mdv2010.1
++ Restore qt3 package due to KDE3 sanity...
+
+* Thu May 13 2010 Nicolas Lécureuil <nlecureuil@mandriva.com> 0.8.0-5mdv2010.1
++ Revision: 544667
+- Add fedora patches fixing segfault in the gtk pinentry
+- Fix pinentry-qt4 showing in background
+
+* Wed Mar 31 2010 Nicolas Lécureuil <nlecureuil@mandriva.com> 0.8.0-3mdv2010.1
++ Revision: 530268
+- Add a symlink for pinentry-qt ( Bug #58457 )
+- Remove qt3 support
+
+* Fri Mar 05 2010 Nicolas Lécureuil <nlecureuil@mandriva.com> 0.8.0-2mdv2010.1
++ Revision: 514581
+- Use patch from fedora to handle no display settings (Bug #46841 )
+  Add a pinentry-gui provide to qt4 qt and gtk2 subpackages
+
+* Wed Mar 03 2010 Frederik Himpe <fhimpe@mandriva.org> 0.8.0-1mdv2010.1
++ Revision: 513991
+- Update to new version 0.8.0
+- Remove patch to build with QT 4.5: integrated upstream
+
+* Thu Sep 17 2009 Nicolas Lécureuil <nlecureuil@mandriva.com> 0.7.6-3mdv2010.0
++ Revision: 444182
+- Obsolete qt3 packages
+
+* Tue Sep 15 2009 Helio Chissini de Castro <helio@mandriva.com> 0.7.6-2mdv2010.0
++ Revision: 443111
+- Make teuf happy. ( And obsoletes pinentry-qt )
+
+* Tue Jul 14 2009 Frederik Himpe <fhimpe@mandriva.org> 0.7.6-1mdv2010.0
++ Revision: 395922
+- Update to new version 0.7.6
+- Remove patches integrated upstream
+- Add moc patch to fix build with QT 4.5
+
+* Thu Mar 26 2009 Frederic Crozat <fcrozat@mandriva.com> 0.7.5-7mdv2009.1
++ Revision: 361357
+- Add missing buildrequires on gettext-devel
+
+  + Helio Chissini de Castro <helio@mandriva.com>
+    - Restore qt3 package due t kde3 insanity...
+    - Fixed last bit of curses fallback on pinentry-qt4 dialog
+    - Make qt4 pinentry dialog automake complaint, avoiding duplicate os secdring code and allowing to fallback on curses
+      if no display is available, like their counterparts.
+
+* Wed Jan 07 2009 Helio Chissini de Castro <helio@mandriva.com> 0.7.5-4mdv2009.1
++ Revision: 326682
+- We should made old binary names available in case user decided put the explicit binary name in their gpg.conf,
+  pointing to pinentry-qt and pinentry-gtk instead of have it clean allowing gpg-agent programs like use the
+  standard /usr/bin/pinentry ( which is handled by alternatives in Mandriva ).
+  Since new packages obsolete old ones, is possible to add a slave for the alternatives rule linking old names, solving the upgrade path issue.
+
+* Mon Jan 05 2009 Helio Chissini de Castro <helio@mandriva.com> 0.7.5-3mdv2009.1
++ Revision: 325155
+- Rediff gtk transient patch
+- Disable qt3 vuild
+- Added pinentry qt4 from kde playground svn. Dialog ui need some love.
+- Move name gtk to gtk2 and obsolete old pinentry-gtk ( was gtk2 already )
+- qt4 package obsoletes old pinentry-qt
+
+* Mon Jul 07 2008 Oden Eriksson <oeriksson@mandriva.com> 0.7.5-2mdv2009.0
++ Revision: 232371
+- rebuilt against new libcap
+
+* Mon Mar 17 2008 Olivier Blin <oblin@mandriva.com> 0.7.5-1mdv2008.1
++ Revision: 188312
+- do not remove alternatives in postun if the package is not removed
+- move pinentry-curses in a new pinentry-curses package to make
+  pinentry a virtual package (so that qt/gtk versions can be selected
+  when pinentry is required)
+- realize the window as transient if keyboard is grabbed (from upstream SVN)
+- fix keyboard grab (from Gentoo)
+- fix build with latest glib that broke g_malloc API (from upstream ML)
+- restore BuildRoot
+
+  + Tomasz Pawel Gajc <tpg@mandriva.org>
+    - drop not applied patch
+    - set buildrequires on libcap-devel
+    - new version
+    - new license policy
+
+  + Thierry Vignaud <tv@mandriva.org>
+    - kill re-definition of %%buildroot on Pixel's request
+
+* Tue Dec 11 2007 Guillaume Rousse <guillomovitch@mandriva.org> 0.7.4-1mdv2008.1
++ Revision: 117509
+- new version
+
+* Mon Sep 10 2007 Per Øyvind Karlsen <peroyvind@mandriva.org> 0.7.3-2mdv2008.0
++ Revision: 84038
+- fix broken info entry (P0, should fix #32534)
+- $QTLIB is already set by /etc/profile.d/qt3.sh, so don't set it in spec
+
+* Thu Jul 26 2007 Tomasz Pawel Gajc <tpg@mandriva.org> 0.7.3-1mdv2008.0
++ Revision: 55628
+- correct configure options
+- nuke rpath
+- update to the latest version
+- Import pinentry
+
+
+
+* Mon Sep 18 2006 Gwenole Beauchesne <gbeauchesne@mandriva.com> 0.7.2-6mdv2007.0
+- Rebuild
+
+* Fri Jul 28 2006 Laurent MONTEL <lmontel@mandriva.com> 0.7.2-5
+- Add patch to disable gtk-1.2 support
+
+* Mon Jun 19 2006 Laurent MONTEL <lmontel@mandriva.com> 0.7.2-4
+- Add patch from Raphaël Gertz to use update-alternative 
+
+* Fri Feb 24 2006 Nicolas Lécureuil <neoclust@mandriva.org> 0.7.2-3mdk
+- Add Requires(post|preun): fix ticket #17416
+- use mkrel
+
+* Sat May 28 2005 Christiaan Welvaart <cjw@daneel.dyndns.org> 0.7.2-2mdk
+- add BuildRequires: libgtk+2.0-devel
+
+* Tue May 17 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.2-1mdk
+- 0.7.2
+
+* Mon Mar 14 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 0.7.1-4mdk
+- fix build on lib64 platforms
+
+* Tue Mar 08 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.7.1-3mdk
+- Rebuild
+
+* Sat Jun 19 2004 Abel Cheung <deaddog@deaddog.org> 0.7.1-2mdk
+- Rebuild with new gcc
+
+* Thu May 20 2004 Abel Cheung <deaddog@deaddog.org> 0.7.1-1mdk
+- New version
+- Don't build against libcap
+
+* Sat Jan 24 2004 Abel Cheung <deaddog@deaddog.org> 0.7.0-1mdk
+- New version
+- Enable all interfaces
+
+* Fri Nov 14 2003 Florin <florin@mandrakesoft.com> 0.6.9-2mdk
+- rebuild
+
+* Wed Apr 30 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.9-1mdk
+- Update version
+
+* Tue Feb 18 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.8-1mdk
+- Update and fix spec file thanks to <fabrice-marie-sec@ifrance.com>
+
+* Tue Jan 28 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.6-2mdk
+- Fix link as report Jason Straight <jason@JeetKuneDoMaster.net>
+
+* Wed Dec 11 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.6-1mdk
+- update spec file from Fabrice MARIE <fabrice-marie-sec@ifrance.com>
+
+* Sat Oct 19 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.5-1mdk
+- Initial package
diff --git a/mandriva/2010.2/dependencies/resmgr/desktopdev b/mandriva/2010.2/dependencies/resmgr/desktopdev
new file mode 100644
index 000000000..3a66e2cf8
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/desktopdev
@@ -0,0 +1,17 @@
+#!/bin/bash
+# This adds a USB device to the "desktop usb" group.
+# You just need to create an entry "desktopdev ..." in a usermap file
+# and it will be picked up automatically.
+
+# Mandriva uses udev, you don't have to create a usermap
+# If you want this script to be called, you have to create an udev
+# rule in /etc/udev/rules.d/ that starts it, using
+# RUN+="/etc/udev/agents.d/usb/desktopdev"
+
+if [ -x /sbin/resmgr ]; then
+	if [ "${ACTION}" = "add" ]; then
+		/sbin/resmgr ${ACTION} ${DEVICE} desktop usb && exit 0
+	else
+		/sbin/resmgr ${ACTION} ${DEVICE} desktop && exit 0
+	fi
+fi
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-1.0-syslog.patch b/mandriva/2010.2/dependencies/resmgr/resmgr-1.0-syslog.patch
new file mode 100644
index 000000000..5ad0a4971
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr-1.0-syslog.patch
@@ -0,0 +1,10 @@
+--- resmgr-1.0/pam_resmgr.c   2003-03-05 14:32:19.000000000 +0100
++++ resmgr-1.0.patched/pam_resmgr.c 2006-07-26 02:22:59.000000000 +0200
+@@ -9,6 +9,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <ctype.h>
++#include <syslog.h>
+ 
+ #include <security/pam_modules.h>
+ #include "protocol.h"
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-1.0.tar.bz2 b/mandriva/2010.2/dependencies/resmgr/resmgr-1.0.tar.bz2
new file mode 100644
index 000000000..a064ace5d
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr-1.0.tar.bz2
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-glibc28.diff b/mandriva/2010.2/dependencies/resmgr/resmgr-glibc28.diff
new file mode 100644
index 000000000..96bb34c2b
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr-glibc28.diff
@@ -0,0 +1,10 @@
+--- class.c	2002-11-11 05:31:46.000000000 -0500
++++ class.c.oden	2008-07-18 07:26:19.000000000 -0400
+@@ -11,6 +11,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include "resmgrd.h"
+ 
+ res_class_t *		res_classes;
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff b/mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff
new file mode 100644
index 000000000..6cf062d51
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr-linkage_fix.diff
@@ -0,0 +1,33 @@
+--- Makefile	2003-04-10 10:21:01.000000000 +0200
++++ Makefile.oden	2008-07-18 21:41:19.000000000 +0200
+@@ -23,6 +23,8 @@
+ LIBBASE	= libresmgr.so
+ LIB	= $(LIBBASE).$(VERSION)
+ LIBOBJS	= $(addprefix .lobjs/,conn.o client.o glob.o)
++LDFLAGS	= 
++PAMLIBS	= -lpam
+ 
+ ALL	= $(SRV) $(CLT) $(LIB) $(PAM) tester
+ 
+@@ -46,17 +48,17 @@
+ 	rm -rf $(ALL) $(LIBBASE) .objs .lobjs
+ 
+ $(SRV):	$(SRVOBJS) $(LIB)
+-	$(CC) -o $@ $(SRVOBJS) -L. -lresmgr
++	$(CC) $(LDFLAGS) -o $@ $(SRVOBJS) -L. -lresmgr
+ 
+ $(CLT):	$(CLTOBJS) $(LIB)
+-	$(CC) -o $@ $(CLTOBJS) -L. -lresmgr
++	$(CC) $(LDFLAGS) -o $@ $(CLTOBJS) -L. -lresmgr
+ 
+ $(LIB): $(LIBOBJS)
+-	$(CC) -shared -Wl,-soname,$(notdir $(LIB)) -o $@ $(LIBOBJS)
++	$(CC) -shared -Wl,-soname,$(notdir $(LIB)) $(LDFLAGS) -o $@ $(LIBOBJS) 
+ 	ln -sf $(LIB) $(LIBBASE)
+ 
+ $(PAM): $(PAMOBJS) $(LIB)
+-	$(CC) -shared -o $@ $(PAMOBJS) -L. -lresmgr
++	$(CC) -shared $(LDFLAGS) -o $@ $(PAMOBJS) $(PAMLIBS) -L. -lresmgr 
+ 
+ tester: .objs/tester.o $(LIB)
+ 	$(CC) -o $@ .objs/tester.o -L. -lresmgr
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-permission_fix.diff b/mandriva/2010.2/dependencies/resmgr/resmgr-permission_fix.diff
new file mode 100644
index 000000000..8f409cf39
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr-permission_fix.diff
@@ -0,0 +1,23 @@
+--- Makefile	2008-07-18 21:48:27.000000000 +0200
++++ Makefile.oden	2008-07-18 21:49:27.000000000 +0200
+@@ -33,15 +33,15 @@
+ install: $(ALL)
+ 	mkdir -p $(SBINDIR) $(LIBDIR) $(MANDIR)/man{1,3,5,8} \
+ 		$(ETCDIR) $(PAMDIR) $(INCDIR)
+-	install -m 555 $(LIB) $(LIBDIR)
+-	install -m 555 $(PAM) $(PAMDIR)
++	install -m 755 $(LIB) $(LIBDIR)
++	install -m 755 $(PAM) $(PAMDIR)
+ 	if [ ! -f $(ETCDIR)/resmgr.conf ]; then \
+ 		install -m 644 etc/resmgr.conf $(ETCDIR); \
+ 	fi
+-	install -m 444 resmgr.h $(INCDIR)
+-	install -m 555 -s $(CLT) $(SRV) $(SBINDIR)
++	install -m 644 resmgr.h $(INCDIR)
++	install -m 755 -s $(CLT) $(SRV) $(SBINDIR)
+ 	for x in 1 3 5 8; do \
+-		install -m 444 doc/*.$$x $(MANDIR)/man$$x; \
++		install -m 644 doc/*.$$x $(MANDIR)/man$$x; \
+ 	done
+ 
+ clean distclean:
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr-va_list.patch b/mandriva/2010.2/dependencies/resmgr/resmgr-va_list.patch
new file mode 100644
index 000000000..4c45e8b86
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr-va_list.patch
@@ -0,0 +1,12 @@
+diff -ur resmgr-1.0.orig/utils.c resmgr-1.0/utils.c
+--- resmgr-1.0.orig/utils.c	2003-03-05 14:32:19.000000000 +0100
++++ resmgr-1.0/utils.c	2005-03-16 11:47:58.000000000 +0100
+@@ -101,7 +101,7 @@
+ 	sprintf(buffer, "%03d ", code);
+ 	n = strlen(buffer);
+ 	vsnprintf(buffer+n, sizeof(buffer)-n, fmt, ap);
+-	vlog(LOG_INFO, "%s", buffer);
++	def_log("%s", buffer);
+ 	va_end(ap);
+ }
+ 
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr.conf b/mandriva/2010.2/dependencies/resmgr/resmgr.conf
new file mode 100644
index 000000000..a6294c709
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr.conf
@@ -0,0 +1,69 @@
+# This is the default set of devices people logged in on the desktop get
+# access to:
+class desktop
+#
+# Standard multimedia devices
+add /dev/audio		desktop
+add /dev/mixer		desktop
+add /dev/dsp		desktop
+add /dev/sequencer	desktop
+add /dev/video		desktop
+#
+# Modem device
+add /dev/modem         desktop
+#
+# CD-ROMs - giving permission to open the corresponding SCSI
+# device is highly useful for CD writers such as cdrecord.
+add /dev/cdrom		desktop scsi paride
+add /dev/cdrom1		desktop scsi paride
+add /dev/cdrecorder	desktop scsi
+add /dev/dvd		desktop scsi paride
+add /dev/dvd1		desktop scsi paride
+add /dev/sr0		desktop scsi
+add /dev/sr1		desktop scsi
+add /dev/sr2		desktop scsi
+add /dev/sr3		desktop scsi
+#
+# Dito for SCSI scanners, which all use /dev/scanner symlink.
+add /dev/scanner	desktop scsi
+#
+# And USB scanners.
+add /dev/usbscanner    desktop
+add /dev/usb/scanner   desktop
+add /dev/usb/scanner0  desktop
+add /dev/usb/scanner1  desktop
+add /dev/usb/scanner2  desktop
+add /dev/usb/scanner3  desktop
+add /dev/usb/scanner4  desktop
+add /dev/usb/scanner5  desktop
+add /dev/usb/scanner6  desktop
+add /dev/usb/scanner7  desktop
+#
+# make /dev/console accessible read-only
+add /dev/console   desktop read-only
+
+#
+# This rule grants access to users logged in locally
+#
+allow desktop          tty=/dev/tty[1-9]* || tty=tty[1-9]* || tty=:0
+
+# For serial gphoto cameras.
+# add /dev/ttyS0 desktop
+# add /dev/ttyS1 desktop
+#
+# Sample rules, do not enable by default:
+#
+# This rule denies access to users uucp and news
+#
+# deny  desktop		user=uucp || user=news
+#
+# This rule gives access to all members of group wheel
+#
+# allow	desktop		group=wheel
+# 
+# To make resmgr work with ssh, for instance, add the following
+# line to /etc/pam.d/ssh:
+# 	session    optional   pam_resmgr.so fake_ttyname
+# When a user logs in, a resmgr session will be opened, and
+# access will be granted automaticially to all resource classes
+# matched via access control statements in resmgr.conf.
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr.init b/mandriva/2010.2/dependencies/resmgr/resmgr.init
new file mode 100644
index 000000000..815931a09
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr.init
@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+# chkconfig: 2345 15 15
+# description: The resource manager is a framework to give user applications
+# access to certain device files. The resource manager daemon can be configured
+# to give certain users access to different resource classes.
+# processname: resmgr
+# pidfile: /var/run/resmgr.pid
+#
+### BEGIN INIT INFO
+# Provides: resmgr
+# Default-Start: 2 3 4 5
+# Short-Description:  A program to allow arbitrary access to device files
+# Description: The resource manager is a framework to give user applications \
+# access to certain device files. The resource manager daemon can be configured \
+# to give certain users access to different resource classes.
+### END INIT INFO
+
+# source function library
+. /etc/rc.d/init.d/functions
+
+RETVAL=0
+
+RESMGR_BIN=/sbin/resmgrd
+
+case "$1" in
+    start)
+    	gprintf "Starting resource manager services: "
+      daemon $RESMGR_BIN
+      RETVAL=$?
+      echo
+      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/resmgr
+      ;;
+    stop)
+      gprintf "Shutting down resmgr services: "
+      killproc resmgr
+      RETVAL=$?
+
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/resmgr
+	;;
+  restart|reload)
+	$0 stop
+	$0 start
+	RETVAL=$?
+	;;
+  status)
+	status resmgr
+	RETVAL=$?
+	;;
+  *)
+	gprintf "Usage: resmgr {start|stop|status|restart|reload}\n"
+	exit 1
+esac
+
+exit $RETVAL
diff --git a/mandriva/2010.2/dependencies/resmgr/resmgr.spec b/mandriva/2010.2/dependencies/resmgr/resmgr.spec
new file mode 100644
index 000000000..a657321dc
--- /dev/null
+++ b/mandriva/2010.2/dependencies/resmgr/resmgr.spec
@@ -0,0 +1,212 @@
+%define	major 1
+%define	libname %mklibname %{name} %{major}
+%define develname %mklibname %{name} -d
+
+Summary:	A program to allow arbitrary access to device files
+Name:		resmgr
+Version:	1.0
+Release:	%mkrel 14
+License:	GPLv2
+Group:		System/Servers
+URL: 		http://www.lst.de/~okir/resmgr/
+Source:		ftp://ftp.lst.de/pub/people/okir/%{name}/%{name}-%{version}.tar.bz2
+Source1:	resmgr.init
+Source2:	resmgr.conf
+Source3:	desktopdev
+Patch0: 	resmgr-1.0-syslog.patch 
+Patch1: 	resmgr-va_list.patch
+Patch2: 	resmgr-glibc28.diff
+Patch3: 	resmgr-linkage_fix.diff
+Patch4: 	resmgr-permission_fix.diff
+Requires(post): rpm-helper
+Requires(preun): rpm-helper
+BuildRequires:	pam-devel
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+%description
+The resource manager is a framework to give user applications access
+to certain device files. The resource manager daemon can be configured
+to give certain users access to different resource classes.
+
+It supports hotplugging devices (i.e. new devices can be added to
+and removed from resource classes at run time), and it provides
+transparent access to the raw SCSI device corresponding to
+a CD writer or a scanner.
+
+%package -n	%{libname}
+Summary:	Shared libraries for %{name}
+Group:		System/Libraries
+
+%description -n	%{libname}
+The resource manager is a framework to give user applications access
+to certain device files. The resource manager daemon can be configured
+to give certain users access to different resource classes.
+
+It supports hotplugging devices (i.e. new devices can be added to
+and removed from resource classes at run time), and it provides
+transparent access to the raw SCSI device corresponding to
+a CD writer or a scanner.
+
+%package -n	%{develname}
+Summary:	Development headers and libraries for %{name}
+Group:		Development/C
+Requires:	%{libname} = %{version}
+Provides:	lib%{name}-devel = %{version}-%{release}
+Provides:	%{name}-devel = %{version}-%{release}
+Obsoletes:	%{mklibname resmgr 1 -d}
+
+%description -n	%{develname}
+The resource manager is a framework to give user applications access
+to certain device files. The resource manager daemon can be configured
+to give certain users access to different resource classes.
+
+It supports hotplugging devices (i.e. new devices can be added to
+and removed from resource classes at run time), and it provides
+transparent access to the raw SCSI device corresponding to
+a CD writer or a scanner.
+
+%prep
+
+%setup -q
+%patch0 -p1 -b .syslog
+%patch1 -p1 -b .va_list
+%patch2 -p0 -b .glibc28
+%patch3 -p0 -b .linkage_fix
+%patch4 -p0 -b .permission_fix
+
+%build
+%make CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{ldflags}"
+
+%install
+rm -rf %{buildroot}
+
+%makeinstall_std LIBDIR=%{buildroot}/%{_lib} PAMDIR=%{buildroot}/%{_lib}/security
+
+ln -sf libresmgr.so.* %{buildroot}/%{_lib}/libresmgr.so
+install -m755 %{SOURCE1} -D %{buildroot}%{_initrddir}/%{name}
+mkdir -p %{buildroot}/usr/sbin/
+ln -s ../..%{_initrddir}/%{name} %{buildroot}%{_sbindir}/rc%{name}
+# install config file
+install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}.conf
+install -c -m755 %{SOURCE3} -D %{buildroot}%{_sysconfdir}/udev/agents.d/usb/desktopdev
+
+%post
+%_post_service %{name}
+
+%preun
+%_preun_service %{name}
+
+%if %mdkversion < 200900
+%post -n %{libname} -p /sbin/ldconfig
+%endif
+
+%if %mdkversion < 200900
+%postun -n %{libname} -p /sbin/ldconfig
+%endif
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%doc README TODO ANNOUNCE
+%config(noreplace) %{_sysconfdir}/%{name}.conf
+%{_initrddir}/%{name}
+%{_sysconfdir}/udev/agents.d/usb/desktopdev
+%{_sbindir}/rc%{name}
+/sbin/%{name}
+/sbin/%{name}d
+%{_mandir}/man*/*
+
+%files -n %{libname}
+%defattr(-,root,root)
+/%{_lib}/*.so.*
+/%{_lib}/security/*
+
+%files -n %{develname}
+%defattr(-,root,root)
+/%{_lib}/*.so
+%{_includedir}/%{name}.h
+
+
+%changelog
+* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 1.0-14mdv2010.2
++ Rebuild for Trinity
+
+* Thu Sep 03 2009 Christophe Fergeau <cfergeau@mandriva.com> 1.0-13mdv2010.0
++ Revision: 426907
+- rebuild
+
+* Mon Dec 22 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-12mdv2009.1
++ Revision: 317576
+- use %%ldflags
+
+* Fri Jul 18 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-11mdv2009.0
++ Revision: 238350
+- fix linkage
+- fix errors in the init script
+- fix permissions (for strip + debug packaging)
+
+* Fri Jul 18 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-10mdv2009.0
++ Revision: 238102
+- added P1 from pld
+- fix build, P2 + -D_GNU_SOURCE
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - rebuild
+
+  + Pixel <pixel@mandriva.com>
+    - do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
+
+* Wed Mar 05 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-8mdv2008.1
++ Revision: 179431
+- rebuild
+
+  + Olivier Blin <oblin@mandriva.com>
+    - restore BuildRoot
+
+  + Thierry Vignaud <tvignaud@mandriva.com>
+    - kill re-definition of %%buildroot on Pixel's request
+
+* Wed Aug 01 2007 Adam Williamson <awilliamson@mandriva.org> 1.0-7mdv2008.0
++ Revision: 57363
+- rebuild for 2008
+- new devel policy
+- spec clean
+
+
+* Mon Jul 31 2006 Helio Chissini de Castro <helio@mandriva.com>
++ 2006-07-31 20:51:47 (42877)
+- Increase release number
+
+* Mon Jul 31 2006 Helio Chissini de Castro <helio@mandriva.com>
++ 2006-07-31 20:50:48 (42876)
+- Fix for http://qa.mandriva.com/show_bug.cgi?id=23968 ( wrong init services )
+
+* Wed Jul 26 2006 Helio Chissini de Castro <helio@mandriva.com>
++ 2006-07-26 03:39:04 (42167)
+- Moved to subversion
+- Added patch from Jan Ciger to fix syslog defines
+
+* Wed Jul 26 2006 Helio Chissini de Castro <helio@mandriva.com>
++ 2006-07-26 03:11:36 (42165)
+- import resmgr-1.0-4mdk
+
+* Wed Jan 18 2006 Olivier Blin <oblin@mandriva.com> 1.0-4mdk
+- fix pam files installation on x86_64
+- buildrequire pam-devel
+- drop hotplug requirement
+
+* Sat Aug 27 2005 Olivier Blin <oblin@mandriva.com> 1.0-3mdk
+- move hotplug script to in udev agents.d directory
+- update Source4 to explain how it should be handled with udev
+
+* Sun Jun 12 2005 Per Øyvind Karlsen <pkarlsen@mandriva.com> 1.0-2mdk
+- rebuild
+- fix requires
+- do not mark init file as config file
+- %%{1}mdv2007.0
+
+* Fri May 21 2004 Per Øyvind Karlsen <peroyvind@linux-mandrake.com> 1.0-1mdk
+- initial mdk release (based on suse package)
+