RPM: add PCLinuxOS support

pull/3/head
Francois Andriot 12 years ago
parent e7f51ead5a
commit 32fb770ae4

@ -96,7 +96,11 @@ BuildRequires: fontconfig-devel
BuildRequires: bzip2-devel
BuildRequires: libjpeg-devel
BuildRequires: libmng-devel
%if 0%{pclinuxos}
BuildRequires: libpng-devel
%else
BuildRequires: pkgconfig(libpng15)
%endif
BuildRequires: zlib-devel
BuildRequires: nas-devel
BuildRequires: libiodbc-devel
@ -465,6 +469,9 @@ find %_docdir -maxdepth 1 -type d -name qt-3.\* -exec rm -rf {} \;
#--------------------------------------------------------------------
%if 0%{?pclinuxos}
%debug_package
%endif
%prep
%setup -q -n qt3-3.5.13.1
@ -709,7 +716,7 @@ if (! \$?QT_XFT ) then
endif
EOF
cat >> %buildroot/%_sysconfdir/profile.d/qt3.sh << EOF
cat > %buildroot/%_sysconfdir/profile.d/qt3.sh << EOF
#! /bin/bash
[ -z "\$QTDIR" ] && QTDIR="%qtdir"
[ -z "\$QTINC" ] && QTINC="%qtdir/include"

@ -56,7 +56,7 @@ It also gives information about mathematical variables and
has the user-friendly menu options of a normal TDE application.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -311,7 +311,7 @@ use any of xmms' visualisation plugins with Amarok.
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -60,7 +60,7 @@ to collect informations for a report. Those data can be shared with co-workers b
baskets to HTML.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -72,7 +72,7 @@ and lexicons) and powerful features to work with these texts (search in
texts, write own notes, save, print etc.).
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -111,7 +111,7 @@ Requires: %{name} = %{version}
%{summary}
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -52,7 +52,7 @@ This approach allows to optimize the user
interface for the task of file management.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -52,7 +52,7 @@ Filelight creates a complex, but data-rich graphical representation of the files
directories on your computer.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -60,7 +60,7 @@ Please note that this package is targeted at Trinity users and therefore provide
a way to configure it from within KControl.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -80,7 +80,7 @@ converting, and batch processing, HTML gallery and others are provided by the
KIPI image framework.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -85,7 +85,7 @@ converting, and batch processing, HTML gallery and others are provided by the
KIPI image framework.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -218,7 +218,7 @@ Requires: %{name}-libs = %{version}-%{release}
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -56,7 +56,7 @@ to a DVD5, in thesame way than DVDShrink for Microsoft Windows (R).
This is the Trinity version
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
@ -91,7 +91,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--with-extra-includes=%{tde_includedir}/tqt \
--enable-closure
%__make %{?_smp_mflags}
%__make %{?_smp_mflags} || %__make
%install

@ -67,7 +67,7 @@ This mozilla plugin launches kaffeine, the xine-based media player for KDE,
when a page containing a supported media format is loaded.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -49,7 +49,9 @@ BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
BuildRequires: %{_lib}xtst-devel
BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel
# dvb
%if 0%{?pclinuxos} == 0
BuildRequires: kernel-headers
%endif
BuildRequires: libgstreamer-devel >= 0.10
BuildRequires: libgstreamer-plugins-base-devel >= 0.10
%else
@ -169,7 +171,7 @@ Requires: %{name} = %{version}-%{release}
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
@ -192,7 +194,7 @@ Requires: %{name} = %{version}-%{release}
unset QTDIR || : ; source /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} \

