RPM: remove some obsoletes extra packages

pull/92/head
François Andriot 5 years ago
parent 4c50b73e0b
commit 411aad4790

@ -1,59 +0,0 @@
#!/usr/bin/python
# -*- coding: UTF-8 -*-
"""
Copyright (C) 2007 Achim Bohnet <allee@kubuntu.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
"""
import sys
from PyQt4 import QtCore, Qt
import dbus
import dbus.mainloop.qt
import distutils.spawn
kbtcmd = [ 'kbluetooth' ]
quitprogs = [ 'kdebluetooth', 'kbluemon', 'kinputwizard' ] # FIXME: quit kbluelock too?
app = Qt.QCoreApplication(sys.argv)
dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
bus = dbus.SystemBus()
try:
manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), 'org.bluez.Manager')
except:
print "Unable to connect to bluez."
sys.exit(1)
if len(manager.ListAdapters()):
print "# of devices at startup:", len(manager.ListAdapters())
distutils.spawn.spawn(kbtcmd)
else:
print "No BT device found"
def slotAdapterAdded(device):
print "bt dev added:", device, "# of devices:", len(manager.ListAdapters())
distutils.spawn.spawn(kbtcmd)
def slotAdapterRemoved(device):
print "bt dev removed:", device, "# num of devices:", len(manager.ListAdapters())
if len(manager.ListAdapters()) == 0:
for p in quitprogs:
print "exiting:", p, " ..."
try:
distutils.spawn.spawn(['dcop', p, 'MainApplication-Interface', 'quit'])
except:
pass
manager.connect_to_signal("AdapterAdded", slotAdapterAdded)
manager.connect_to_signal("AdapterRemoved", slotAdapterRemoved)
print "waiting for bt device (un)plug events ..."
app.exec_()

@ -1,59 +0,0 @@
#!/usr/bin/python
# -*- coding: UTF-8 -*-
"""
Copyright (C) 2007 Achim Bohnet <allee@kubuntu.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
"""
import sys
from PyQt4 import QtCore, Qt
import dbus
import dbus.mainloop.qt
import distutils.spawn
kbtcmd = [ 'kbluetooth' ]
quitprogs = [ 'kdebluetooth', 'kbluemon', 'kinputwizard' ] # FIXME: quit kbluelock too?
app = Qt.QCoreApplication(sys.argv)
dbus.mainloop.qt.DBusQtMainLoop(set_as_default=True)
bus = dbus.SystemBus()
try:
manager = dbus.Interface(bus.get_object('org.bluez', '/'), 'org.bluez.Manager')
except:
print "Unable to connect to bluez."
sys.exit(1)
if len(manager.ListAdapters()):
print "# of devices at startup:", len(manager.ListAdapters())
distutils.spawn.spawn(kbtcmd)
else:
print "No BT device found"
def slotAdapterAdded(device):
print "bt dev added:", device, "# of devices:", len(manager.ListAdapters())
distutils.spawn.spawn(kbtcmd)
def slotAdapterRemoved(device):
print "bt dev removed:", device, "# num of devices:", len(manager.ListAdapters())
if len(manager.ListAdapters()) == 0:
for p in quitprogs:
print "exiting:", p, " ..."
try:
distutils.spawn.spawn(['dcop', p, 'MainApplication-Interface', 'quit'])
except:
pass
manager.connect_to_signal("AdapterAdded", slotAdapterAdded)
manager.connect_to_signal("AdapterRemoved", slotAdapterRemoved)
print "waiting for bt device (un)plug events ..."
app.exec_()

@ -1,42 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Name=KBluetoothD
Name[sv]=Kbluetoothd
Name[ta]=Kபுலுடுத்D
Name[xx]=xxKBluetoothDxx
GenericName=KDE Bluetooth Daemon
GenericName[ar]=مراقب KDE Bluetooth
GenericName[bg]=Демон за Bluetooth в KDE
GenericName[br]=Diaoul KDE Bluetooth
GenericName[bs]=KDE Bluetooth daemon
GenericName[ca]=Dimoni Bluetooth de KDE
GenericName[cs]=Bluetooth démon pro KDE
GenericName[da]=KDE Bluetooth-dæmon
GenericName[de]=KDE Bluetooth-Daemon
GenericName[el]=Ο δαίμονας Bluetooth του KDE
GenericName[es]=Daemon Bluetooth de KDE
GenericName[et]=KDE Bluetoothi deemon
GenericName[fr]=Démon KDE Bluetooth
GenericName[gl]=Servizo Bluetooth de KDE
GenericName[it]=Demone Bluetooth di KDE
GenericName[ja]=KDE Bluetooth デーモン
GenericName[ka]=KDE ბლუთუს დემონი
GenericName[nl]=KDE Bluetooth-daemon
GenericName[pa]=KDE ਬਲਿਊਟੁੱਥ ਡਾਈਮੋਨ
GenericName[pl]=Demon Bluetooth dla KDE
GenericName[pt]=Serviço Bluetooth do KDE
GenericName[ru]=Служба KDE Bluetooth
GenericName[sr]=Bluetooth демон за KDE
GenericName[sr@Latn]=Bluetooth demon za KDE
GenericName[sv]=KDE-Blåtandsdemon
GenericName[ta]=KDE புலுடுத் டேமொன்
GenericName[tr]=KDE Bluetooth Hizmeti
GenericName[xx]=xxKDE Bluetooth Daemonxx
Exec=kblueplugd
Icon=kdebluetooth
Type=Application
DocPath=kdebluetooth/index.html
Terminal=false
X-KDE-autostart-after=panel
X-KDE-StartupNotify=false
X-KDE-autostart-condition=kbluetoothrc:General:AutoStart:true

@ -1,110 +0,0 @@
diff -up kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h~ kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h
--- kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h~ 2007-09-17 19:52:30.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/kcm_btpaired/pairedtab.h 2008-01-06 15:45:56.000000000 +0200
@@ -29,6 +29,7 @@
#define PAIREDTAB_H
#include "pairedtabbase.h"
+#include <stdint.h>
#include <qcstring.h>
#include <qdatastream.h>
#include <qstringlist.h>
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp~ 2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverops.cpp 2008-01-06 15:58:29.000000000 +0200
@@ -28,6 +28,7 @@
#include "qobexserverops.h"
#include "qobexauth.h"
+#undef myDebug
#undef DEBUG
// #define DEBUG
#ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp~ 2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserverconnection.cpp 2008-01-06 15:57:54.000000000 +0200
@@ -42,6 +42,7 @@
#include "qobexnullserverops.h"
#include "qobexserverops.h"
+#undef myDebug
#undef DEBUG
#define DEBUG
#ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp~ 2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexclient.cpp 2008-01-06 15:56:55.000000000 +0200
@@ -31,6 +31,7 @@
#include "qobexclient.h"
+#undef myDebug
//#undef DEBUG
#define DEBUG
#ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp~ 2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserialtransport.cpp 2008-01-06 15:59:12.000000000 +0200
@@ -31,6 +31,7 @@
#include "qobexserialtransport.h"
+#undef myDebug
#undef DEBUG
// #define DEBUG
#ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp~ 2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobextransport.cpp 2008-01-06 15:57:32.000000000 +0200
@@ -46,6 +46,7 @@
#include "qobextransport.h"
+#undef myDebug
//#undef DEBUG
#define DEBUG
#ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp~ 2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qserialdevice.cpp 2008-01-06 15:58:59.000000000 +0200
@@ -43,6 +43,7 @@
#include "qttylock.h"
#include "qserialdevice.h"
+#undef myDebug
#undef DEBUG
// #define DEBUG
#ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp~ 2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexbase.cpp 2008-01-06 15:58:05.000000000 +0200
@@ -23,6 +23,7 @@
#include "qobexbase.h"
+#undef myDebug
#undef DEBUG
// #define DEBUG
#ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp~ 2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexserver.cpp 2008-01-06 15:57:13.000000000 +0200
@@ -31,6 +31,7 @@
#include "qobexserver.h"
+#undef myDebug
#undef DEBUG
// #define DEBUG
#ifdef DEBUG
diff -up kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp~ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp
--- kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp~ 2007-09-17 19:52:31.000000000 +0300
+++ kdebluetooth-1.0_beta8/kdebluetooth/libqobex/qobex/qobexericssontransport.cpp 2008-01-06 15:58:44.000000000 +0200
@@ -31,6 +31,7 @@
#include "qobexericssontransport.h"
+#undef myDebug
#undef DEBUG
#define DEBUG
#ifdef DEBUG

