RPM: merge redhat directory with master branch

1 files changed, 2 insertions, 179 deletions

diff --git a/redhat/extras/kdebluetooth/kdebluetooth.spec b/redhat/extras/kdebluetooth/kdebluetooth.spec
index 25b95d31b..48e255d67 100644
--- a/redhat/extras/kdebluetooth/kdebluetooth.spec
+++ b/redhat/extras/kdebluetooth/kdebluetooth.spec
@@ -1,8 +1,3 @@
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
 # TDE 3.5.13 specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -22,7 +17,7 @@
 
 Name:			trinity-kdebluetooth
 Version:		1.0_beta9_r769275
-Release:		2%{?dist}%{?_variant}
+Release:		2%{?dist}
 
 Summary:		The TDE Bluetooth Framework
 
@@ -124,7 +119,7 @@ KDE Bluetooth framework development libraries and headers.
   -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -321,175 +316,3 @@ update-desktop-database %{tde_appdir} 2> /dev/null || :
 
 
 %changelog
-* Sat Sep 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0_beta9_r769275-2
-- Rebuilt for Mageia 2 and Mandriva 2011
-- Drops useless '-libs' package
-- Correctly applies Ubuntu patches
-- Fix support for Bluez4
-
-* Sun Feb 12 2012 Francois Andriot <francois.andriot@free.fr> - 1.0_beta9_r769275-1
-- Initial version for TDE 3.5.13
-- Updates base version to 1.0_beta9_r769275 (taken from Ubuntu Hardy)
-- Fix autotools detection
-
-* Tue Apr  1 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.0-0.41.beta8
-- -devel: Requires: kdelibs3-devel
-
-* Sun Jan  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.40.beta8
-- Fix build with gcc 4.3.
-
-* Sun Dec  9 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.0-0.39.beta8
-- Require kdesu in main package.
-
-* Sun Dec 08 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1.0-0.38.beta8
-- BR: kdelibs3-devel kdepim3-devel
-- drop Requires: kdebase (?)
-
-* Wed Nov 08 2007 Gilboa Davara <gilboad[AT]gmail.com> 1.0-0.37.beta8
-- Missing BR: automake, autoconf.
-
-* Wed Nov 08 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-36.beta8
-- Move BRs to main package to fix mock breakage.
-
-* Wed Nov 07 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-35.beta8
-- Fix multi-lib conflicts (#341731).
-
-* Sat Oct 06 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-34.beta8
-- Beta8. (First official release since beta3)
-- Remove redundant beta3 patches.
-- LANG support by Ville Skytta.
-- Virtual provides: dbus-bluez-pin-helper.
-
-* Sun Aug 26 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-33.beta3
-- Re-Fix the license tag.
-
-* Sun Aug 26 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-32.beta3
-- Fixed license tag.
-- Re-enable PPC64.
-
-* Tue Jul 31 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-31.beta3
-- Fix error in ExcludeArch.
-
-* Tue Jul 31 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-30.beta3
-- ExcludeArch ppc64 (obexftp, again)
-
-* Mon Jul 30 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-29.beta3
-- ExcludeArch ppc/ppc64 (obexftp missing.)
-
-* Sun Jul 15 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-28.beta3
-- Fix %%dist... again...
-
-* Thu Jul 12 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-27.beta3
-- Add missing touch /icon/hicolor.
-- Menu items: Remove only-in-KDE.
-- BR: Remove libutempter-devel.
-- Fix project URL and source URL.
-- Add missing %%dist.
-
-* Sun Jul 08 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-26.beta3
-- Remove the Nokia N70 patch. (Doesn't seem to work.)
-- OBEX Object push fix.
-
-* Sun Jul 08 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-25.beta3
-- Adopted Ville Skyttä b2 patch to b3. (Hopefully) re-enable Nokia N7x obex support.
-- Patch out "Configure services". (Disabled in B3)
-
-* Mon Jun 25 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-24.beta3
-- Added hex encoding patch by Thomas Davis.
-- Removed --enable-irmcsynckonnector (deprecated in b3)
-- Add missing docs. (Removed by mistake in b23)
-- Known issue - services menu doesn't seem to work. (Requires debugging / upstream )
-
-* Tue Jun 12 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0.0-23.beta3
-- Beta3.
-- Remove pin-helper. (No longer needed - beta3 has dbus support.)
-- Added BR dbus-qt.
-- Added BR obexftp-devel.
-- Remove b2 patches.
-
-* Sat May 26 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0-0.22.beta2
-- Use the bluez_pinhelper wrapper instead of modified bluez-utils.
-- Remove %%dist.
-- *rc should not be marked as config.
-- Prevent RPM from owning Network/Peripherals.
-
-* Mon Apr 23 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0-0.21.beta2
-- Patch list clean-up.
-- Add Nokia obex detection patch.
-- Fix 64bit compile due to bad default in configure. (with_bluetooth_dir)
-- Missing BR: libtempter-devel.
-- Missing BT: libidn-devel.
-- Added: kbluepin wrapper - cotde_datadirnfigure kbluepin as the old-style pin helper.
-
-* Wed Apr 04 2007 Gilboa Davara <gilboad[AT]gmail.com> 1-0-0.20.beta2
-- Re-merge Ville Skytta's latest .spec. (Got dropped by mistake)
-- Summery, description clean-up.
-
-* Thu Mar 29 2007 Gilboa Davara <gilboad[AT]gmail.com> 1.0-0.19.beta2
-- Spec file clean-up.
-
-* Fri Oct 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.18.beta2
-- BR: gettext
-- include locales
-
-* Tue Oct 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.17.beta2
-- kdebluetooth-1.0_beta2
-
-* Fri Sep 08 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.16.20060908svn
-- kdebluetoooth-20060908svn
-
-* Thu Jul 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.15.20060621svn
-- put svn at end of Release tag (per packaging guidelines)
-
-* Wed Jun 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.14.svn20060621
-- kdebluetooth-20060621svn, fixes
-	compile error kdebluetooth libkobex obex.h not found (kde bug #94572)
-
-* Tue Jun 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.13.svn20060620
-- kdebluetooth-svn20060620, (re)fixes
-	konqueror bluetooth:/ returns error "Bad URL" (kde bug #123607)
-- --disable-dependency-tracking
-- own %%_datadir/applnk/Settings/Network
-
-* Mon Jun 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.12.svn20060619
-- document svn tarball creation
-- Requires: kdebase (for kcm bits, applnk dir ownership)
-- desktop-file-install --add-only-show-in=KDE
-
-* Mon Jun 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.11.svn20060619
-- kdebluetooth-svn20060619, making most patches obsolete
-
-* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.10.beta1
-- -devel: Requires: qt-devel bluez-libs-devel
-- include libirmcsynckonnector.so in main pkg
-- .desktop: --remove-category=Network --add-category=System
-- remove zero length files
-- fix default hcid start/top command
-
-* Mon Apr 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.0-0.9.beta1
-- konqueror bluetooth:/ returns error "Bad URL" (kde bug #123607)
-
-* Tue Mar 28 2006 Rex Dieter 1.0-0.8.beta1
-- BR: kdepim-devel (for kitchensync)
-- kdebluetooth-1.0_beta1-gcc41.patch
-
-* Thu Mar 23 2006 Rex Dieter 1.0-0.7.beta1
-- cleanup openobex patch
-- fixup .desktop file(s)
-
-* Wed Mar 22 2006 Rex Dieter 1.0-0.6.beta1
-- cleanup for Extras
-- %%post: ldconfig, fdo icon spec
-
-* Mon Mar 06 2006 Rex Dieter 1.0-0.5.beta1
-- respin
-
-* Mon Mar 21 2005 Rex Dieter 1.0-0.3.beta1
-- --enable-irmcsynckonnector
-
-* Mon Mar 21 2005 Rex Dieter 1.0-0.1.beta1
-- 1.0_beta1
-
-* Wed Dec 29 2004 Rex Dieter <rexdieter[AT]users.sf.net> 0.0-0.1.cvs20050110
-- first try
-