@ -54,7 +54,7 @@ plugins as well, so its appearance is completely customizable. It was
inspired by Quicksilver for OS X.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -68,7 +68,7 @@ generated barcodes can be directly printed or you can export them into images
to use them in another application.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -60,7 +60,7 @@ bar a try.
Homepage: http://www.kbfx.org
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -53,7 +53,7 @@ kbookreader is an application which allows you to view eBooks
within the Trinity Desktop Environment.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -69,7 +69,7 @@ cross-links and parent/child entries in index as well as Persistent bookmarks
support. Correctly detects and shows encoding of any valid chm file.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -57,7 +57,7 @@ Requires: trinity-kdebase
%description
%{summary}
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -56,7 +56,7 @@ and various different styles.
KCPULoad has support for SMP and separate user/system loads.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -59,7 +59,7 @@ kdbusnotification is a small program for Trinity that displays
DBUS notifications via unobtrusive, easily dismissed passive popups.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -46,7 +46,7 @@ BuildRequires: trinity-tdebase-devel >= 3.5.13.1
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: trinity-pykdeextensions
BuildRequires: trinity-pytdeextensions
BuildRequires: trinity-libpythonize0-devel
BuildRequires: python-trinity
BuildRequires: chrpath
@ -82,6 +82,7 @@ Requires: PyQt
Requires: python-trinity
Requires: trinity-pytdeextensions
Requires: %{name}-backends
Requires: python
%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
@ -130,7 +131,7 @@ A power management applet to indicate battery levels and perform hibernate or
suspend using HAL.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -56,7 +56,7 @@ tune your desktop look.
Lipstik also provides Lipstik-color-schemes
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -57,7 +57,7 @@ This package is most useful when installed together with
gtk2-engines-qtcurve.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -58,7 +58,7 @@ System preferences is a replacement for the TDE
Control Centre with an improved user interface.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -53,7 +53,7 @@ KdeSudo is a graphical frontend for the sudo utility.
It allows you to run programs as another user by entering your password.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -98,7 +98,7 @@ inside any KIO enabled KDE application.
This package is part of tdesvn-trinity.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -54,7 +54,7 @@ Supports KIO on TDE (allows accessing ftp, sftp, fish, smb etc.).
Unicode & UTF-8 support
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -58,7 +58,7 @@ shell of your choice, compress it to a .tar.bz2 archive, or define your
own cleanup actions.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -53,7 +53,7 @@ that allows you to easily install, remove and change your KDM themes.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -55,7 +55,7 @@ the backup, including the frequency and the number of backups.
Homepage: http://jr.falleri.free.fr/keep
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -64,7 +64,7 @@ filesystems, chat logs, mail and data, RSS and other.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -57,7 +57,7 @@ with this KDE module/application.
This package includes the kqt3-wrapper
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -107,7 +107,7 @@ generation of bibliographies and indices and other common tasks.
Kile can support large projects consisting of several smaller files.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -53,7 +53,7 @@ frequency and fan sources in your kicker
panel.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -56,7 +56,7 @@ would in a terminal. The result is displayed just
as a directory.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -54,7 +54,7 @@ Provides a progress dialog for Safely Removing of devices in Trinity.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -49,7 +49,7 @@ TDE's KIOSK features or otherwise preconfigure TDE for
groups of users.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -1,5 +1,7 @@
--- kmplayer-3.5.13.1/src/xineplayer.cpp.ORI 2012-10-04 19:44:38.403679339 +0200
+++ kmplayer-3.5.13.1/src/xineplayer.cpp 2012-10-04 19:48:14.399221962 +0200
Index: b/src/xineplayer.cpp
===================================================================
--- a/src/xineplayer.cpp 2012-10-30 18:39:16.000000000 +0000
+++ b/src/xineplayer.cpp 2012-11-03 17:56:01.760234144 +0000
@@ -528,7 +528,11 @@
xine_event_create_listener_thread (event_queue, event_listener, NULL);
if (mrl == "cdda:/") {
@ -12,3 +14,99 @@
running = 1;
for (int i = 0; i < nr; i++) {
TQString m (mrls[i]);
@@ -863,10 +867,10 @@
case XK_p: // previous
mutex.lock ();
if (stream) {
- xine_event_t xine_event = {
- XINE_EVENT_INPUT_PREVIOUS,
- stream, 0L, 0, { 0, 0 }
- };
+ xine_event_t xine_event;
+ memset(&xine_event, 0, sizeof(xine_event));
+ xine_event.type = XINE_EVENT_INPUT_PREVIOUS;
+ xine_event.stream = stream;
xine_event_send (stream, &xine_event);
}
mutex.unlock ();
@@ -875,10 +879,10 @@
case XK_n: // next
mutex.lock ();
if (stream) {
- xine_event_t xine_event = {
- XINE_EVENT_INPUT_NEXT,
- stream, 0L, 0, { 0, 0 }
- };
+ xine_event_t xine_event;
+ memset(&xine_event, 0, sizeof(xine_event));
+ xine_event.type = XINE_EVENT_INPUT_NEXT;
+ xine_event.stream = stream;
xine_event_send (stream, &xine_event);
}
mutex.unlock ();
@@ -887,10 +891,10 @@
case XK_u: // up menu
mutex.lock ();
if (stream) {
- xine_event_t xine_event = {
- XINE_EVENT_INPUT_MENU1,
- stream, 0L, 0, { 0, 0 }
- };
+ xine_event_t xine_event;
+ memset(&xine_event, 0, sizeof(xine_event));
+ xine_event.type = XINE_EVENT_INPUT_MENU1;
+ xine_event.stream = stream;
xine_event_send (stream, &xine_event);
}
mutex.unlock ();
@@ -899,10 +903,10 @@
case XK_r: // root menu
mutex.lock ();
if (stream) {
- xine_event_t xine_event = {
- XINE_EVENT_INPUT_MENU3,
- stream, 0L, 0, { 0, 0 }
- };
+ xine_event_t xine_event;
+ memset(&xine_event, 0, sizeof(xine_event));
+ xine_event.type = XINE_EVENT_INPUT_MENU3;
+ xine_event.stream = stream;
xine_event_send (stream, &xine_event);
}
mutex.unlock ();
@@ -985,11 +989,12 @@
data.x = rect.x;
data.y = rect.y;
data.button = 0;
- xine_event_t xine_event = {
- XINE_EVENT_INPUT_MOUSE_MOVE,
- stream, &data, sizeof (xine_input_data_t),
- { 0 , 0 }
- };
+ xine_event_t xine_event;
+ memset(&xine_event, 0, sizeof(xine_event));
+ xine_event.type = XINE_EVENT_INPUT_MOUSE_MOVE;
+ xine_event.stream = stream;
+ xine_event.data = &data;
+ xine_event.data_length = sizeof (xine_input_data_t);
mutex.lock ();
xine_event_send (stream, &xine_event);
mutex.unlock ();
@@ -1023,11 +1028,12 @@
data.x = rect.x;
data.y = rect.y;
data.button = 1;
- xine_event_t xine_event = {
- XINE_EVENT_INPUT_MOUSE_BUTTON,
- stream, &data, sizeof (xine_input_data_t),
- { 0, 0 }
- };
+ xine_event_t xine_event;
+ memset(&xine_event, 0, sizeof(xine_event));
+ xine_event.type = XINE_EVENT_INPUT_MOUSE_BUTTON;
+ xine_event.stream = stream;
+ xine_event.data = &data;
+ xine_event.data_length = sizeof (xine_input_data_t);
mutex.lock ();
xine_event_send (stream, &xine_event);
mutex.unlock ();

@ -26,7 +26,7 @@
Name: trinity-%{kdecomp}
Summary: media player for Trinity
Version: 0.10.0c
Release: 3%{?dist}%{?_variant}
Release: 4%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
@ -115,7 +115,7 @@ Summary: Handbook for KMPlayer [Trinity]
Documention for KMPlayer, a basic audio/video viewer application for KDE.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
@ -141,8 +141,6 @@ unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export CXXFLAGS="${CXXFLAGS} -fpermissive"
%configure \
--prefix=%{tde_prefix} \
--exec-prefix=%{tde_prefix} \
@ -235,6 +233,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%changelog
* Sat Nov 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-4
- Fix xine 1.2 support (openSUSE 12.2 only)
* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.10.0c-3
- Initial build for TDE 3.5.13.1

@ -67,7 +67,7 @@ Requires: %{name} = %{version}-%{release}
%{summary}
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -71,7 +71,7 @@ BuildRequires: recode
BuildRequires: html2ps
BuildRequires: libofx-devel
%if 0%{?mgaversion}
%if 0%{?mgaversion} || 0%{?pclinuxos}
BuildRequires: %{_lib}OpenSP5-devel
%else
BuildRequires: opensp-devel
@ -106,7 +106,7 @@ Requires: %{name} == %{version}
This package contains development files needed for KMyMoney plugins.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
@ -135,6 +135,7 @@ unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
export KDEDIR=%{tde_prefix}
# Required to find the QT3 plugins directory
%if 0%{?mgaversion} || 0%{?mdkversion}

@ -60,7 +60,7 @@ Homepage: http://extragear.kde.org/apps/knemo/
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -57,7 +57,7 @@ styles.
KNetLoad can monitor just about any network device.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -52,7 +52,7 @@ A simple KDE network monitor that show rx/tx LEDs of any
network interface on a system tray icon
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -78,7 +78,7 @@ Requires: %{name} = %{version}-%{release}
Development headers for knetworkmanager
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -63,7 +63,7 @@ Here's a quick list of Knights' key features:
* Save your unfinished matches and play them again later.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -53,7 +53,7 @@ tree-like hierarchy. It is similar to TuxCards,
but KDE-based, and requires Trinity.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -54,7 +54,7 @@ information, presented in a nice visual format, can be invaluable on
stations using an UPS.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -68,7 +68,7 @@ BuildRequires: automake libtool
BuildRequires: freetype-devel
BuildRequires: fontconfig-devel
BuildRequires: libart_lgpl-devel
%if 0%{?mdkversion} || 0%{?mgaversion}
%if ( 0%{?mdkversion} || 0%{?mgaversion} ) && 0%{?pclinuxos} == 0
BuildRequires: %{_lib}png15-devel
%else
BuildRequires: libpng-devel
@ -121,6 +121,7 @@ BuildRequires: %{_lib}mesagl1-devel
BuildRequires: %{_lib}mesaglu1-devel
BuildRequires: %{_lib}xi-devel
BuildRequires: wv2-devel
BuildRequires: %{_lib}openjpeg-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: libGL-devel
@ -323,7 +324,7 @@ This package is part of the TDE Office Suite.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -80,7 +80,7 @@ and experienced users alike will appreciate its many features:
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -60,7 +60,7 @@ messenger Kopete. Using this plugin you can encrypt chatsessions to other
users with IM-Cients supporting the OTR encryption method.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -54,7 +54,7 @@ The environment has an editor with syntax highlighting, compiler,
simulator and export functions to VHDL, HEX and MEM files.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -57,7 +57,7 @@ software does for Windows. KPilot can back-up and restore your Palm Pilot
and synchronize the built-in applications with their KDE counterparts.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -77,7 +77,7 @@ settings for:
* notification settings
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -80,7 +80,7 @@ As KRadio is based on an extendable plugin architecture, contributions
of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -55,7 +55,7 @@ even more files in one go. The filenames can be created by parts of the original
numbering the files or accessing hundreds of informations about the file, like creation date
or Exif informations of an image.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -67,7 +67,7 @@ Almost completely customizable, Krusader is very user friendly, fast and looks
great on your desktop.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -65,7 +65,7 @@ engine by Sean Meiners <Sean.Meiners@LinspireInc.com>
Homepage: http://moodwrod.com
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -59,7 +59,7 @@ KSquirrel is a fast and convenient image viewer for KDE featuring
OpenGL and dynamic format support.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -58,7 +58,7 @@ on your harddisk and splits them up in mp3 files. KStreamRipper helps
you with managing/ripping your preferred streams.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -56,7 +56,7 @@ their computer. But it is also designed for advanced users, who want to
quickly see problems occuring on their server.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -58,7 +58,7 @@ as PIC programming in its own Basic dialect and some form of assembler.
Homepage: http://ktechlab.org/
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -55,7 +55,7 @@ certain file types (video and audio) and integration into the KDE Panel
enabling background downloading.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -54,7 +54,7 @@ displaying images as thumbnails.
Clicking on an image shows the image in its normal size.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -94,7 +94,7 @@ KVIrc is a graphical IRC client based on the KDE widget set which integrates
with the K Desktop Environment version 3.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -51,7 +51,7 @@ Virtual keyboard for KDE for use with accessibility. Application contains
a systray widget as well as a dockwidget.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -57,7 +57,7 @@ And it is of course nice to look at. Upstream says:
"- Don't forget to breathe, while drooling."
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -61,7 +61,7 @@ PICkit2 programmers, the PicStart+ programmer, and most direct programmers
are supported. A command-line programmer and debugger are also available.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -53,7 +53,7 @@ a lot more than the 4 recognized by the potrace commandline tool. Loading of
remote files (web, ftp, ...) is also supported.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -104,7 +104,7 @@ lilypond and Csound files export, etc.
This package provides the data files necessary for running Rosegarden
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -72,7 +72,7 @@ simultaneously with the certificate reading program(s) to provide single sign on
in addition to the PKCS certificate functionality
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -123,7 +123,7 @@ Requires: %{name} = %{version}-%{release}
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -77,7 +77,7 @@ transferring them to your media device.
See the 'soundkonverter-trinity' package for more information.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -53,6 +53,11 @@ BuildRequires: trinity-tdebase-devel >= 3.5.13.1
BuildRequires: desktop-file-utils
BuildRequires: gettext
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: yaz
BuildRequires: %{_lib}yaz-devel
%endif
Requires: %{name}-data = %{version}-%{release}
Requires: %{name}-scripts = %{version}-%{release}
@ -115,7 +120,7 @@ as websites. As the format of the data may change, these scripts are provided
as a separate package which can be updated through debian-volatile.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
@ -152,7 +157,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--disable-rpath \
--with-extra-includes=%{tde_includedir}/tqt
%__make %{?_smp_mflags}
%__make %{?_smp_mflags} || %__make
%install

@ -57,7 +57,7 @@ Wi-Fi settings. After a successful connection is made the settings are
remembered so next time the user won't have to enter them again.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -48,7 +48,7 @@ BuildRequires: desktop-file-utils
%description
Yakuake is a Quake-style terminal emulator based on KDE Konsole technology.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -128,7 +128,7 @@ Development files for %{name}
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -80,7 +80,7 @@ Provides: avahi-tqt-devel = %{version}-%{release}
Development files for %{name}
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -54,7 +54,7 @@ Provides: dbus-1-tqt-devel = %{version}-%{release}
%description devel
Development files for %{name}
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -58,7 +58,7 @@ Provides: dbus-tqt-devel = %{version}-%{release}
Development files for %{name}
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -66,7 +66,7 @@ Provides: libcaldav-devel = %{version}-%{release}
%description devel
%{summary}
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -64,7 +64,7 @@ Provides: libcarddav-devel = %{version}-%{release}
%description devel
%{summary}
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -66,7 +66,7 @@ Provides: tqtinterface-devel = %{version}-%{release}
%description devel
Development files for %{name}
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -125,7 +125,7 @@ Requires: %{name} = %{version}-%{release}
%{summary}.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -46,7 +46,7 @@ Requires: trinity-twin
%description
Mandriva theme for Trinity
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -189,7 +189,7 @@ Requires: trinity-kpilot
#Requires: trinity-kgtk-qt3
# Disabled applications for OPENSUSE 12.2, Mageia 2
%if 0%{?rhel} || 0%{?fedora} >= 15 || 0%{?mdkversion}
%if 0%{?rhel} || 0%{?fedora} >= 15
# no imlib1.x library
Requires: trinity-kuickshow
%endif

@ -32,7 +32,8 @@ EOF
RHEL="$( rpm -E "%{rhel}" )"
FEDORA="$( rpm -E "%{fedora}" )"
SUSE="$( rpm -E "%{suse_version}" )"
if [ "${RHEL}" = "%{rhel}" ] && [ "${FEDORA}" = "%{fedora}" ] && [ "${SUSE}" = "%{suse_version}" ]; then
PCLINUXOS="$( rpm -E "%{pclinuxos}" )"
if [ "${RHEL}" = "%{rhel}" ] && [ "${FEDORA}" = "%{fedora}" ] && [ "${SUSE}" = "%{suse_version}" ] && [ "${PCLINUXOS}" = "%{pclinuxos}" ] ; then
cat <<EOF
Error: RPM macro %rhel or %fedora must be set to the distribution version to build !
E.g:

@ -714,6 +714,7 @@ popd
unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export KDEDIR=%{tde_prefix}
export kde_htmldir="%{tde_tdedocdir}/HTML"

@ -437,7 +437,7 @@ Provides: trinity-kdeaccessibility-devel = %{version}-%{release}
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -354,12 +354,14 @@ and various local news sources.
Summary: plugins for Konqueror, the Trinity file/web/doc browser
Group: Applications/Utilities
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos} == 0
Requires: %{_lib}jpeg8
%endif
%endif
%if 0%{?rhel} || 0%{?fedora}
Requires: libjpeg
%endif
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
Requires: libjpeg62
%endif
Requires: python
@ -644,7 +646,7 @@ done
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -355,7 +355,7 @@ touch /etc/lilo.conf
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -619,7 +619,7 @@ This package is part of Trinity, and a component of the TDE artwork module.
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -74,6 +74,8 @@ Patch15: kdebase-3.5.13.1-startkde_icon.patch
Patch21: kdebase-3.5.13-kio_man_utf8.patch
## [kdebase/kdm/kfrontend] Allows to hide KDM menu button [RHEL/Fedora]
Patch30: kdebase-3.5.12-kdm_hide_menu_button.patch
## [kdebase/startkde] Fix wrong path setting
Patch31: kdebase-3.5.13.1-fix_startkde_path.patch
### Patches for RHEL4 (should not go upstream)
@ -181,6 +183,18 @@ Requires: indexhtml
%define tde_aboutpage /usr/share/mdk/about/index.html
%endif
# PCLINUXOS 2012
%if "%{?pclinuxos}" == "2012"
Requires: trinity-wallpaper-theme-default
%define tde_bg %{tde_datadir}/wallpapers/Pulse2012/contents/images/1600x1200.jpg
Requires: desktop-common-data
%define tde_starticon /usr/share/icons/pclinuxos.png
Requires: indexhtml
%define tde_aboutlabel PCLinuxOS 2012
%define tde_aboutpage /usr/share/mdk/about/index.html
%endif
# OpenSuse 12.2 Theme
%if "%{?suse_version}" == "1220"
Requires: wallpaper-branding
@ -205,7 +219,12 @@ BuildRequires: alsa-lib-devel
BuildRequires: libraw1394-devel
BuildRequires: libvorbis-devel
BuildRequires: pam-devel
%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
BuildRequires: %{_lib}usb1.0-devel
BuildRequires: %{_lib}usb-compat0.1-devel
%else
BuildRequires: libusb-devel
%endif
BuildRequires: esound-devel
BuildRequires: glib2-devel
BuildRequires: pcre-devel
@ -284,6 +303,7 @@ Requires: avahi
%endif
# NAS support
# (what is nas btw ?)
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: nas-devel
%endif
@ -1433,7 +1453,9 @@ done
# First, we read the "product" key in /etc/product.id
eval $(tr "," ";" </etc/product.id) 2>/dev/null
# Then, we create a symbolic link to the corresponding background
%__ln -sf "/usr/share/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}"
if [ -r "/usr/share/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}" ]; then
%__ln -sf "/usr/share/mdk/backgrounds/Mandriva-${product:-Free}-1280x1024-1300.jpg" "%{tde_bg}"
fi
%endif
%postun data
@ -1816,7 +1838,13 @@ Requires: xorg-x11-xinit
%endif
# Required for Fedora LiveCD
%if 0%{?rhel} || 0%{?fedora}
Provides: service(graphical-login)
%endif
# Required for Mandriva's installer
%if 0%{?mgaversion} || 0%{?mdkversion}
Provides: dm
%endif
%description -n trinity-tdm
tdm manages a collection of X servers, which may be on the local host or
@ -1869,6 +1897,12 @@ already. Most users won't need this.
%if 0%{?mgaversion} || 0%{?mdkversion}
%{_sysconfdir}/X11/wmsession.d/45TDE
%{_datadir}/X11/dm.d/45TDE.conf
%post -n trinity-tdm
%make_session
%postun -n trinity-tdm
%make_session
%endif
##########
@ -2980,7 +3014,7 @@ Konqueror libraries.
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
@ -2999,6 +3033,7 @@ Konqueror libraries.
%patch21 -p1 -b .man
%endif
%patch30 -p1 -b .xtestsupport
%patch31 -p1 -b .startkde
%if 0%{?rhel} == 4
%patch201 -p1 -b .libdetect
@ -3109,7 +3144,7 @@ cd build
%{!?with_tsak:-DBUILD_TSAK=OFF} \
..
%__make %{?_smp_mflags} || %__make
%__make %{?_smp_mflags}
%install

@ -114,17 +114,29 @@ BuildRequires: ruby-devel >= 1.8, ruby
%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
## java
%if 0%{?rhel} > 0 && 0%{?rhel} < 6
%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
BuildRequires: java-1.4.2-gcj-compat-devel
BuildRequires: libgcj-devel
BuildRequires: gcc-java
%endif
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
# PCLinuxOS use SUN's Java
%if 0%{?pclinuxos}
BuildRequires: java-1.6.0-sun
BuildRequires: java-1.6.0-sun-devel
%else
# Others use OpenJDK
BuildRequires: java-openjdk
BuildRequires: java-devel >= 1.4.2
%if 0%{?fedora} >= 17 || 0%{?suse_version} >= 1220
BuildRequires: java-1.7.0-openjdk-devel
%else
BuildRequires: java-1.6.0-openjdk-devel
%endif
%endif
%endif
@ -922,7 +934,7 @@ Development files for the TDE bindings.
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -1304,7 +1304,7 @@ Provides: trinity-kdeedu-devel = %{version}-%{release}
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -1511,7 +1511,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -53,7 +53,7 @@ BuildRequires: trinity-tdelibs-devel >= %{version}
BuildRequires: trinity-tdebase-devel >= %{version}
BuildRequires: gettext
BuildRequires: libmng-devel
%if 0%{?mdkversion}
%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
BuildRequires: %{_lib}png15-devel
%else
BuildRequires: libpng-devel
@ -1208,7 +1208,7 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -93,7 +93,11 @@ BuildRequires: hspell-devel
%define with_jasper 1
%if 0%{?suse_version}
BuildRequires: libjasper-devel
%else
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}jasper-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: jasper-devel
%endif
%endif
@ -320,7 +324,7 @@ applications for TDE.
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -94,7 +94,7 @@ BuildRequires: %{_lib}xtst-devel
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
BuildRequires: libXxf86dga-devel
BuildRequires: libXxf86vm-devel
BuildRequires: libXt-devel
@ -1076,7 +1076,7 @@ noatun plugins.
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -33,40 +33,43 @@
Name: trinity-tdenetwork
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
Release: 2%{?dist}%{?_variant}
Summary: Trinity Desktop Environment - Network Applications
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
License: GPLv2
Group: Applications/Internet
License: GPLv2
Group: Applications/Internet
Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdenetwork-3.5.13.1.tar.gz
Source1: kppp.pamd
Source2: ktalk
Source4: lisarc
Source5: lisa.redhat
Source0: kdenetwork-3.5.13.1.tar.gz
Source1: kppp.pamd
Source2: ktalk
Source4: lisarc
Source5: lisa.redhat
# RedHat/Fedora legacy patches
Patch3: kdenetwork-3.5.8-kppp.patch
Patch4: kdenetwork-3.2.3-resolv.patch
Patch3: kdenetwork-3.5.8-kppp.patch
Patch4: kdenetwork-3.2.3-resolv.patch
# include more/proper ppp headers
Patch6: kdenetwork-3.5.9-krfb_httpd.patch
Patch6: kdenetwork-3.5.9-krfb_httpd.patch
# [kdenetworks] Missing LDFLAGS cause FTBFS
# [kdenetwork] Missing LDFLAGS cause FTBFS
Patch1: kdenetwork-3.5.13-missing_ldflags.patch
# [kdenetworks] FTBFS in SMS client [Bug #1241]
# [kdenetwork] FTBFS in SMS client [Bug #1241]
Patch2: kdenetwork-3.5.13.1-fix_smsclient_ftbfs.patch
# [kdenetwork] Fix iwlib support in openSUSE
Patch7: caedf8323c45b376c824de343f31de78664b2511.patch
Patch8: kdenetwork-wifi3.diff
# RHEL4 specific
Patch201: kdenetwork-3.5.13.1-fix_rhel4_libraries.patch
BuildRequires: gettext
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
@ -146,6 +149,8 @@ Requires: jasper
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
%define with_meanwhile 1
BuildRequires: meanwhile-devel
%endif
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
BuildRequires: ortp-devel
%endif
@ -1008,8 +1013,8 @@ update-desktop-database 2> /dev/null || :
%postun -n trinity-lisa
if [ $1 -eq 0 ]; then
/sbin/chkconfig --del lisa ||:
/sbin/service lisa stop > /dev/null 2>&1 ||:
/sbin/chkconfig --del lisa ||:
fi
update-desktop-database 2> /dev/null || :
@ -1051,7 +1056,7 @@ update-desktop-database 2> /dev/null || :
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
@ -1065,6 +1070,8 @@ update-desktop-database 2> /dev/null || :
%patch3 -p1 -b .kppp
%patch4 -p1 -b .resolv
%patch6 -p1 -b .krfb_httpd
%patch7 -p1 -d cmake
%patch8 -p1
%if 0%{?rhel} == 4
%patch201 -p1 -b .rhel4
@ -1087,11 +1094,6 @@ fi
cd build
%endif
# Ugly hack for opensuse 12.2 - libiw undefined reference to 'floor' etc ...
%if 0%{?suse_version} >= 1220
export LDFLAGS="${LDFLAGS} -lm"
%endif
%cmake \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
@ -1110,7 +1112,7 @@ export LDFLAGS="${LDFLAGS} -lm"
..
# Tdenetwork is not smp safe !
%__make VERBOSE=1
%__make %{?_smp_mflags} || %__make
%install
@ -1140,7 +1142,7 @@ fi
# Show only in KDE, FIXME, need to re-evaluate these -- Rex
for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \
kwifimanager kget knewsticker ksirc kdict ; do
if [ -f %{buildroot}%{tde_datadir}/applications/kde/$i.desktop ] ; then
if [ -f %{buildroot}%{tde_tdeappdir}/$i.desktop ] ; then
echo "OnlyShowIn=KDE;" >> %{buildroot}%{tde_datadir}/applications/kde/$i.desktop
fi
done