@ -1,22 +0,0 @@
--- a/kdebluetooth/libkbluetooth/dbusinit.h.ORI 2012-09-01 20:45:58.121444854 +0200
+++ a/kdebluetooth/libkbluetooth/dbusinit.h 2012-09-01 20:46:09.735185514 +0200
@@ -32,7 +32,7 @@
#include <dbus/connection.h>
#define BLUEZ_SERVICE "org.bluez"
-#define BLUEZ_PATH "/org/bluez"
+#define BLUEZ_PATH "/"
#define OBEX_SERVICE "org.openobex"
#define OBEX_PATH "/org/openobex"
--- a/kdebluetooth/libkbluetooth/inputmanager.h.ORI 2012-09-01 20:48:03.215640910 +0200
+++ a/kdebluetooth/libkbluetooth/inputmanager.h 2012-09-01 20:48:12.643428667 +0200
@@ -32,7 +32,7 @@
#include "dbussignal.h"
#include "dbusfilter.h"
-#define BLUEZ_PATH_INPUTMANAGER "/org/bluez/input"
+#define BLUEZ_PATH_INPUTMANAGER "/input"
#define INTERFACE_INPUTMANAGER "org.bluez.input.Manager"
namespace KBluetooth

@ -1,67 +0,0 @@
--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/libqobex/qobex/qobexbttransport.cpp.ORI 2012-05-06 16:47:30.512410613 -0400
+++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/libqobex/qobex/qobexbttransport.cpp 2012-05-06 16:47:33.712352364 -0400
@@ -54,8 +54,9 @@
QObexBtTransport::QObexBtTransport( QObject* parent, const char* name )
: QObexTransport( parent, name ) {
myDebug(( "QObexBtTransport::QObexBtTransport( ... )" ));
- bacpy( &mDest, BDADDR_ANY );
- bacpy( &mSrc, BDADDR_ANY );
+ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}};
+ bacpy( &mDest, &bdaddr_any );
+ bacpy( &mSrc, &bdaddr_any );
mChannel = -1;
open();
@@ -76,7 +77,9 @@
mRegisterSdp = false;
mSdpHandle = 0;
- bacpy( &mSrc, BDADDR_ANY );
+
+ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}};
+ bacpy( &mSrc, &bdaddr_any );
mChannel = -1;
}
@@ -119,7 +122,8 @@
// If the user has not specified an address
// discover devices speaking OBEX, take the first best ...
- if ( 0 == bacmp( &mDest, BDADDR_ANY ) ) {
+ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}};
+ if ( 0 == bacmp( &mDest, &bdaddr_any ) ) {
if ( !discover() ) {
myDebug(( "QObexBtTransport::connect(): Can not discover device" ));
error( ConnectionRefused );
@@ -326,7 +330,8 @@
// If this profile is not found return an error.
int channel = -1;
- sdp_session_t *sdp = sdp_connect( BDADDR_ANY, &addr, SDP_STANDARD_CONNECT_FLAGS );
+ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}};
+ sdp_session_t *sdp = sdp_connect( &bdaddr_any, &addr, SDP_STANDARD_CONNECT_FLAGS );
if ( sdp ) {
myDebug(( "QObexBtTransport::getRfCommChannel(): sdp session opened" ));
@@ -369,7 +374,9 @@
{
myDebug(( "QObexBtTransport::registerSdp()" ));
- sdp_session_t *sdp = sdp_connect( BDADDR_ANY, BDADDR_LOCAL, SDP_STANDARD_CONNECT_FLAGS );
+ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}};
+ bdaddr_t bdaddr_local = {{0, 0, 0, 0xff, 0xff, 0xff}};
+ sdp_session_t *sdp = sdp_connect( &bdaddr_any, &bdaddr_local, SDP_STANDARD_CONNECT_FLAGS );
if ( !sdp )
return false;
@@ -479,7 +486,9 @@
{
myDebug(( "QObexBtTransport::unregisterSdp()" ));
- sdp_session_t *sdp = sdp_connect( BDADDR_ANY, BDADDR_LOCAL, SDP_STANDARD_CONNECT_FLAGS );
+ bdaddr_t bdaddr_any = {{0, 0, 0, 0, 0, 0}};
+ bdaddr_t bdaddr_local = {{0, 0, 0, 0xff, 0xff, 0xff}};
+ sdp_session_t *sdp = sdp_connect( &bdaddr_any, &bdaddr_local, SDP_STANDARD_CONNECT_FLAGS );
if ( !sdp )
return false;

@ -1,188 +0,0 @@
--- a/admin/acinclude.m4.in.trinity 2007-09-05 18:30:55.000000000 +0200
+++ a/admin/acinclude.m4.in 2012-08-19 12:48:49.872571920 +0200
@@ -479,14 +479,14 @@
if test "$kde_qtver" = "2"; then
kde_moduledir='\${libdir}/kde2'
else
- kde_moduledir='\${libdir}/kde3'
+ kde_moduledir='\${libdir}/trinity'
fi
fi
if test -z "$kde_styledir"; then
- kde_styledir='\${libdir}/kde3/plugins/styles'
+ kde_styledir='\${libdir}/trinity/plugins/styles'
fi
if test -z "$kde_widgetdir"; then
- kde_widgetdir='\${libdir}/kde3/plugins/designer'
+ kde_widgetdir='\${libdir}/trinity/plugins/designer'
fi
if test -z "$xdg_appsdir"; then
xdg_appsdir='\${datadir}/applications/kde'
@@ -546,7 +546,7 @@
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[
- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then
kde_save_IFS=$IFS
@@ -612,7 +612,7 @@
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
+ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -1793,7 +1793,7 @@
if test -z "$1"; then
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -1805,7 +1805,7 @@
So, check this please and use another prefix!])
fi
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -1813,7 +1813,7 @@
kde_widgetdir=NO
dnl this might be somewhere else
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([
@@ -1821,14 +1821,14 @@
So, check this please and use another prefix!])
fi
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by kdelibs])
fi
if test -n "$kde_widgetdir"; then
- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
+ kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
fi
diff -Nuar kdebluetooth.ORI/admin/cvs.sh kdebluetooth.P/admin/cvs.sh
--- kdebluetooth.ORI/admin/cvs.sh 2012-02-12 14:10:33.093808915 +0100
+++ kdebluetooth.P/admin/cvs.sh 2012-02-12 14:11:27.951558154 +0100
@@ -68,7 +68,7 @@
echo "*** KDE requires automake $required_automake_version"
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*)
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;
--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/libkbluetooth/Makefile.am.ORI 2012-02-12 14:40:37.124683567 +0100
+++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/libkbluetooth/Makefile.am 2012-02-12 14:41:13.572933231 +0100
@@ -9,10 +9,10 @@
namerequest.cpp adapter_old.cpp obexmanager.cpp obexsession.cpp
libkbluetooth_la_LDFLAGS = $(all_libraries)
-libkbluetooth_la_LIBADD = $(LIB_KDECORE) $(DBUS_LIBS) $(LIB_KIO) $(BLUETOOTH_LIBS) -ldbus-qt-1
+libkbluetooth_la_LIBADD = $(LIB_KDECORE) $(DBUS_LIBS) $(LIB_KIO) $(BLUETOOTH_LIBS) -ldbus-tqt-1 $(LIB_QT) $(LIB_KDEUI) -lkdefx
libkbluetoothincludedir = $(includedir)/libkbluetooth
-libkbluetoothinclude_HEADERS = adapter.h dbusinit.h dbussignal.h dbussignal.h manager.h inputdevice.h inputmanager.h \
+libkbluetoothinclude_HEADERS = adapter.h dbusinit.h dbussignal.h manager.h inputdevice.h inputmanager.h \
security.h dbusfilter.h service.h passkeyagent.h servicerecord.h devicemimeconverter.h \
deviceaddress.h rfcommsocket.h servicediscovery.h sdpservice.h namerequest.h adapter_old.h \
sdpdevice.h sdpattribute.h serviceselectionwidget.h inquiry.h hcisocket.h hcidefault.h \
--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbluetooth/Makefile.am.ORI 2012-02-12 15:23:53.713273076 +0100
+++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbluetooth/Makefile.am 2012-02-12 15:24:04.547424194 +0100
@@ -4,7 +4,7 @@
bin_PROGRAMS = kbluetooth
kbluetooth_SOURCES = adapterconfig.cpp adapterdialog.ui authorize.cpp authdialog.ui deviceconfig.cpp trayicon.cpp main.cpp application.cpp pindefdialog.ui pindialog.cpp confirmationdlgbase.ui confirmation.cpp rfcommportlistener.cpp procinheritsock.cpp portlistener.cpp sdprecord.cpp
-kbluetooth_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries)
+kbluetooth_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-tqt-1 $(all_libraries) -lDCOP -lkdefx $(LIB_QT)
kbluetooth_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI)
# this is where the desktop file will go
--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbluemon/Makefile.am.ORI 2012-02-12 15:27:57.544671388 +0100
+++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbluemon/Makefile.am 2012-02-12 15:28:03.821758799 +0100
@@ -4,7 +4,7 @@
bin_PROGRAMS = kbluemon
kbluemon_SOURCES = main.cpp monitor.cpp mondialog.ui
-kbluemon_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries)
+kbluemon_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-tqt-1 $(all_libraries) -lkdefx
kbluemon_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI)
# this is where the desktop file will go
--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbluelock/Makefile.am.ORI 2012-02-12 15:29:34.900026701 +0100
+++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbluelock/Makefile.am 2012-02-12 15:29:40.774108449 +0100
@@ -4,7 +4,7 @@
bin_PROGRAMS = kbluelock
kbluelock_SOURCES = main.cpp kbluelock.cpp lockdialog.ui
-kbluelock_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries)
+kbluelock_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-tqt-1 $(all_libraries) -lDCOP -lkdefx
kbluelock_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI)
# this is where the desktop file will go
--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kinputwizard/Makefile.am.ORI 2012-02-12 15:31:54.069962658 +0100
+++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kinputwizard/Makefile.am 2012-02-12 15:32:00.579053161 +0100
@@ -4,7 +4,7 @@
bin_PROGRAMS = kinputwizard
kinputwizard_SOURCES = main.cpp inputwizard.cpp inputdialog.ui inputdialog_ext.ui
-kinputwizard_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-qt-1 $(all_libraries)
+kinputwizard_LDFLAGS = $(KDE_RPATH) $(DBUS_LIBS) -ldbus-tqt-1 $(all_libraries) -lkdefx
kinputwizard_LDADD = ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI)
--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbtobexsrv/Makefile.am.ORI 2012-02-12 15:33:26.869242631 +0100
+++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbtobexsrv/Makefile.am 2012-02-12 15:33:44.826485520 +0100
@@ -19,7 +19,7 @@
# the application source, library search path, and link libraries
kbtobexsrv_SOURCES = main.cpp maindlg.cpp maindlgbase.ui myfileiconview.cpp
-kbtobexsrv_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kbtobexsrv_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lkdefx
kbtobexsrv_LDADD = ../libkbluetooth/libkbluetooth.la ../libkobex/libkobex.la $(LIB_KIO) $(OPENOBEX_LIBS) -lkio $(LIB_KDEUI) $(BLUETOOTH_LIBS)
# this is where the desktop file will go
--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbtobexclient/Makefile.am.ORI 2012-02-12 15:35:17.239735523 +0100
+++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kbtobexclient/Makefile.am 2012-02-12 15:35:25.381845659 +0100
@@ -17,8 +17,8 @@
# the application source, library search path, and link libraries
-kbtobexclient_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kbtobexclient_LDFLAGS = $(KDE_RPATH) $(all_libraries) -lkdefx
-kbtobexclient_LDADD = ../libkbluetooth/libkbluetooth.la ../libkobex/libkobex.la $(LIB_KIO) $(OPENOBEX_LIBS) -lkio $(LIB_KDEUI) $(BLUETOOTH_LIBS) $(DBUS_LIBS) -ldbus-qt-1
+kbtobexclient_LDADD = ../libkbluetooth/libkbluetooth.la ../libkobex/libkobex.la $(LIB_KIO) $(OPENOBEX_LIBS) -lkio $(LIB_KDEUI) $(BLUETOOTH_LIBS) $(DBUS_LIBS) -ldbus-tqt-1
# this is where the desktop file will go
#shelldesktopdir = $(kde_appsdir)/Utilities
--- kdebluetooth-1.0~beta9~r769275/kdebluetooth/kcm_btpaired/Makefile.am.ORI 2012-05-06 16:27:34.359953095 -0400
+++ kdebluetooth-1.0~beta9~r769275/kdebluetooth/kcm_btpaired/Makefile.am 2012-05-06 16:27:41.351939071 -0400
@@ -6,7 +6,7 @@
kcm_btpaired_la_SOURCES = pairedtabbase.ui pairedtab.cpp kcm_btpaired.cpp \
exportdialog.ui
-kcm_btpaired_la_LIBADD = $(LIB_KIO) ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI) $(SDP_LIBS) $(DBUS_LIBS) -ldbus-qt-1
+kcm_btpaired_la_LIBADD = $(LIB_KIO) ../libkbluetooth/libkbluetooth.la $(LIB_KIO) $(LIB_KDEUI) $(SDP_LIBS) $(DBUS_LIBS) -ldbus-tqt-1
kcm_btpaired_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
#kbluetoothdcm_DATA = kcm_btpaired.desktop

@ -1,318 +0,0 @@
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_appdir %{tde_datadir}/applications
%define tde_tdeappdir %{tde_appdir}/kde
%define tde_tdedocdir %{tde_docdir}/kde
%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-kdebluetooth
Version: 1.0_beta9_r769275
Release: 2%{?dist}
Summary: The TDE Bluetooth Framework
License: GPLv2+
Group: Applications/Communications
URL: http://bluetooth.kmobiletools.org/
Source0: kdebluetooth_1.0~beta9~r769275.orig.tar.gz
Source1: kblueplugd.bluez3
Source2: kblueplugd.bluez4
Source3: kblueplugd.desktop
Patch1: kdebluetooth-1.0_beta8-gcc43.patch
Patch2: kdebluetooth-trinity.patch
Patch3: kdebluetooth-fix_gcc_46_compilation.patch
Patch4: kdebluetooth-fix_bluez4_support.patch
Patch11: kubuntu_01_kdepot.patch
Patch12: kubuntu_02_desktop_files.patch
Patch13: kubuntu_06_no_autostart.patch
Patch14: kubuntu_07_fix_header_include.patch
Patch15: kubuntu_08_load_kdebluetooth_catalogue.patch
Patch16: kubuntu_09_french_i18n.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: lockdev-devel
#BuildRequires: xmms-devel
BuildRequires: trinity-tdelibs-devel
BuildRequires: trinity-tdepim-devel
BuildRequires: openobex-devel >= 1.1
BuildRequires: libusb-devel
BuildRequires: pkgconfig
Buildrequires: libidn-devel
Buildrequires: dbus-tqt-devel
BuildRequires: automake >= 1.6.1
BuildRequires: autoconf >= 2.52
BuildRequires: obexftp-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}bluez-devel
%else
BuildRequires: bluez-libs-devel
%endif
# kdesu binary
Requires: trinity-tdebase-bin
%if 0%{?fedora} >= 8
Provides: dbus-bluez-pin-helper
%endif
Obsoletes: %{name}-libs < %{version}-%{release}
Provides: %{name}-libs = %{version}-%{release}
%description
The KDE Bluetooth Framework is a set of tools built on top of Linux'
Bluetooth (Bluez) stack. The goal is to provide easy access to the most
common Bluetooth profiles and to make data exchange with Bluetooth
enabled devices as straightforward as possible.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: trinity-tdelibs-devel
Requires: bluez-libs-devel
%description devel
KDE Bluetooth framework development libraries and headers.
%prep
%setup -q -n kdebluetooth-1.0~beta9~r769275
%patch1 -p1 -b .gcc43
%patch2 -p1 -b .trinity
%patch3 -p1 -b .gcc46
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%patch4 -p1 -b .bluez4
%endif
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i "admin/acinclude.m4.in" \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|include/kde|include/tde|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export KDEDIR=%{tde_prefix}
# FIXME: dbus-tqt headers are not found without this ...
export CXXFLAGS="${CXXFLAGS} -I%{tde_includedir}/dbus-1.0"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_tdeincludedir} \
--datadir=%{tde_datadir} \
--disable-rpath \
--enable-new-ldflags \
--disable-debug \
--disable-dependency-tracking \
--enable-final \
--enable-closure \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
%install
export PATH="%{tde_bindir}:${PATH}"
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT
# icons
for DESK_PATH in applications/kde applnk/Utilities ; do
desktop-file-install \
--mode=644 \
--vendor="" \
--dir=$RPM_BUILD_ROOT%{tde_datadir}/applications/kde \
--remove-category="Network" \
--add-category="System" \
--delete-original \
$RPM_BUILD_ROOT%{tde_datadir}/$DESK_PATH/*.desktop ||:
done
# Locales
PROG_LIST="kbluelock kbluemon kbluetooth kinputwizard
kcm_btpaired kio_bluetooth kio_obex2 kio_sdp
libkbluetooth kdebluetooth"
for PROG in $PROG_LIST ; do
%find_lang $PROG && cat $PROG.lang >> %{name}.lang ||:
done
# Unwanted files
%__rm -f %{buildroot}%{_datadir}/applnk/Settings/Network/Bluetooth/.directory
%__rm -f %{buildroot}%{tde_libdir}/*.a
%__rm -f %{buildroot}%{tde_tdelibdir}/kcm_btpaired.a
%__rm -f %{buildroot}%{tde_tdelibdir}/kio_bluetooth.a
%__rm -f %{buildroot}%{tde_tdelibdir}/kio_obex.a
%__rm -f %{buildroot}%{tde_tdelibdir}/kio_sdp.a
%__rm -f %{buildroot}%{tde_datadir}/applnk/Settings/Network/Bluetooth/.directory
# Installs 'kblueplugd'
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
%__install -D -m 755 %{SOURCE2} %{buildroot}%{tde_bindir}/kblueplugd
%else
%__install -D -m 755 %{SOURCE1} %{buildroot}%{tde_bindir}/kblueplugd
%endif
%__install -D -m 644 %{SOURCE3} %{buildroot}%{tde_datadir}/autostart/kblueplugd.desktop
%clean
%__rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -qf %{tde_datadir}/icons/hicolor 2> /dev/null ||:
/sbin/ldconfig || :
update-desktop-database %{tde_appdir} 2> /dev/null || :
%postun
touch --no-create %{tde_datadir}/icons/hicolor ||:
gtk-update-icon-cache -qf %{tde_datadir}/icons/hicolor 2> /dev/null ||:
/sbin/ldconfig || :
update-desktop-database %{tde_appdir} 2> /dev/null || :
%post devel
/sbin/ldconfig || :
%postun devel
/sbin/ldconfig || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING INSTALL README
%{tde_bindir}/kbluelock
%{tde_bindir}/kbluemon
%{tde_bindir}/kblueplugd
%{tde_bindir}/kbluetooth
%{tde_bindir}/kbtobexclient
%{tde_bindir}/kioobex_start
%{tde_bindir}/kinputwizard
%{tde_datadir}/applnk/.hidden/*.desktop
%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/*.desktop
%{tde_datadir}/apps/konqueror/servicemenus/kbtobexclient_sendfile.desktop
%{tde_datadir}/apps/kbtobexclient/kbtobexclientui.rc
%{tde_datadir}/apps/kdebluetooth/
%{tde_tdeappdir}/dunhandler.desktop
%{tde_tdeappdir}/faxhandler.desktop
%{tde_tdeappdir}/kbluelock.desktop
%{tde_tdeappdir}/kbluemon.desktop
%{tde_tdeappdir}/kbluetooth.desktop
%{tde_tdeappdir}/kbtobexclient.desktop
%{tde_tdeappdir}/kbtobexsrv.desktop
%{tde_tdeappdir}/kcm_btpaired.desktop
%{tde_tdeappdir}/kinputwizard.desktop
%{tde_datadir}/autostart/kblueplugd.desktop
%{tde_datadir}/desktop-directories/kde-settings-network-bluetooth.directory
%{tde_datadir}/icons/hicolor/*/apps/kbluetooth.png
%{tde_datadir}/icons/hicolor/*/apps/kdebluetooth.png
%{tde_datadir}/icons/hicolor/*/apps/kbluelock.png
%{tde_datadir}/icons/hicolor/scalable/apps/kdebluetooth.svgz
%{tde_datadir}/mimelnk/bluetooth/av-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/computer-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/dun-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/fax-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/handsfree-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/headset-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/imaging-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/keyboard-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/lan-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/misc-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/mouse-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/obex-ftp-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/obexobjectpush-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/peripheral-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/phone-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/serial-port-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/synchronization-profile.desktop
%{tde_datadir}/mimelnk/bluetooth/unknown-device-class.desktop
%{tde_datadir}/mimelnk/bluetooth/unknown-profile.desktop
%{tde_datadir}/services/bluetooth.protocol
%{tde_datadir}/services/btsdp.protocol
%{tde_datadir}/services/kbluetooth_kbtobexsrv.desktop
%{tde_datadir}/services/kbluetooth_kbtobexsrv.sdp.xml
%{tde_datadir}/services/obex.protocol
%{tde_datadir}/services/sdpmime-dun-profile.desktop
%{tde_datadir}/services/sdpmime-fax-profile.desktop
%{tde_datadir}/services/sdpmime-handsfree-profile.desktop
%{tde_datadir}/services/sdpmime-headset-profile.desktop
%{tde_datadir}/services/sdpmime-obex-client-profile.desktop
%{tde_datadir}/services/sdpmime-obex-ftp-profile.desktop
%{tde_datadir}/services/sdpmime-serial-port-profile.desktop
%{tde_datadir}/services/sdpmime-synchronization-profile.desktop
%{tde_datadir}/servicetypes/sdpservicehandler.desktop
%{tde_libdir}/kdebluetooth/servers/kbtobexsrv
%{tde_libdir}/libkbluetooth.so.0
%{tde_libdir}/libkbluetooth.so.0.0.0
%{tde_libdir}/libqobex.so.0
%{tde_libdir}/libqobex.so.0.0.9
%{tde_tdelibdir}/kcm_btpaired.la
%{tde_tdelibdir}/kcm_btpaired.so
%{tde_tdelibdir}/kio_bluetooth.la
%{tde_tdelibdir}/kio_bluetooth.so
%{tde_tdelibdir}/kio_obex.la
%{tde_tdelibdir}/kio_obex.so
%{tde_tdelibdir}/kio_sdp.la
%{tde_tdelibdir}/kio_sdp.so
%lang(ca) %{tde_tdedocdir}/HTML/ca/kdebluetooth/
%lang(da) %{tde_tdedocdir}/HTML/da/kdebluetooth/
%lang(en) %{tde_tdedocdir}/HTML/en/kdebluetooth/
%lang(es) %{tde_tdedocdir}/HTML/es/kdebluetooth/
%lang(et) %{tde_tdedocdir}/HTML/et/kdebluetooth/
%lang(fr) %{tde_tdedocdir}/HTML/fr/kdebluetooth/
%lang(it) %{tde_tdedocdir}/HTML/it/kdebluetooth/
%lang(nl) %{tde_tdedocdir}/HTML/nl/kdebluetooth/
%lang(pt) %{tde_tdedocdir}/HTML/pt/kdebluetooth/
%lang(ru) %{tde_tdedocdir}/HTML/ru/kdebluetooth/
%lang(sv) %{tde_tdedocdir}/HTML/sv/kdebluetooth/
%files devel
%defattr(-,root,root,-)
%{tde_tdeincludedir}/libkbluetooth/
%{tde_tdeincludedir}/qobex/
%{tde_libdir}/libkbluetooth.la
%{tde_libdir}/libkbluetooth.so
%{tde_libdir}/libqobex.la
%{tde_libdir}/libqobex.so
%changelog