@ -30,7 +30,7 @@ BuildRequires: gnokii-devel
Name: trinity-tdepim
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
Release: 2%{?dist}%{?_variant}
License: GPL
Group: Applications/Productivity
@ -1349,8 +1349,6 @@ installed.
%{tde_datadir}/servicetypes/dcopcalendar.desktop
%{tde_datadir}/servicetypes/korganizerpart.desktop
%{tde_datadir}/servicetypes/korgprintplugin.desktop
%{tde_tdeincludedir}/korganizer/
%{tde_tdeincludedir}/calendar/
%{tde_tdedocdir}/HTML/en/korganizer/
%post -n trinity-korganizer
@ -1380,6 +1378,8 @@ Requires: trinity-korganizer = %{version}-%{release}
%{summary}
%files -n trinity-korganizer-devel
%{tde_tdeincludedir}/korganizer/
%{tde_tdeincludedir}/calendar/
%{tde_libdir}/libkocorehelper.la
%{tde_libdir}/libkocorehelper.so
%{tde_libdir}/libkorg_stdprinting.la
@ -2085,7 +2085,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
@ -2148,10 +2148,19 @@ export PATH="%{_bindir}:${PATH}"
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} -C build
# Fix for Perl path in trinity-korganizer
# Perl is '/usr/bin/perl' not '/bin/perl'
%if 0%{?fedora} >= 17
%__sed -i %{?buildroot}%{?tde_bindir}/ical2vcal -e "s|/bin/perl|/usr/bin/perl|"
%endif
%clean
%__rm -rf %{?buildroot}
%changelog
* Sun Nov 11 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-2
- Fix korganizer packaging
* Tue Sep 25 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial build for TDE 3.5.13.1