@ -1,20 +0,0 @@
diff -Nur kdebluetooth-1.0~beta5~r695881/admin/cvs.sh kdebluetooth-1.0~beta5~r695881.new/admin/cvs.sh
--- kdebluetooth-1.0~beta5~r695881/admin/cvs.sh 2007-08-02 13:29:02.000000000 +0200
+++ kdebluetooth-1.0~beta5~r695881.new/admin/cvs.sh 2007-08-03 10:19:55.000000000 +0200
@@ -537,6 +537,8 @@
if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
export EXTRACTRC PREPARETIPS
+kdepotpath=/usr/include/kde/kde.pot
+
for subdir in $dirs; do
test -z "$VERBOSE" || echo "Making messages in $subdir"
(cd $subdir
@@ -554,7 +556,6 @@
fi
perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
- kdepotpath=${includedir:-`kde-config --expandvars --install include`}/kde.pot
if ! test -f $kdepotpath; then
kdepotpath=`kde-config --expandvars --prefix`/include/kde.pot
fi

@ -1,48 +0,0 @@
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluelock/kbluelock.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluelock/kbluelock.desktop
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluelock/kbluelock.desktop 2007-11-10 10:38:44.000000000 +0100
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluelock/kbluelock.desktop 2007-11-16 11:08:12.000000000 +0100
@@ -38,4 +38,5 @@
Comment[tg]=Намоишгари KDE Bluetooth
Comment[tr]=KDE Bluetooth İzleyici
Comment[xx]=xxKDE Bluetooth Monitorxx
+Hidden=true
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluemon/kbluemon.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluemon/kbluemon.desktop
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluemon/kbluemon.desktop 2007-11-10 10:38:44.000000000 +0100
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluemon/kbluemon.desktop 2007-11-16 11:08:12.000000000 +0100
@@ -36,4 +36,5 @@
Comment[tg]=Намоишгари KDE Bluetooth
Comment[tr]=KDE Bluetooth İzleyici
Comment[xx]=xxKDE Bluetooth Monitorxx
+Hidden=true
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluetooth/kbluetooth.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluetooth/kbluetooth.desktop
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbluetooth/kbluetooth.desktop 2007-11-10 10:38:44.000000000 +0100
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbluetooth/kbluetooth.desktop 2007-11-16 11:08:12.000000000 +0100
@@ -33,7 +33,7 @@
GenericName[tg]=Хидматгоҳи Bluetooth
GenericName[tr]=Bluetooth Sunucusu
GenericName[xx]=xxBluetooth Serverxx
-Categories=Settings;HardwareSettings;
+Categories=Qt;KDE;System;
OnlyShowIn=KDE;
Comment=KDE Bluetooth Framework Metaserver
Comment[bg]=Мета сървър за Bluetooth Framework
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/kbtobexclient.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/kbtobexclient.desktop
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/kbtobexclient.desktop 2007-10-27 09:44:26.000000000 +0200
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/kbtobexclient.desktop 2007-11-16 11:08:57.000000000 +0100
@@ -58,3 +58,5 @@
Comment[ta]=KDE புலுடுத் சட்டவேலைக்கான OBEX பொருள் கிளைஞ்சன்
Comment[tr]=KDEBluetooth Ortamı için OBEX Nesneleri Destek istemcisi
Comment[xx]=xxAn OBEX Object Push client for the KDEBluetooth Frameworkxx
+NoDisplay=true
+
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kinputwizard/kinputwizard.desktop kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kinputwizard/kinputwizard.desktop
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kinputwizard/kinputwizard.desktop 2007-11-10 10:38:44.000000000 +0100
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kinputwizard/kinputwizard.desktop 2007-11-16 11:08:12.000000000 +0100
@@ -36,4 +36,5 @@
Comment[tg]=Устоди KDE Bluetooth
Comment[tr]=KDE Bluetooth Sihirbazı
Comment[xx]=xxKDE Bluetooth Wizardxx
+Hidden=true

@ -1,15 +0,0 @@
diff -Nur kdebluetooth-1.0~beta6~r706091/kdebluetooth/kbluetooth/Makefile.am kdebluetooth-1.0~beta6~r706091.new/kdebluetooth/kbluetooth/Makefile.am
--- kdebluetooth-1.0~beta6~r706091/kdebluetooth/kbluetooth/Makefile.am 2007-08-29 14:03:27.000000000 +0200
+++ kdebluetooth-1.0~beta6~r706091.new/kdebluetooth/kbluetooth/Makefile.am 2007-08-29 16:39:13.000000000 +0200
@@ -12,11 +12,6 @@
#shelldesktop_DATA = kbluetooth.desktop
xdg_apps_DATA = kbluetooth.desktop
-# Autostart entry
-autostartdir = $(datadir)/autostart
-autostart_DATA = kbluetooth.autostart.desktop
-
-
#EXTRA_DIST = $(kbluetooth_SOURCES)\
# $(kde_servicetypes_DATA) \
# eventsrc

@ -1,10 +0,0 @@
diff -Nur kdebluetooth-1.0~beta6~r706853/kdebluetooth/kbtobexclient/Makefile.am kdebluetooth-1.0~beta6~r706853.new/kdebluetooth/kbtobexclient/Makefile.am
--- kdebluetooth-1.0~beta6~r706853/kdebluetooth/kbtobexclient/Makefile.am 2007-08-31 11:52:00.000000000 +0200
+++ kdebluetooth-1.0~beta6~r706853.new/kdebluetooth/kbtobexclient/Makefile.am 2007-08-31 18:31:16.000000000 +0200
@@ -1,5 +1,5 @@
# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/kdebluetooth -I$(top_srcdir)/kdebluetooth/libkbluetooth/ -Ikio $(all_includes) $(OPENOBEX_CFLAGS) $(BLUETOOTH_CFLAGS) $(DBUS_CFLAGS)
+INCLUDES = -I$(top_builddir)/kdebluetooth/libkbluetooth/ -I$(build_dir)/kdebluetooth/libkbluetooth/ -I$(top_srcdir)/kdebluetooth -I$(top_srcdir)/kdebluetooth/libkbluetooth/ -Ikio $(all_includes) $(OPENOBEX_CFLAGS) $(BLUETOOTH_CFLAGS) $(DBUS_CFLAGS)
# these are the headers for your project

@ -1,50 +0,0 @@
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/main.cpp kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/main.cpp
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtobexclient/main.cpp 2007-08-30 17:30:15.000000000 +0200
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtobexclient/main.cpp 2007-11-16 18:08:29.000000000 +0100
@@ -42,6 +42,7 @@
int main(int argc, char **argv)
{
+ KLocale::setMainCatalogue("kdebluetooth");
KAboutData about("kbtobexclient",
I18N_NOOP("Bluetooth OBEX Object Push client"),
0, description,
@@ -58,7 +59,6 @@
KApplication app;
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- KGlobal::locale()->insertCatalogue("libkbluetooth");
KURL url;
if (args->count() == 0) {
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtserialchat/main.cpp kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtserialchat/main.cpp
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kbtserialchat/main.cpp 2005-04-20 21:01:14.000000000 +0200
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kbtserialchat/main.cpp 2007-11-16 18:08:29.000000000 +0100
@@ -37,6 +37,7 @@
int main(int argc, char **argv)
{
+ KLocale::setMainCatalogue("kdebluetooth");
KAboutData about("kbtserialchat",
I18N_NOOP("Bluetooth Serial Chat"),
version, description,
@@ -49,7 +50,6 @@
KApplication app;
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
- KGlobal::locale()->insertCatalogue("libkbluetooth");
if (args->isSet("rfcommconnection") && args->isSet("peeraddr") &&
args->isSet("peername")) {
int socket = QString(args->getOption("rfcommconnection"))
diff -Nur -x '*.orig' -x '*~' kdebluetooth-1.0~beta9~r734866/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp
--- kdebluetooth-1.0~beta9~r734866/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp 2007-08-27 18:44:57.000000000 +0200
+++ kdebluetooth-1.0~beta9~r734866.new/kdebluetooth/kcm_btpaired/kcm_btpaired.cpp 2007-11-16 18:14:38.000000000 +0100
@@ -82,7 +82,7 @@
{
KCModule *create_btpaired(QWidget *parent, const char* /*name*/)
{
- KGlobal::locale()->insertCatalogue("btpaired");
+ KGlobal::locale()->insertCatalogue("kdebluetooth");
return new kcm_btpaired(parent, "btpaired");
}
}

File diff suppressed because it is too large Load Diff

@ -1,40 +0,0 @@
--- kickoff-i18n-1.0/admin/configure.in.min.ORI 2013-06-04 21:34:45.145197643 +0200
+++ kickoff-i18n-1.0/admin/configure.in.min 2013-06-04 21:34:54.004020422 +0200
@@ -41,7 +41,7 @@
KDE_SET_PREFIX
dnl generate the config header
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
dnl Checks for programs.
AC_CHECK_COMPILERS
--- kickoff-i18n-1.0/admin/cvs.sh.automake 2007-01-15 10:06:45.000000000 +0100
+++ kickoff-i18n-1.0/admin/cvs.sh 2013-06-04 21:34:39.471311140 +0200
@@ -68,7 +68,7 @@
echo "*** KDE requires automake $required_automake_version"
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]*)
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;
@@ -128,7 +128,7 @@
echo "*** Creating configure"
call_and_fix_autoconf
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
echo "*** Creating config.h template"
$AUTOHEADER || exit 1
touch config.h.in
@@ -184,7 +184,7 @@
fi
fi
$ACLOCAL $ACLOCALFLAGS
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
echo "*** Creating config.h template"
$AUTOHEADER || exit 1
touch config.h.in

@ -1,91 +0,0 @@
--- kickoff-i18n-1.0/admin/acinclude.m4.in.dir 2007-03-19 17:45:09.000000000 +0100
+++ kickoff-i18n-1.0/admin/acinclude.m4.in 2012-08-03 21:25:09.982125218 +0200
@@ -428,7 +428,7 @@
if test "$1" = "default"; then
if test -z "$kde_htmldir"; then
- kde_htmldir='\${datadir}/doc/HTML'
+ kde_htmldir='%{tde_tdedocdir}/HTML'
fi
if test -z "$kde_appsdir"; then
kde_appsdir='\${datadir}/applnk'
@@ -479,14 +479,14 @@
if test "$kde_qtver" = "2"; then
kde_moduledir='\${libdir}/kde2'
else
- kde_moduledir='\${libdir}/kde3'
+ kde_moduledir='\${libdir}/trinity'
fi
fi
if test -z "$kde_styledir"; then
- kde_styledir='\${libdir}/kde3/plugins/styles'
+ kde_styledir='\${libdir}/trinity/plugins/styles'
fi
if test -z "$kde_widgetdir"; then
- kde_widgetdir='\${libdir}/kde3/plugins/designer'
+ kde_widgetdir='\${libdir}/trinity/plugins/designer'
fi
if test -z "$xdg_appsdir"; then
xdg_appsdir='\${datadir}/applications/kde'
@@ -546,7 +546,7 @@
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[
- kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
+ kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/trinity/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then
kde_save_IFS=$IFS
@@ -612,7 +612,7 @@
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
- kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
+ kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/trinity/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then
@@ -1793,7 +1793,7 @@
if test -z "$1"; then
-kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
+kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/trinity/include/kde /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
@@ -1805,7 +1805,7 @@
So, check this please and use another prefix!])
fi
-kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
+kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/trinity /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/trinity/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
@@ -1813,7 +1813,7 @@
kde_widgetdir=NO
dnl this might be somewhere else
-AC_FIND_FILE("kde3/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([
@@ -1821,14 +1821,14 @@
So, check this please and use another prefix!])
fi
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by kdelibs])
fi
if test -n "$kde_widgetdir"; then
- kde_widgetdir="$kde_widgetdir/kde3/plugins/designer"
+ kde_widgetdir="$kde_widgetdir/trinity/plugins/designer"
fi

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -1,91 +0,0 @@
# Speed build options
%define debug_package %{nil}
%define __spec_install_post %{nil}
AutoReq: no
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-kickoff-i18n
Summary: Kickoff translations for Trinity Desktop Environment
Version: 1.0
Release: 2%{?dist}
Group: System/Internationalization
License: GPL
URL: http://www.mandriva.com
Source0: kickoff-i18n-1.0.tar.bz2
Patch0: kickoff-i18n-1.0-uz-po.patch
Patch1: kickoff-i18n-1.0-tr-po.patch
# [kickoff-i18n] Fix directories for Trinity
Patch2: kickoff-i18n-1.0-fix_trinity_location.patch
# [kickoff-i18n] Fix build with automake 1.11
Patch3: kickoff-i18n-1.0-fix_autotools_detection.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
BuildRequires: qt3-devel
BuildRequires: trinity-tdelibs-devel >= 3.5.13.1
%description
kickoff translations
%prep
%setup -q -n kickoff-i18n-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1 -b .dir
%patch3 -p1 -b .automake
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
./configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
%__make %{?_smp_mflags}
%install
%__rm -fr %{buildroot}
%__make install DESTDIR=%{?buildroot}
%find_lang kickoff
%clean
#rm -fr %{buildroot}
%files -f kickoff.lang
%defattr(-,root,root,-)
%changelog

@ -1,91 +0,0 @@
# Speed build options
%define debug_package %{nil}
%define __spec_install_post %{nil}
AutoReq: no
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-kickoff-i18n
Summary: Kickoff translations for Trinity Desktop Environment
Version: 1.0
Release: 3%{?dist}
Group: System/Internationalization
License: GPL
URL: http://www.mandriva.com
Source0: kickoff-i18n-1.0.tar.bz2
Patch0: kickoff-i18n-1.0-uz-po.patch
Patch1: kickoff-i18n-1.0-tr-po.patch
# [kickoff-i18n] Fix directories for Trinity
Patch2: kickoff-i18n-1.0-fix_trinity_location.patch
# [kickoff-i18n] Fix build with automake 1.11
Patch3: kickoff-i18n-1.0-fix_autotools_detection.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
BuildRequires: qt3-devel
BuildRequires: trinity-tdelibs-devel >= 3.5.13.2
%description
kickoff translations
%prep
%setup -q -n kickoff-i18n-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1 -b .dir
%patch3 -p1 -b .automake
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
./configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--datadir=%{tde_datadir} \
--includedir=%{tde_tdeincludedir} \
%__make %{?_smp_mflags}
%install
%__rm -fr %{buildroot}
%__make install DESTDIR=%{?buildroot}
%find_lang kickoff
%clean
#rm -fr %{buildroot}
%files -f kickoff.lang
%defattr(-,root,root,-)
%changelog

@ -1,82 +0,0 @@
# Speed build options
%define debug_package %{nil}
%define __spec_install_post %{nil}
AutoReq: no
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_doc %{tde_datadir}/doc
%define _docdir %{tde_docdir}
Name: trinity-kickoff-i18n
Summary: Kickoff translations for Trinity Desktop Environment
Version: 1.0
Release: 1%{?dist}
Group: System/Internationalization
License: GPL
URL: http://www.mandriva.com
Source0: kickoff-i18n-1.0.tar.bz2
Patch0: kickoff-i18n-1.0-uz-po.patch
Patch1: kickoff-i18n-1.0-tr-po.patch
# [kickoff-i18n] Fix directories for Trinity
Patch2: kickoff-i18n-1.0-fix_trinity_location.patch
# [kickoff-i18n] Fix build with automake 1.11
Patch3: kickoff-i18n-1.0-fix_autotools_detection.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
BuildArch: noarch
BuildRequires: qt3-devel
BuildRequires: trinity-tdelibs-devel
%description
kickoff translations
%prep
%setup -q -n kickoff-i18n-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1 -b .dir
%patch3 -p1 -b .automake
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR; . /etc/profile.d/qt.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
./configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--datadir=%{tde_datadir}
%__make %{?_smp_mflags}
%install
%__rm -fr %{buildroot}
%__make install DESTDIR=%{?buildroot}
%find_lang kickoff
%clean
#rm -fr %{buildroot}
%files -f kickoff.lang
%defattr(-,root,root,-)
%changelog

@ -1,40 +0,0 @@
--- baghira-0.8/admin/configure.in.min.ORI 2013-06-04 22:19:10.519738419 +0200
+++ baghira-0.8/admin/configure.in.min 2013-06-04 22:19:15.564636810 +0200
@@ -41,7 +41,7 @@
KDE_SET_PREFIX
dnl generate the config header
-AM_CONFIG_HEADER(config.h) dnl at the distribution this done
+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
dnl Checks for programs.
AC_PROG_CC
--- baghira-0.8/admin/cvs.sh.ORI 2013-06-04 22:18:38.566381936 +0200
+++ baghira-0.8/admin/cvs.sh 2013-06-04 22:19:06.483819702 +0200
@@ -68,7 +68,7 @@
echo "*** KDE requires automake $required_automake_version"
exit 1
;;
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12*)
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12* | automake*1.13*)
echo "*** $AUTOMAKE_STRING found."
UNSERMAKE=no
;;
@@ -128,7 +128,7 @@
echo "*** Creating configure"
call_and_fix_autoconf
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
echo "*** Creating config.h template"
$AUTOHEADER || exit 1
touch config.h.in
@@ -184,7 +184,7 @@
fi
fi
$ACLOCAL $ACLOCALFLAGS
-if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
echo "*** Creating config.h template"
$AUTOHEADER || exit 1
touch config.h.in