@ -1,14 +1,3 @@
--- kdesdk/kapptemplate/CMakeLists.txt.ORI 2012-07-30 17:58:45.681535290 +0200
+++ kdesdk/kapptemplate/CMakeLists.txt 2012-07-30 17:58:55.232338294 +0200
@@ -23,7 +23,7 @@
install( PROGRAMS
${CMAKE_CURRENT_BINARY_DIR}/kapptemplate
- DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/bin )
+ DESTINATION ${BIN_INSTALL_DIR}/kapptemplate/bin )
install( FILES
kapptemplate.common kapptemplate.module
--- kdesdk/kbugbuster/kresources/CMakeLists.txt.ORI 2012-07-30 18:00:21.039575551 +0200
+++ kdesdk/kbugbuster/kresources/CMakeLists.txt 2012-07-30 18:00:25.414486000 +0200
@@ -17,6 +17,7 @@

@ -20,7 +20,7 @@
Name: trinity-tdesdk
Summary: The KDE Software Development Kit (SDK)
Version: 3.5.13.1
Release: 1%{?dist}%{?_variant}
Release: 2%{?dist}%{?_variant}
License: GPLv2
Group: User Interface/Desktops
@ -33,8 +33,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: kdesdk-3.5.13.1.tar.gz
# [tdesdk] fixes for RHEL/Fedora/MGA2 after previous patch
Patch4: kdesdk-3.5.13-misc_ftbfs.patch
# [tdesdk] Fix FTBFS on newer subversion libraries [Bug #872] [Commit #572169a2]
Patch5: kdesdk-3.5.13-fix_ftbfs_on_newer_svn.patch
# [tdesdk] Fix unknown macro 'tde_save_and_set'
@ -43,26 +41,28 @@ Patch6: kdesdk-3.5.13.1-fix_cmake_macros.patch
Patch7: kdesdk-3.5.13.1-add_missing_files.patch
# [tdesdk] Use 'flex' instead of 'lex'
Patch8: kdesdk-3.5.13.1-use_flex_instead_of_lex.patch
BuildRequires: cmake >= 2.8
BuildRequires: libtool
BuildRequires: pcre-devel
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
# [tdesdk] Fix various cmake issues [Bug #1262]
Patch9: kdesdk-3.5.13.1-fix_various_cmake_issues.patch
BuildRequires: cmake >= 2.8
BuildRequires: libtool
BuildRequires: pcre-devel
BuildRequires: trinity-tqtinterface-devel >= %{version}
BuildRequires: trinity-tdelibs-devel >= %{version}
# for kbugbuster/libkcal
BuildRequires: trinity-tdepim-devel >= %{version}
BuildRequires: trinity-tdepim-devel >= %{version}
%if 0%{?mgaversion} || 0%{?mdkversion}
#BuildRequires: %{_lib}db4.8-devel
%endif
%if 0%{?rhel} || 0%{?fedora}
BuildRequires: db4-devel
BuildRequires: db4-devel
%endif
%if 0%{?suse_version}
BuildRequires: libdb-4_8-devel
%endif
BuildRequires: desktop-file-utils
BuildRequires: desktop-file-utils
# kbabel, F-7+: flex >= 2.5.33-9
BuildRequires: flex
BuildRequires: flex
# umbrello
BuildRequires: libxslt-devel
BuildRequires: libxml2-devel
@ -73,14 +73,14 @@ BuildRequires: neon-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
BuildRequires: %{_lib}binutils-devel
%else
%endif
%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 || 0%{?suse_version}
BuildRequires: libtool-ltdl-devel
BuildRequires: binutils-devel
%endif
%endif
# KIOSLAVE
# Does not build on RHEL4
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
%define build_kioslave 1
%endif
@ -160,7 +160,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/icons/hicolor/*/apps/cervisia.png
%{tde_datadir}/icons/crystalsvg/*/actions/vcs_*.png
%{tde_datadir}/icons/crystalsvg/scalable/actions/vcs_*.svgz
#%{tde_mandir}/man1/cervisia.1*
%{tde_mandir}/man1/cervisia.1*
%{tde_tdedocdir}/HTML/en/cervisia/
%post -n trinity-cervisia
@ -197,6 +197,11 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_bindir}/kapptemplate
%{tde_datadir}/apps/kapptemplate/
%pre -n trinity-kapptemplate
if [ -d "%{tde_bindir}/kapptemplate" ]; then
rm -rf "%{tde_bindir}/kapptemplate"
fi
##########
%package -n trinity-kbabel
@ -215,7 +220,6 @@ PO-files at once. KBabelDict is a dictionary to assist with searching
for common translations.
This package is part of Trinity, and a component of the TDE SDK module.
See the 'kde-trinity' and 'tdesdk-trinity' packages for more information.
%files -n trinity-kbabel
%{tde_bindir}/catalogmanager
@ -523,8 +527,8 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_tdeincludedir}/kprofilemethod.h
%{tde_tdelibdir}/kabcformat_kdeaccounts.la
%{tde_tdelibdir}/kabcformat_kdeaccounts.so
%{tde_tdelibdir}/scheck.so
%{tde_tdelibdir}/scheck.la
%{tde_tdelibdir}/plugins/styles/scheck.so
%{tde_tdelibdir}/plugins/styles/scheck.la
%{tde_datadir}/apps/kabc/formats/kdeaccountsplugin.desktop
%{tde_datadir}/apps/kstyle/themes/scheck.themerc
%{tde_datadir}/kdepalettes/
@ -656,10 +660,10 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_bindir}/kminspector
%{tde_bindir}/kmmatch
%{tde_bindir}/kmtrace
#%{tde_tdeincludedir}/ktrace.h
%{tde_tdeincludedir}/ktrace.h
%{tde_libdir}/kmtrace/libktrace.la
%{tde_libdir}/kmtrace/libktrace.so
%{tde_libdir}/libktrace_s.a
%{tde_libdir}/kmtrace/libktrace_s.a
%{tde_datadir}/apps/kmtrace/kde.excludes
##########
@ -679,7 +683,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_bindir}/kompare
%{tde_libdir}/libkompareinterface.la
%{tde_libdir}/libkompareinterface.so
#%{tde_libdir}/libkompareinterface.so.*
%{tde_libdir}/libkompareinterface.so.*
%{tde_tdelibdir}/libkomparenavtreepart.la
%{tde_tdelibdir}/libkomparenavtreepart.so
%{tde_tdelibdir}/libkomparepart.la
@ -778,7 +782,7 @@ for f in hicolor locolor ; do
done
%postun -n trinity-kuiviewer
for f in crystalsvg hicolor locolor ; do
for f in hicolor locolor ; do
touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
done
@ -1029,7 +1033,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_bindir}/kunittestguimodrunner
%{tde_libdir}/libkunittestgui.la
%{tde_libdir}/libkunittestgui.so
#%{tde_libdir}/libkunittestgui.so.*
%{tde_libdir}/libkunittestgui.so.*
%{tde_tdeincludedir}/kunittest/runnergui.h
%post -n trinity-kunittest
@ -1057,7 +1061,7 @@ Provides: trinity-kdesdk-devel = %{version}-%{release}
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
@ -1066,12 +1070,12 @@ Provides: trinity-kdesdk-devel = %{version}-%{release}
%prep
%setup -q -n kdesdk-3.5.13.1
%patch4 -p1 -b .ftbfs
%patch5 -p1 -b .svn
%patch6 -p1 -b .cmake
%patch7 -p1
%patch8 -p1 -b .flex
%patch9 -p1 -b .cmake
%build
unset QTDIR || :; . /etc/profile.d/qt3.sh
@ -1094,7 +1098,7 @@ cd build
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DMAN_INSTALL_DIR=%{tde_mandir}/man1 \
-DMAN_INSTALL_DIR=%{tde_mandir} \
-DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-DCMAKE_SKIP_RPATH="OFF" \
@ -1104,7 +1108,7 @@ cd build
%{!?build_kioslave:-DBUILD_KIOSLAVE=OFF} \
..
%__make %{?_smp_mflags} || %__make
%__make %{?_smp_mflags}
%install
@ -1148,14 +1152,10 @@ fi
%__rm -rf %{buildroot}
# trick to replace a dir by a symlink -- Rex
%pre
if [ $1 -gt 0 -a ! -L %{_docdir}/HTML/en/cervisia/common ]; then
rm -rf %{tde_tdedocdir}/HTML/en/cervisia/common ||:
fi
%changelog
* Wed Nov 07 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-2
- Fix various cmake issues [Bug #1262]
* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1
- Initial build for TDE 3.5.13.1

@ -368,7 +368,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -916,7 +916,7 @@ Development files for %{name}.
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -546,7 +546,7 @@ Provides: trinity-kdevelop-libs = %{version}-%{release}
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -467,7 +467,7 @@ Requires: trinity-kommander-devel = %{version}-%{release}
##########
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -79,7 +79,7 @@ libkdcraw-devel contains development files and documentation. The
library documentation is available on kdcraw.h header file.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -75,7 +75,7 @@ library. The library documentation is available on kexiv2.h header file.
Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -85,7 +85,7 @@ This package contains development files and documentation for libkipi library.
Homepage: http://www.kipi-plugins.org/
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -54,10 +54,12 @@ BuildRequires: djvulibre
# XMEDCON support
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos} == 0
%define with_xmedcon 1
BuildRequires: xmedcon
BuildRequires: xmedcon-devel
%endif
%endif
# RSVG support
%if 0%{?fedora} || 0%{?rhel}
@ -102,7 +104,7 @@ Requires: %{name}
Tools for KSquirrel.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif

@ -102,7 +102,7 @@ to support the creation and installation of KDE applications.
This package contains the libpythonize development files.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
@ -120,7 +120,9 @@ for f in src/*.py; do
-e "s|/usr/lib/pyshared/python\*|%{python_sitearch}|g" \
-e "s|'pykde-dir=',None,|'pykde-dir=','%{python_sitearch}',|g" \
-e "s|self.pykde_dir = None|self.pykde_dir = \"%{python_sitearch}\"|g" \
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g"
-e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
-e "s|%{tde_includedir}/kde|%{tde_tdeincludedir}|g" \
-e 's|"/kde"|"/tde"|'
done
%build
@ -128,6 +130,7 @@ unset QTDIR; . /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
export KDEDIR=%{tde_prefix}
%__mkdir_p build
./setup.py build_libpythonize

@ -105,7 +105,7 @@ General documentation and examples for PyKDE providing programming
tips and working code you can use to learn from.
%if 0%{?suse_version}
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
@ -136,11 +136,15 @@ export PYTHONPATH=%{python_sitearch}/trinity-sip:%{python_sitearch}/trinity-PyQt
-L %{_lib} \
-v %{_datadir}/sip/trinity
%if 0%{?mgaversion} || 0%{?mdkversion}
# Shitty hack to add LDFLAGS
%if 0%{?mgaversion} || 0%{?mdkversion}
%__sed -i */Makefile \
%if 0%{?pclinuxos}
-e "/^LIBS = / s|$| -lpython2.6 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
%else
-e "/^LIBS = / s|$| -lpython2.7 -lDCOP -lkdecore -lkdefx -lkdeui -lkresources -lkabc -lkparts -lkio|"
%endif
%endif
%__make %{_smp_mflags}

Loading…
Cancel
Save