@ -1,140 +0,0 @@
--- baghira-0.8/bab/main.cpp.ORI 2012-11-20 19:33:04.093794934 +0100
+++ baghira-0.8/bab/main.cpp 2012-11-20 19:33:08.022717622 +0100
@@ -330,7 +330,7 @@
delete config;
}
-QPoint *BabSwitcher::globalPos = new QPoint::QPoint(0,0);
+QPoint *BabSwitcher::globalPos = new QPoint(0,0);
BabSwitcher::BabSwitcher(bab *parent, const char *name)
: KSystemTray(parent,name), DCOPObject("babInterface") {
--- baghira-0.8/bab/Makefile.am.ORI 2012-11-20 19:34:26.540172464 +0100
+++ baghira-0.8/bab/Makefile.am 2012-11-20 19:34:35.265000752 +0100
@@ -19,4 +19,4 @@
# the application source, library search path, and link libraries
bab_SOURCES = main.cpp styleconfdialog.cpp bab_iface.skel
bab_LDFLAGS = $(KDE_RPATH) $(all_libraries)
-bab_LDADD = $(LIB_KDEUI)
+bab_LDADD = $(LIB_KDEUI) $(LIB_QT)
--- baghira-0.8/config/generatePixmaps.sh.OLD 2012-11-20 19:53:24.431860823 +0100
+++ baghira-0.8/config/generatePixmaps.sh 2012-11-20 19:53:47.753402165 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
top_srcdir="${1:-../..}"
imagebase="$top_srcdir/imagebase"
-UIC=$(grep "UIC = " ../Makefile | cut -f3- -d" ")
+UIC=$QTDIR/bin/uic
echo -e "#ifndef SCPIXMAPS_H\n#define SCPIXMAPS_H\n" > pixmaps.h
$UIC -embed baghira \
$imagebase/button-base \
--- baghira-0.8/config/Makefile.am.ORI 2012-11-20 19:55:33.699318284 +0100
+++ baghira-0.8/config/Makefile.am 2012-11-20 19:55:37.841236807 +0100
@@ -7,7 +7,7 @@
kstyle_baghira_config_la_SOURCES = kstyle_baghira_config.cpp colordialog.cpp colorpicker.cpp configdialog.ui help.ui about.ui
# kstyle_baghira_config_la_METASOURCES = AUTO
-kstyle_baghira_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+kstyle_baghira_config_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) -lDCOP
kstyle_baghira_config_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined $(KDE_PLUGIN)
--- baghira-0.8/deco/config/generatePixmaps.sh.ORI 2012-11-20 19:59:34.835573683 +0100
+++ baghira-0.8/deco/config/generatePixmaps.sh 2012-11-20 19:59:45.590362018 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
top_srcdir="${1:-../..}"
imagebase="$top_srcdir/imagebase"
-UIC=$(grep "UIC = " ../../Makefile | cut -f3- -d" ")
+UIC=$QTDIR/bin/uic
echo -e "#ifndef DCPIXMAPS_H\n#define DCPIXMAPS_H\n" > pixmaps.h
$UIC -embed baghira \
$imagebase/icon_help \
--- baghira-0.8/deco/config/Makefile.am.ORI 2012-11-20 20:00:37.549339366 +0100
+++ baghira-0.8/deco/config/Makefile.am 2012-11-20 20:00:50.370087013 +0100
@@ -9,7 +9,7 @@
kde_module_LTLIBRARIES = kwin_baghira_config.la
kwin_baghira_config_la_SOURCES = baghiraconfig.cc aquariusbutton.cc colorpicker.cc configdialog.ui
kwin_baghira_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_baghira_config_la_LIBADD = $(LIB_KDEUI)
+kwin_baghira_config_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
kwin_baghira_config_la_METASOURCES = AUTO
DISTCLEANFILES = $(kwin_baghira_config_la_METASOURCES)
--- baghira-0.8/deco/generatePixmaps.sh.ORI 2012-11-20 20:03:20.543131500 +0100
+++ baghira-0.8/deco/generatePixmaps.sh 2012-11-20 20:03:29.464956023 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
top_srcdir="${1:-../..}"
imagebase="$top_srcdir/imagebase"
-UIC=$(grep "UIC = " ../Makefile | cut -f3- -d" ")
+UIC=$QTDIR/bin/uic
echo -e "#ifndef DPIXMAPS_H\n#define DPIXMAPS_H\n" > pixmaps.h
$UIC -embed baghira \
$imagebase/brushed-gradient \
--- baghira-0.8/deco/Makefile.am.ORI 2012-11-20 20:04:20.899944322 +0100
+++ baghira-0.8/deco/Makefile.am 2012-11-20 20:04:44.230485387 +0100
@@ -16,7 +16,7 @@
kde_module_LTLIBRARIES = kwin3_baghira.la
kwin3_baghira_la_SOURCES = baghiraclient.cc
kwin3_baghira_la_LIBADD = $(kde_libraries)/libkdecorations.la
-kwin3_baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdecore -module
+kwin3_baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -module
kwin3_baghira_la_METASOURCES = AUTO
DISTCLEANFILES = $(kwin3_baghira_la_METASOURCES)
--- baghira-0.8/sessionapplet/dmctl.cpp~ 2005-07-11 21:23:58.000000000 +0200
+++ baghira-0.8/sessionapplet/dmctl.cpp 2012-11-20 20:16:58.925023092 +0100
@@ -37,7 +37,7 @@
DM::DM() : fd( -1 )
{
- char *ptr;
+ const char *ptr;
struct sockaddr_un sa;
if (DMType == Dunno) {
--- baghira-0.8/style/generatePixmaps.sh.ORI 2012-11-20 20:20:08.024297835 +0100
+++ baghira-0.8/style/generatePixmaps.sh 2012-11-20 20:20:22.149019999 +0100
@@ -1,7 +1,7 @@
#!/bin/sh
top_srcdir="${1:-../..}"
imagebase="$top_srcdir/imagebase"
-UIC=$(grep "UIC = " ../Makefile | cut -f3- -d" ")
+UIC=$QTDIR/bin/uic
echo -e "#ifndef SPIXMAPS_H\n#define SPIXMAPS_H\n" > pixmaps.h
$UIC -embed baghira \
$imagebase/brushed-gradient \
--- baghira-0.8/style/Makefile.am.ORI 2012-11-20 20:21:23.703809116 +0100
+++ baghira-0.8/style/Makefile.am 2012-11-20 20:21:34.795590907 +0100
@@ -5,7 +5,7 @@
METASOURCES = AUTO
kde_style_LTLIBRARIES = baghira.la
baghira_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-baghira_la_LIBADD = -lkdefx -lXtst $(LIB_KDEUI)
+baghira_la_LIBADD = -lkdefx -lXtst $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
baghira_la_SOURCES = baghira.cpp optionHandler.cpp polish.cpp utils.cpp
lnkdir = $(kde_datadir)/kstyle/themes
lnk_DATA = baghira.themerc
--- baghira-0.8/kickermenu/Makefile.am.ORI 2012-11-20 20:23:35.843209238 +0100
+++ baghira-0.8/kickermenu/Makefile.am 2012-11-20 20:23:41.101105774 +0100
@@ -9,7 +9,7 @@
b_menu_panelapplet_la_METASOURCES = AUTO
b_menu_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-b_menu_panelapplet_la_LIBADD = $(LIB_KDEUI)
+b_menu_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP
messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/kmenuapplet.pot
--- baghira-0.8/sidebar/Makefile.am.ORI 2012-11-20 20:25:55.797454906 +0100
+++ baghira-0.8/sidebar/Makefile.am 2012-11-20 20:26:05.393266033 +0100
@@ -7,7 +7,7 @@
konqsidebar_baghirasidebar_la_SOURCES = baghiralinkdrag.cpp baghirasidebar.cpp linkview.cpp listboxlink.cpp dndlistbox.cpp linkconfig.ui baghirasidebariface.skel
konqsidebar_baghirasidebar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin
-konqsidebar_baghirasidebar_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE)
+konqsidebar_baghirasidebar_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI)
baghirasidebar_entry_DATA = baghirasidebar.desktop
baghirasidebar_entrydir = $(kde_datadir)/konqsidebartng/entries

@ -1,204 +0,0 @@
# 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
# Speed build options
%define debug_package %{nil}
%define __spec_install_post %{nil}
AutoReq: no
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-theme-baghira
Version: 0.8
Release: 1%{?dist}%{?_variant}
Summary: Baghira theme for Trinity
License: GPL
Group: Graphical desktop/KDE
Source0: http://prdownloads.sourceforge.net/baghira/baghira-%{version}.tar.bz2
Source1: admin-3.5.13.1.tar.gz
Patch0: baghira-3.5.13.1-fix_ftbfs.patch
Url: http://baghira.sourceforge.net/
BuildRequires: X11-devel
BuildRequires: jpeg-devel
BuildRequires: qt3-devel
BuildRequires: trinity-tdebase-devel
BuildRoot: %{_tmppath}/baghira-%{version}-buildroot
%description
Baghira is a very nice native Trinity style and windec
originally based on Mosfet's Liquid style.
This package contains non-free icons..
%package devel
Summary: Header files and static libraries from %name
Group: Development/C
Requires: %{name} = %{version}-%{release}
%description devel
Libraries and includes files for
developing programs based on %name
This package is in PLF because it contains non-free icons.
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
%prep
%setup -q -n baghira-%{version}
%setup -q -n baghira-%{version} -a 1
%patch0 -p1 -b .ftbfs
%__rm -rf admin
%__mv -f admin-3.5.13.1 admin
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i "admin/acinclude.m4.in" \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export KDEDIR=%{tde_prefix}
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_tdeincludedir} \
--datadir=%{tde_datadir} \
--with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
--disable-static \
--disable-rpath \
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT
install -d %{buildroot}/%{tde_libdir}/baghira-%{version}
install -d %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}
mv %{buildroot}/%{tde_libdir}/libbaghirastarter.la %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.la
mv %{buildroot}/%{tde_libdir}/libbaghirastarter.so %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.so.%{major}
mv %{buildroot}/%{tde_libdir}/usermanager_panelapplet.la %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.la
mv %{buildroot}/%{tde_libdir}/usermanager_panelapplet.so %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so.%{major}
mv %{buildroot}/%{tde_tdeincludedir}/baghirasidebar.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/baghirasidebar.h
mv %{buildroot}/%{tde_tdeincludedir}/baghirasidebariface.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/baghirasidebariface.h
mv %{buildroot}/%{tde_tdeincludedir}/dndlistbox.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/dndlistbox.h
mv %{buildroot}/%{tde_tdeincludedir}/linkview.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/linkview.h
mv %{buildroot}/%{tde_tdeincludedir}/listboxlink.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/listboxlink.h
ln -s libbaghirastarter.so.%{major} %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.so
ln -s usermanager_panelapplet.so.%{major} %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc README AUTHORS ChangeLog COPYING NEWS TODO
%{tde_bindir}/bab
%{tde_tdelibdir}/b_menu_panelapplet.*
%{tde_tdelibdir}/kstyle_baghira_config.*
%{tde_tdelibdir}/kwin3_baghira.*
%{tde_tdelibdir}/kwin_baghira_config.*
%{tde_tdelibdir}/plugins/styles/baghira.*
%{tde_datadir}/apps/kdisplay/color-schemes/Aqua*
#%{tde_datadir}/apps/kicker/applets/b_menuapplet.desktop
%{tde_datadir}/apps/kicker/applets/usermanager.desktop
%{tde_datadir}/apps/konqsidebartng/add/baghirasidebar_add.desktop
%{tde_datadir}/apps/konqsidebartng/entries/baghirasidebar.desktop
%{tde_datadir}/apps/kicker/applets/starter.desktop
%{tde_datadir}/apps/kstyle/themes/baghira.themerc
%{tde_datadir}/apps/kwin/baghira.desktop
%{tde_datadir}/icons/crystalsvg/*/*/baghira*
%{tde_datadir}/icons/crystalsvg/*/*/bab_*
%{tde_datadir}/apps/baghira/poof.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_down.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_hover.png
%files devel
%defattr(-,root,root)
%{tde_libdir}/baghira-%{version}/libbaghirastarter.la
%{tde_libdir}/baghira-%{version}/libbaghirastarter.so*
%{tde_tdelibdir}/konqsidebar_baghirasidebar.la
%{tde_tdelibdir}/konqsidebar_baghirasidebar.so
%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.la
%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so*
%{tde_tdeincludedir}/baghira-%{version}/baghirasidebar.h
%{tde_tdeincludedir}/baghira-%{version}/baghirasidebariface.h
%{tde_tdeincludedir}/baghira-%{version}/dndlistbox.h
%{tde_tdeincludedir}/baghira-%{version}/linkview.h
%{tde_tdeincludedir}/baghira-%{version}/listboxlink.h
%changelog
* Tue Nov 20 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1
- Initial release for TDE 3.5.13.1
* Tue Jan 8 2008 Javier Rodas <jrodas@zarb.org> 0.8-2plf2008.1
- KDE 3.5.8 version in Mandriva 2008.1
- KDE svn admin headers now packaged in Source1
* Mon Sep 18 2006 Javier Rodas <jrodas@zarb.org> 0.8-2plf2007.0
- Fix Source0 local reference
- KDE 3.5.4 admin headers are downloaded with subversion
- Fix Baghira devel package directory paths
- Fix BuildRequires
* Fri Sep 15 2006 Javier Rodas <jrodas@zarb.org> 0.8-1plf2007.0
- 0.8
- Replaced KDE admin headers in the source file (for KDE 3.5.4)
- Fix BuildRequires
- Removed the patch file
* Thu Oct 13 2005 neoclust <neoclust@mandriva.com> 0.7-1plf
- 0.7
- remove redundant buildrequires
* Mon Mar 04 2005 Nicolas L<>ureuil <neoclust@zarb.org> 0.6-3plf
- Add PLF reason
- bzipped patch
- Make rpmlint happier
* Mon Mar 04 2005 Nicolas L<>ureuil <neoclust@zarb.org> 0.6-2plf
- New version
- Fix compile ( Patch0 from Gentoo)
- Spec Cleanup
- rpmbuildupdatable
* Mon Dec 06 2004 Laurent Culioli <laurent@zarb.org> 0.6-1plf
- Initial Release.

@ -1,211 +0,0 @@
# 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
# Speed build options
%define debug_package %{nil}
%define __spec_install_post %{nil}
AutoReq: no
# TDE 3.5.13 specific building variables
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_mandir %{tde_datadir}/man
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
Name: trinity-theme-baghira
Version: 0.8
Release: 2%{?dist}%{?_variant}
Summary: Baghira theme for Trinity
License: GPL
Group: Graphical desktop/KDE
Source0: http://prdownloads.sourceforge.net/baghira/baghira-0.8.tar.bz2
Source1: admin-3.5.13.2.tar.gz
Patch0: baghira-3.5.13.1-fix_ftbfs.patch
Patch1: baghira-0.8-fix_autotools.patch
Url: http://baghira.sourceforge.net/
BuildRoot: %{_tmppath}/baghira-%{version}-buildroot
BuildRequires: qt3-devel
BuildRequires: trinity-tdebase-devel >= 3.5.13.2
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
BuildRequires: libjpeg-devel
%else
BuildRequires: X11-devel
BuildRequires: jpeg-devel
%endif
%description
Baghira is a very nice native Trinity style and windec
originally based on Mosfet's Liquid style.
This package contains non-free icons..
%package devel
Summary: Header files and static libraries from %name
Group: Development/C
Requires: %{name} = %{version}-%{release}
%description devel
Libraries and includes files for
developing programs based on %name
This package is in PLF because it contains non-free icons.
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
%prep
%setup -q -n baghira-%{version} -a 1
%patch0 -p1 -b .ftbfs
%patch1 -p1 -b .autotools
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i "admin/acinclude.m4.in" \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export KDEDIR=%{tde_prefix}
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--includedir=%{tde_tdeincludedir} \
--datadir=%{tde_datadir} \
--with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \
--disable-static \
--disable-rpath \
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%install
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT
install -d %{buildroot}/%{tde_libdir}/baghira-%{version}
install -d %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}
mv %{buildroot}/%{tde_libdir}/libbaghirastarter.la %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.la
mv %{buildroot}/%{tde_libdir}/libbaghirastarter.so %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.so.%{major}
mv %{buildroot}/%{tde_libdir}/usermanager_panelapplet.la %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.la
mv %{buildroot}/%{tde_libdir}/usermanager_panelapplet.so %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so.%{major}
mv %{buildroot}/%{tde_tdeincludedir}/baghirasidebar.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/baghirasidebar.h
mv %{buildroot}/%{tde_tdeincludedir}/baghirasidebariface.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/baghirasidebariface.h
mv %{buildroot}/%{tde_tdeincludedir}/dndlistbox.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/dndlistbox.h
mv %{buildroot}/%{tde_tdeincludedir}/linkview.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/linkview.h
mv %{buildroot}/%{tde_tdeincludedir}/listboxlink.h %{buildroot}/%{tde_tdeincludedir}/baghira-%{version}/listboxlink.h
ln -s libbaghirastarter.so.%{major} %{buildroot}/%{tde_libdir}/baghira-%{version}/libbaghirastarter.so
ln -s usermanager_panelapplet.so.%{major} %{buildroot}/%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc README AUTHORS ChangeLog COPYING NEWS TODO
%{tde_bindir}/bab
%{tde_tdelibdir}/b_menu_panelapplet.*
%{tde_tdelibdir}/kstyle_baghira_config.*
%{tde_tdelibdir}/kwin3_baghira.*
%{tde_tdelibdir}/kwin_baghira_config.*
%{tde_tdelibdir}/plugins/styles/baghira.*
%{tde_datadir}/apps/kdisplay/color-schemes/Aqua*
#%{tde_datadir}/apps/kicker/applets/b_menuapplet.desktop
%{tde_datadir}/apps/kicker/applets/usermanager.desktop
%{tde_datadir}/apps/konqsidebartng/add/baghirasidebar_add.desktop
%{tde_datadir}/apps/konqsidebartng/entries/baghirasidebar.desktop
%{tde_datadir}/apps/kicker/applets/starter.desktop
%{tde_datadir}/apps/kstyle/themes/baghira.themerc
%{tde_datadir}/apps/kwin/baghira.desktop
%{tde_datadir}/icons/crystalsvg/*/*/baghira*
%{tde_datadir}/icons/crystalsvg/*/*/bab_*
%{tde_datadir}/apps/baghira/poof.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_down.png
%{tde_datadir}/icons/crystalsvg/22x22/actions/bStarter_hover.png
%files devel
%defattr(-,root,root)
%{tde_libdir}/baghira-%{version}/libbaghirastarter.la
%{tde_libdir}/baghira-%{version}/libbaghirastarter.so*
%{tde_tdelibdir}/konqsidebar_baghirasidebar.la
%{tde_tdelibdir}/konqsidebar_baghirasidebar.so
%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.la
%{tde_libdir}/baghira-%{version}/usermanager_panelapplet.so*
%{tde_tdeincludedir}/baghira-%{version}/baghirasidebar.h
%{tde_tdeincludedir}/baghira-%{version}/baghirasidebariface.h
%{tde_tdeincludedir}/baghira-%{version}/dndlistbox.h
%{tde_tdeincludedir}/baghira-%{version}/linkview.h
%{tde_tdeincludedir}/baghira-%{version}/listboxlink.h
%changelog
* Sat Jan 19 2013 Francois Andriot <francois.andriot@free.fr> - 0.8-2
- Initial release for TDE 3.5.13.2
* Tue Nov 20 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.1
- Initial release for TDE 3.5.13.1
* Tue Jan 8 2008 Javier Rodas <jrodas@zarb.org> 0.8-2plf2008.1
- KDE 3.5.8 version in Mandriva 2008.1
- KDE svn admin headers now packaged in Source1
* Mon Sep 18 2006 Javier Rodas <jrodas@zarb.org> 0.8-2plf2007.0
- Fix Source0 local reference
- KDE 3.5.4 admin headers are downloaded with subversion
- Fix Baghira devel package directory paths
- Fix BuildRequires
* Fri Sep 15 2006 Javier Rodas <jrodas@zarb.org> 0.8-1plf2007.0
- 0.8
- Replaced KDE admin headers in the source file (for KDE 3.5.4)
- Fix BuildRequires
- Removed the patch file
* Thu Oct 13 2005 neoclust <neoclust@mandriva.com> 0.7-1plf
- 0.7
- remove redundant buildrequires
* Mon Mar 04 2005 Nicolas L<>ureuil <neoclust@zarb.org> 0.6-3plf
- Add PLF reason
- bzipped patch
- Make rpmlint happier
* Mon Mar 04 2005 Nicolas L<>ureuil <neoclust@zarb.org> 0.6-2plf
- New version
- Fix compile ( Patch0 from Gentoo)
- Spec Cleanup
- rpmbuildupdatable
* Mon Dec 06 2004 Laurent Culioli <laurent@zarb.org> 0.6-1plf
- Initial Release.
Loading…
Cancel
Save