summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-08-03 13:59:43 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-08-03 13:59:43 +0200
commitbe9f9f70d960e0789e024c8285dc681302c3c3f1 (patch)
treebc4c568eb13a62af120ba51f9145337541b35be3
parent1f76bf54b70463addf27bc503bb58af60dc8ae58 (diff)
downloadtde-packaging-be9f9f70d960e0789e024c8285dc681302c3c3f1.tar.gz
tde-packaging-be9f9f70d960e0789e024c8285dc681302c3c3f1.zip
RHEL/Fedora: adds support for Mandriva 2011 in packaging
-rw-r--r--mageia/dependencies/qt3/qt3.spec5
-rw-r--r--redhat/applications/abakus/trinity-abakus-3.5.13.spec63
-rw-r--r--redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch47
-rw-r--r--redhat/applications/kaffeine/kaffeine-3.5.13-work_around_xine_crash.patch14
-rw-r--r--redhat/applications/kaffeine/trinity-kaffeine.spec222
-rwxr-xr-xredhat/dependencies/arts/trinity-arts-3.5.13.spec35
-rw-r--r--redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec25
-rw-r--r--redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec20
-rw-r--r--redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec17
-rw-r--r--redhat/dependencies/libcaldav/libcaldav-0.6.2-fix_installation.patch24
-rw-r--r--redhat/dependencies/libcaldav/libcaldav.spec39
-rw-r--r--redhat/dependencies/libcarddav/libcarddav-0.6.5-fix_installation.patch24
-rw-r--r--redhat/dependencies/libcarddav/libcarddav.spec37
-rwxr-xr-xredhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec20
-rw-r--r--redhat/extras/akode/akode-cflags.patch10
-rw-r--r--redhat/extras/akode/trinity-akode.spec21
-rw-r--r--redhat/extras/libkarma/trinity-libkarma.spec140
-rw-r--r--redhat/extras/trinity-live/tperl.spec25
-rwxr-xr-xredhat/genrpm.sh11
-rw-r--r--redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec44
-rw-r--r--redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec18
-rw-r--r--redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec55
-rw-r--r--redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec38
-rw-r--r--redhat/kdebase/pamd.kcheckpass-trinity.mdv2011.05
-rw-r--r--redhat/kdebase/pamd.kdm-trinity-np.mdv2011.07
-rw-r--r--redhat/kdebase/pamd.kdm-trinity.mdv2011.08
-rw-r--r--redhat/kdebase/pamd.kscreensaver-trinity.mdv2011.05
-rw-r--r--redhat/kdebase/trinity-kdebase-3.5.13.spec174
-rw-r--r--redhat/kdebindings/kdebindings-3.5.13-fix_dcopc_header_location.patch12
-rw-r--r--redhat/kdebindings/trinity-kdebindings-3.5.13.spec33
-rw-r--r--redhat/kdeedu/trinity-kdeedu-3.5.13.spec18
-rw-r--r--redhat/kdegames/trinity-kdegames-3.5.13.spec14
-rw-r--r--redhat/kdegraphics/kdegraphics-3.5.13-disable_kuickshow_doc.patch10
-rw-r--r--redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec55
-rwxr-xr-xredhat/kdelibs/trinity-kdelibs-3.5.13.spec40
-rw-r--r--redhat/kdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch2
-rw-r--r--redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec36
-rw-r--r--redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec23
-rw-r--r--redhat/kdepim/kdepim-3.5.13-fix_include_directory.patch219
-rw-r--r--redhat/kdepim/trinity-kdepim-3.5.13.spec38
-rw-r--r--redhat/kdesdk/trinity-kdesdk-3.5.13.spec26
-rw-r--r--redhat/kdetoys/trinity-kdetoys-3.5.13.spec19
-rwxr-xr-xredhat/kdeutils/trinity-kdeutils-3.5.13.spec17
-rw-r--r--redhat/kdevelop/trinity-kdevelop-3.5.13.spec26
-rw-r--r--redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec15
45 files changed, 1146 insertions, 610 deletions
diff --git a/mageia/dependencies/qt3/qt3.spec b/mageia/dependencies/qt3/qt3.spec
index c6b0deb7b..bb109270a 100644
--- a/mageia/dependencies/qt3/qt3.spec
+++ b/mageia/dependencies/qt3/qt3.spec
@@ -27,7 +27,7 @@
Name: qt3
Version: 3.3.8.d
-Release: %mkrel 1
+Release: %mkrel 1%{?dist}
License: GPLv3+ and QPL
Summary: Qt3 Sources
Group: System/Libraries
@@ -99,6 +99,7 @@ BuildRequires: libiodbc-devel
%if "%{_lib}" != "lib"
BuildRequires: linux32
%endif
+BuildRequires: postgresql-devel
%description
Qt is a complete and well-designed multi-platform object-oriented framework for
@@ -237,7 +238,7 @@ This package contains:
Summary: Config, language file for Qt
Group: Development/KDE and Qt
Requires: %libqt3name = %version
-Obsoletes: libqt3-common
+Obsoletes: libqt3-common < %{version}-%{release}
Provides: libqt3-common = %{version}-%{release}
# Laurent : allow to install package which use this provides (commercial packages which want to install under distro and used this provides
Provides: qt = %{version}-%{release}
diff --git a/redhat/applications/abakus/trinity-abakus-3.5.13.spec b/redhat/applications/abakus/trinity-abakus-3.5.13.spec
index f10531769..b73e50c1e 100644
--- a/redhat/applications/abakus/trinity-abakus-3.5.13.spec
+++ b/redhat/applications/abakus/trinity-abakus-3.5.13.spec
@@ -1,25 +1,30 @@
# Default version for this component
%define kdecomp abakus
-%define version 0.91
-%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{_datadir}/doc
%endif
# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
Name: trinity-%{kdecomp}
Summary: Calculator for TDE
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
+Version: 0.91
+Release: 3%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -28,14 +33,14 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
-BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: tqtinterface-devel >= 3.5.13
+BuildRequires: trinity-tdelibs-devel >= 3.5.13
+BuildRequires: trinity-tdebase-devel >= 3.5.13
BuildRequires: desktop-file-utils
BuildRequires: scons
BuildRequires: bison
@@ -51,19 +56,21 @@ has the user-friendly menu options of a normal TDE application.
%setup -q -n applications/%{kdecomp}
%build
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
-export CXXFLAGS="-I%{_includedir}/tqt"
+unset QTDIR; . /etc/profile.d/qt.sh
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+export CXXFLAGS="-I%{tde_includedir}/tqt"
+# We are using a specific (non-autotool) configure script.
./configure
%__make %{?_smp_mflags}
%install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}%{_prefix}
+%__make install DESTDIR=%{buildroot}%{tde_prefix}
%clean
@@ -71,22 +78,22 @@ export PATH="%{_bindir}:${PATH}"
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/apps/*/
-%{_datadir}/icons/hicolor/*/*/*
-%{tde_docdir}/HTML/*/*/
-%{_datadir}/applnk/Utilities/abakus.desktop
+%{tde_bindir}/abakus
+%{tde_datadir}/apps/abakus/
+%{tde_datadir}/icons/hicolor/*/apps/abakus.png
+%{tde_tdedocdir}/HTML/en/abakus/
+%{tde_datadir}/applnk/Utilities/abakus.desktop
%Changelog
* Wed Apr 25 2012 Francois Andriot <francois.andriot@free.fr> - 0.91-3
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch
index 144e4bb1c..f4473d621 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch
@@ -41,49 +41,6 @@ index 2b1d2e7..57b9254 100644
* @return 0 on success, -1 on failure.
*/
typedef int (*en50221_app_auth_request_callback) (void *arg,
-diff --git a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_teletext.h b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_teletext.h
-index b5b85f1..ce6ef42 100644
---- a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_teletext.h
-+++ b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_teletext.h
-@@ -42,7 +42,7 @@ extern "C" {
- * @param slot_id Slot id concerned.
- * @param session_number Session number concerned.
- * @param teletext_data Data for the request.
-- * @param teletext_data_lenghth Number of bytes.
-+ * @param teletext_data_length Number of bytes.
- * @return 0 on success, -1 on failure.
- */
- typedef int (*en50221_app_teletext_callback) (void *arg,
-diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
-index 2294956..6679b97 100644
---- a/kaffeine/src/kaffeine.cpp
-+++ b/kaffeine/src/kaffeine.cpp
-@@ -238,13 +238,13 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
- }
- #endif
-
-- /** KWin are you there? **/
-+ /** TWin are you there? **/
-
- m_haveKWin = KApplication::dcopClient()->isApplicationRegistered("twin");
- if (m_haveKWin)
-- kdDebug() << "Window manager: KWin found" << endl;
-+ kdDebug() << "Window manager: TWin found" << endl;
- else
-- kdDebug() << "Window manager: not KWin - using save fullscreen mode" << endl;
-+ kdDebug() << "Window manager: not TWin - using save fullscreen mode" << endl;
-
- connect(&m_screensaverTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotFakeKeyEvent()));
- m_screensaverTimer.start( 55000 );
-@@ -1261,7 +1261,7 @@ void Kaffeine::mouseDoubleClickEvent(TQMouseEvent*)
- void Kaffeine::mousePressEvent(TQMouseEvent* mev)
- {
- kdDebug() << "Kaffeine: Mouse press event" << endl;
-- if ( m_minimal->isChecked() && !m_fullscreen->isChecked() && (mev->button() == Qt::MidButton) ) {
-+ if ( m_minimal->isChecked() && !m_fullscreen->isChecked() && (mev->button() == MidButton) ) {
- if (topDock()->isVisible()) {
- hideToolbars(true);
- //menuBar()->hide;
diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
index 8d85e01..e8148a7 100644
--- a/kaffeine/src/kmultitabbar.cpp
@@ -128,9 +85,9 @@ diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h
index 72fa884..2932cc2 100644
--- a/kaffeine/src/kmultitabbar.h
+++ b/kaffeine/src/kmultitabbar.h
-@@ -55,16 +55,16 @@ class /*KUTILS_EXPORT*/ KMultiTabBar: public TQWidget
+@@ -55,16 +55,16 @@
Q_OBJECT
-
+ TQ_OBJECT
public:
- enum KMultiTabBarMode{Horizontal,Vertical};
+ enum KMultiTabBarMode{Horizontal, Vertical};
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-work_around_xine_crash.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-work_around_xine_crash.patch
deleted file mode 100644
index 51948d795..000000000
--- a/redhat/applications/kaffeine/kaffeine-3.5.13-work_around_xine_crash.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-commit 508cb342d8f88e9a1d25d6aec78a43b7050b4e85
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: 1330032748 -0600
-
- Work around Xine crash when displaying still logo image by creating a small movie file to replace it
- This closes Bug 559
-
-diff --git a/kaffeine/images/logo b/kaffeine/images/logo
-index f3d53e2..7b76dfe 100644
-Binary files a/kaffeine/images/logo and b/kaffeine/images/logo differ
-diff --git a/kaffeine/images/logo.still b/kaffeine/images/logo.still
-new file mode 100644
-index 0000000..f3d53e2
-Binary files /dev/null and b/kaffeine/images/logo.still differ
diff --git a/redhat/applications/kaffeine/trinity-kaffeine.spec b/redhat/applications/kaffeine/trinity-kaffeine.spec
index 41669667a..a58b57375 100644
--- a/redhat/applications/kaffeine/trinity-kaffeine.spec
+++ b/redhat/applications/kaffeine/trinity-kaffeine.spec
@@ -1,27 +1,31 @@
# Default version for this component
%define kdecomp kaffeine
-%define version 0.8.8
-%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{_datadir}/doc
-%define _mandir %{_datadir}/man
%endif
# TDE 3.5.13 specific building variables
-BuildRequires: autoconf automake libtool m4
-%define tde_docdir %{_docdir}/kde
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/trinity
+%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}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
Name: trinity-%{kdecomp}
-Summary: Xine-based media player
+Summary: Xine-based media player
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
+Version: 0.8.8
+Release: 3%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Multimedia
@@ -45,34 +49,54 @@ Patch3: kaffeine-3.5.13-rename_obsolete_tq_methods.patch
Patch4: kaffeine-3.5.13-renames_a_few_stragglers.patch
# [kaffeine] Error out if critical OSD-related defines are not set [Commit #25b89439]
Patch5: kaffeine-3.5.13-error_out_if_critical_osd_defines_not_set.patch
-# [kaffeine] Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #559, #511] [Commit #508cb342]
-Patch6: kaffeine-3.5.13-work_around_xine_crash.patch
# [kaffeine] Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899] [Commit #fd68e4c4]
-Patch7: kaffeine-3.5.13-fix_slow_dvb_start.patch
+Patch6: kaffeine-3.5.13-fix_slow_dvb_start.patch
# [kaffeine] Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $TDEHOME/tmp-$HOSTNAME. [Commit #b480e3db]
-Patch8: kaffeine-3.5.13-fix_temporary_location.patch
+Patch7: kaffeine-3.5.13-fix_temporary_location.patch
# [kaffeine] Fix typos, branding, and inadvertent tqt changes. [Commit #0e3d0ed6]
-Patch9: kaffeine-3.5.13-fix_typos_branding_tqt.patch
+Patch8: kaffeine-3.5.13-fix_typos_branding_tqt.patch
# [kaffeine] Fix installation of localization files [Bug #858]
-Patch10: kaffeine-3.5.13-fix_localization_files.patch
+Patch9: kaffeine-3.5.13-fix_localization_files.patch
+# [kaffeine] Added automake initialization with proper program name and version [Bug #858] [Commit #4e982fa3]
+Patch10: kaffeine-3.5.13-fix_program_name.patch
+# [kaffeine] Fixed online hyperlink to win32 codecs download location. [Commit #5086f358]
+Patch11: kaffeine-3.5.13-fix_win32_codec_url.patch
+# [kaffeine] Missing LDFLAGS cause FTBFS under MGA2/MDV2011
+Patch12: kaffeine-3.5.13-missing_ldflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
BuildRequires: trinity-kdelibs-devel
-BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
-BuildRequires: xine-lib-devel
-BuildRequires: libXext-devel libXinerama-devel libXtst-devel
BuildRequires: libcdio-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: libcdda-devel
+BuildRequires: %{_lib}xine-devel
+BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
+BuildRequires: %{_lib}xtst-devel
+BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel
+# dvb
+BuildRequires: kernel-headers
+BuildRequires: libgstreamer-devel >= 0.10
+BuildRequires: libgstreamer-plugins-base-devel >= 0.10
+%else
+BuildRequires: cdparanoia-devel cdparanoia
+BuildRequires: xine-lib-devel
+BuildRequires: libXext-devel
+BuildRequires: libXtst-devel
+BuildRequires: libXinerama-devel
+# dvb
+BuildRequires: glibc-kernheaders
+BuildRequires: gstreamer-devel >= 0.10
+BuildRequires: gstreamer-plugins-base-devel >= 0.10
+%endif
+
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
BuildRequires: libxcb-devel
%endif
-# dvb
-BuildRequires: glibc-kernheaders
-BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
Requires: %{name}-libs = %{version}-%{release}
@@ -84,24 +108,81 @@ Additionally, Kaffeine is fully integrated in KDE, it supports drag
and drop and provides an editable playlist, a bookmark system, a
Konqueror plugin, OSD and much more.
+%files -f %{kdecomp}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README TODO
+%{tde_bindir}/kaffeine
+%{tde_libdir}/libkaffeinepart.so
+%{tde_tdelibdir}/lib*.*
+%{tde_datadir}/appl*/*/*.desktop
+%{tde_datadir}/apps/gstreamerpart/
+%{tde_datadir}/apps/kaffeine/
+%{tde_datadir}/apps/konqueror/servicemenus/*.desktop
+%{tde_datadir}/apps/profiles/
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_datadir}/mimelnk/*/*.desktop
+%{tde_datadir}/service*/*.desktop
+%{tde_tdedocdir}/HTML/en/kaffeine
+%{tde_mandir}/*/*
+
+%post
+touch --no-create %{tde_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+/sbin/ldconfig || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
+/sbin/ldconfig || :
+
+##########
+
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: trinity-kdelibs-devel
+Requires: %{name}-libs = %{version}-%{release}
+Requires: trinity-tdelibs-devel
+
%description devel
%{summary}.
+%files devel
+%defattr(-,root,root,-)
+%{tde_tdeincludedir}/kaffeine/
+%{tde_libdir}/lib*.so
+%exclude %{tde_libdir}/libkaffeinepart.so
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
+
+##########
+
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
-# helps multilib upgrades
-Obsoletes: %{name} < %{version}-%{release}
+
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
+
%description libs
%{summary}.
+%files libs
+%defattr(-,root,root,-)
+%{tde_libdir}/lib*.so.*
+
+%post libs
+/sbin/ldconfig || :
+
+%postun libs
+/sbin/ldconfig || :
+
+##########
%prep
@@ -110,24 +191,40 @@ Requires: %{name} = %{version}-%{release}
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1 -b .ftbfs
# 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|%{_includedir}/tqt|g" \
- -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f admin/Makefile.common
+%__make -f "admin/Makefile.common"
%build
unset QTDIR || : ; source /etc/profile.d/qt.sh
-export PATH="%{_bindir}:${PATH}"
-export LDFLAGS="-L%{_libdir} -I%{_includedir}"
+export PATH="%{tde_bindir}:${PATH}"
+export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ --mandir=%{tde_mandir} \
--enable-new-ldflags \
--disable-debug --disable-warnings \
--disable-dependency-tracking --enable-final \
@@ -135,7 +232,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
--with-xinerama \
--with-gstreamer \
--without-lame \
- --with-extra-includes=%{_includedir}/tqt \
+ --with-extra-includes=%{tde_includedir}/tqt \
--with-extra-libs=%{_prefix}/%{_lib} \
--enable-closure \
%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
@@ -147,7 +244,7 @@ export LDFLAGS="-L%{_libdir} -I%{_includedir}"
%install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT
@@ -172,62 +269,23 @@ done
fi
# Unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
+rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
+rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-%__install -D -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/apps/kaffeine/logo
-%__install -D -m 644 %{SOURCE2} %{?buildroot}%{_mandir}/man1/kaffeine.1
+%__install -D -m 644 %{SOURCE1} %{?buildroot}%{tde_datadir}/apps/kaffeine/logo
+%__install -D -m 644 %{SOURCE2} %{?buildroot}%{tde_mandir}/man1/kaffeine.1
%clean
rm -rf $RPM_BUILD_ROOT
-%post
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-/sbin/ldconfig || :
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-
-%files -f %{kdecomp}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
-%{_bindir}/kaffeine
-%{_libdir}/libkaffeinepart.so
-%{tde_libdir}/lib*.*
-%{_datadir}/appl*/*/*.desktop
-%{_datadir}/apps/gstreamerpart/
-%{_datadir}/apps/kaffeine/
-%{_datadir}/apps/konqueror/servicemenus/*.desktop
-%{_datadir}/apps/profiles/
-%{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/service*/*.desktop
-%{tde_docdir}/HTML/en/kaffeine
-%{_mandir}/*/*
-
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/kaffeine/
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkaffeinepart.so
-
%changelog
+* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-3
+- Add support for Mageia 2 and Mandriva 2011
+- Added automake initialization with proper program name and version [Bug #858] [Commit #4e982fa3]
+- Fixed online hyperlink to win32 codecs download location. [Commit #5086f358]
+
* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-2
- Rebuilt for Fedora 17
- Adds more patches from GIT.
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index 12b0b19e6..9b42341fe 100755
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
@@ -1,13 +1,15 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-%define tde_bindir %{_prefix}/bin
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_bindir %{tde_prefix}/bin
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
-%define _docdir %{_prefix}/share/doc
+%define tde_tdeincludedir %{tde_includedir}/kde
+
+%define _docdir %{tde_prefix}/share/doc
Name: trinity-arts
Version: 3.5.13
@@ -20,7 +22,7 @@ Vendor: Trinity Project
URL: http://www.trinitydesktop.org/
Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: arts-%{version}.tar.gz
@@ -39,7 +41,7 @@ BuildRequires: gsl-devel
BuildRequires: libvorbis-devel
BuildRequires: esound-devel
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}jack-devel
BuildRequires: %{_lib}ltdl-devel
%else
@@ -53,7 +55,7 @@ BuildRequires: cmake >= 2.8
Requires: tqtinterface
Requires: audiofile
-%if "%{?_prefix}" == "/usr"
+%if "%{?tde_prefix}" == "/usr"
Obsoletes: arts
%endif
@@ -90,9 +92,15 @@ Development files for %{name}
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-%{?!mgaversion:%__mkdir build; cd build}
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
%cmake \
- -DINCLUDE_INSTALL_DIR=%{tde_includedir}/arts \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir}/arts \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-DWITH_ALSA=ON \
@@ -123,7 +131,6 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%{tde_libdir}/mcop/*.mcopclass
%{tde_libdir}/mcop/*.mcoptype
%{tde_libdir}/lib*.so.*
-%{tde_libdir}/lib*.la
%{tde_bindir}/artscat
%{tde_bindir}/artsd
%{tde_bindir}/artsdsp
@@ -131,12 +138,14 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%{tde_bindir}/artsrec
%{tde_bindir}/artsshell
%{tde_bindir}/artswrapper
+# The '.la' files are runtime, not devel !
+%{tde_libdir}/lib*.la
%files devel
%defattr(-,root,root,-)
%{tde_bindir}/mcopidl
-%dir %{tde_includedir}
-%{tde_includedir}/*/
+%{tde_tdeincludedir}/arts/
+%{tde_includedir}/artsc/
%{tde_bindir}/artsc-config
%{tde_libdir}/lib*.so
%{tde_libdir}/pkgconfig/*.pc
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
index 938db048f..2c9c763cf 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-3.5.13.spec
@@ -1,15 +1,15 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_includedir %{_prefix}/include
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_includedir %{tde_prefix}/include
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_tdedocdir %{tde_docdir}/kde
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_libdir %{tde_prefix}/%{_lib}
Name: avahi-tqt
@@ -23,7 +23,7 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}.tar.gz
@@ -35,9 +35,10 @@ BuildRequires: tqtinterface-devel >= 3.5.13
BuildRequires: gettext-devel
BuildRequires: dbus-devel
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
-BuildRequires: %{_lib}expat1-devel
+# On Mageia 2, package is 'lib64expat1-devel', but on Mandriva, 'lib64expat-devel'
+BuildRequires: %{_lib}expat%{?mgaversion:1}-devel
Provides: %{_lib}avahi-qt3
%else
BuildRequires: avahi-devel
@@ -58,7 +59,7 @@ Requires: %{name}
Summary: %{name} - Development files
Group: Development/Libraries
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
Provides: %{_lib}avahi-qt3-devel
%endif
@@ -89,7 +90,7 @@ export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
./autogen.sh
%configure \
- --exec-prefix=%{_prefix} \
+ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--docdir=%{tde_docdir} \
@@ -105,6 +106,9 @@ export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot}
+# Removes '.a' file
+%__rm -f %{?buildroot}%{tde_libdir}/libavahi-tqt.a
+
%clean
%__rm -rf %{?buildroot}
@@ -117,7 +121,6 @@ export CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
%{tde_libdir}/*.so
%{tde_libdir}/*.la
%{tde_libdir}/pkgconfig/*.pc
-%exclude %{tde_libdir}/libavahi-tqt.a
%changelog
* Mon Jul 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
index fbbb1c381..38fff184a 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.spec
@@ -1,11 +1,11 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-%define tde_bindir %{_prefix}/bin
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_bindir %{tde_prefix}/bin
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
Name: dbus-1-tqt
Version: 3.5.13
@@ -17,14 +17,14 @@ Group: System Environment/Libraries
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}.tar.gz
BuildRequires: gcc-c++
BuildRequires: dbus-devel
-BuildRequires: tqtinterface-devel
+BuildRequires: tqtinterface-devel >= 3.5.13
# TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8
@@ -52,8 +52,13 @@ Development files for %{name}
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-%{?!mgaversion:%__mkdir build; cd build}
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
%cmake \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
..
@@ -63,7 +68,6 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%install
%__rm -rf %{?buildroot}
-%__mkdir_p %{?buildroot}%{_includedir}
%__make install DESTDIR=%{?buildroot} -C build
%clean
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
index 40247558e..20f0ad55b 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec
@@ -1,10 +1,10 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
Name: dbus-tqt
Version: 3.5.13
@@ -16,14 +16,14 @@ Group: System Environment/Libraries
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}.tar.gz
BuildRequires: gcc-c++
BuildRequires: dbus-devel
-BuildRequires: tqtinterface-devel
+BuildRequires: tqtinterface-devel >= 3.5.13
# TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8
@@ -53,7 +53,11 @@ Development files for %{name}
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-%{?!mgaversion:%__mkdir build; cd build}
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
%cmake \
-DINCLUDE_INSTALL_DIR=%{tde_includedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
@@ -64,7 +68,6 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%install
%__rm -rf %{?buildroot}
-%__mkdir_p %{?buildroot}%{_includedir}
%__make install DESTDIR=%{?buildroot} -C build
%clean
diff --git a/redhat/dependencies/libcaldav/libcaldav-0.6.2-fix_installation.patch b/redhat/dependencies/libcaldav/libcaldav-0.6.2-fix_installation.patch
new file mode 100644
index 000000000..e1eb18ebf
--- /dev/null
+++ b/redhat/dependencies/libcaldav/libcaldav-0.6.2-fix_installation.patch
@@ -0,0 +1,24 @@
+--- libcaldav-0.6.5/libcaldav.pc.in.ORI 2012-08-02 23:25:37.149283733 +0200
++++ libcaldav-0.6.5/libcaldav.pc.in 2012-08-02 23:25:45.356339277 +0200
+@@ -3,8 +3,8 @@
+ libdir=@libdir@
+ includedir=@includedir@
+
+-pkglibdir=${libdir}/@PACKAGE@
+-pkgincludedir=${includedir}/@PACKAGE@
++pkglibdir=${libdir}
++pkgincludedir=${includedir}
+
+ Name: libcaldav
+ Description: libcaldav is a client library for CalDAV
+--- libcaldav-0.6.5/src/Makefile.am.ORI 2012-08-02 23:33:27.804972833 +0200
++++ libcaldav-0.6.5/src/Makefile.am 2012-08-02 23:33:35.460457142 +0200
+@@ -37,7 +37,7 @@
+ get-freebusy-report.c \
+ get-freebusy-report.h
+
+-libcaldav_includedir=$(includedir)/libcaldav-@VERSION@
++libcaldav_includedir=$(includedir)
+ libcaldav_include_HEADERS = caldav.h
+
+ noinst_HEADERS = \
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index f75aa3119..55d1fd70b 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -1,12 +1,12 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-%define tde_datadir %{_prefix}/share
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
Name: trinity-libcaldav
Version: 0.6.5
@@ -20,10 +20,14 @@ License: GPL
Group: System Environment/Libraries
Summary: A client library that adds support for the CalDAV protocol (rfc4791).
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: libcaldav_0.6.5-2debian2.tar.gz
+# [libcaldav] Fix messy installation directories
+Patch1: libcaldav-0.6.2-fix_installation.patch
+
BuildRequires: libtool
BuildRequires: glib2-devel
BuildRequires: gtk2-devel
@@ -35,7 +39,7 @@ Provides: libcaldav = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} >= 6
BuildRequires: libcurl-devel
%else
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}curl-devel
%else
# Specific CURL version for TDE on RHEL 5 (and older)
@@ -61,8 +65,12 @@ Provides: libcaldav-devel = %{version}-%{release}
%prep
%setup -q -n libcaldav-%{version}
+%patch1 -p1 -b .dir
%build
+# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
+export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}"
+
autoreconf --force --install --symlink
%configure \
--docdir=%{tde_docdir}/libcaldav \
@@ -75,9 +83,6 @@ autoreconf --force --install --symlink
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot}
-# The include files do not go in the correct directory
-%__mv -f %{buildroot}%{tde_includedir}/libcaldav-0.6.2/*.h %{buildroot}%{tde_includedir}
-%__rm -rf %{buildroot}%{tde_includedir}/libcaldav-0.6.2
%clean
%__rm -rf %{buildroot}
@@ -85,15 +90,27 @@ autoreconf --force --install --symlink
%files
%{tde_libdir}/*.so.*
-%{tde_docdir}/libcaldav
+%{tde_docdir}/libcaldav/
%files devel
-%{tde_includedir}/*.h
+%{tde_includedir}/caldav.h
%{tde_libdir}/*.a
%{tde_libdir}/*.la
%{tde_libdir}/*.so
%{tde_libdir}/pkgconfig/libcaldav.pc
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
+
%Changelog
* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
diff --git a/redhat/dependencies/libcarddav/libcarddav-0.6.5-fix_installation.patch b/redhat/dependencies/libcarddav/libcarddav-0.6.5-fix_installation.patch
new file mode 100644
index 000000000..12990f87a
--- /dev/null
+++ b/redhat/dependencies/libcarddav/libcarddav-0.6.5-fix_installation.patch
@@ -0,0 +1,24 @@
+--- libcarddav-0.6.2/libcarddav.pc.in.ORI 2012-08-02 23:38:03.688776626 +0200
++++ libcarddav-0.6.2/libcarddav.pc.in 2012-08-02 23:38:09.055630966 +0200
+@@ -3,8 +3,8 @@
+ libdir=@libdir@
+ includedir=@includedir@
+
+-pkglibdir=${libdir}/@PACKAGE@
+-pkgincludedir=${includedir}/@PACKAGE@
++pkglibdir=${libdir}
++pkgincludedir=${includedir}
+
+ Name: libcarddav
+ Description: libcarddav is a client library for CardDAV
+--- libcarddav-0.6.2/src/Makefile.am.ORI 2012-08-02 23:39:20.990884825 +0200
++++ libcarddav-0.6.2/src/Makefile.am 2012-08-02 23:39:36.182559576 +0200
+@@ -35,7 +35,7 @@
+ lock-carddav-object.c \
+ lock-carddav-object.h
+
+-libcarddav_includedir=$(includedir)/libcarddav-@VERSION@
++libcarddav_includedir=$(includedir)
+ libcarddav_include_HEADERS = carddav.h
+
+ noinst_HEADERS = \
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index c3ed99db0..003bcb9af 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -1,10 +1,10 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
Name: trinity-libcarddav
Version: 0.6.2
@@ -18,14 +18,18 @@ License: GPL
Group: System Environment/Libraries
Summary: A portable CardDAV client implementation originally developed for the Trinity PIM suite.
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: libcarddav_0.6.2-2debian2.tar.gz
+# [libcarddav] Fix messy installation directories
+Patch1: libcarddav-0.6.5-fix_installation.patch
+
%if 0%{?fedora} || 0%{?rhel} >= 6
BuildRequires: libcurl-devel
%else
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}curl-devel
%else
# Specific CURL version for TDE on RHEL 5 (and older)
@@ -55,22 +59,23 @@ Provides: libcarddav-devel = %{version}-%{release}
%prep
%setup -q -n libcarddav-%{version}
+%patch1 -p1 -b .dir
%build
+# CFLAGS required if CURL is installed on /opt/trinity, e.g. RHEL 5
+export CFLAGS="-I%{tde_includedir} -L%{tde_libdir} ${CFLAGS}"
+
autoreconf --force --install --symlink
%configure \
--includedir=%{tde_includedir} \
--libdir=%{tde_libdir} \
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} LIBTOOL=$(which libtool)
%install
%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} LIBTOOL=$(which libtool)
-# The include files do not go in the correct directory
-%__mv -f %{buildroot}%{tde_includedir}/libcarddav-0.6.1/*.h %{buildroot}%{tde_includedir}
-%__rm -rf %{buildroot}%{tde_includedir}/libcarddav-0.6.1
%clean
%__rm -rf %{buildroot}
@@ -86,6 +91,18 @@ autoreconf --force --install --symlink
%{tde_libdir}/*.so
%{tde_libdir}/pkgconfig/libcarddav.pc
+%post
+/sbin/ldconfig
+
+%postun
+/sbin/ldconfig
+
+%post devel
+/sbin/ldconfig
+
+%postun devel
+/sbin/ldconfig
+
%Changelog
* Sun Jul 28 2012 Francois Andriot <francois.andriot@free.fr> - 0.6.5-3
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
index 721178df8..3010ab6d5 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
@@ -1,16 +1,16 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
-%define cmake_modules_dir %{_datadir}/cmake
+%define cmake_modules_dir %{tde_prefix}/share/cmake
%else
%define cmake_modules_dir %{_datadir}/cmake/Modules
%endif
# TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
# Later compiled Trinity products should be aware of that !
-%define tde_bindir %{_prefix}/bin
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_bindir %{tde_prefix}/bin
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
Name: tqtinterface
Version: 3.5.13
@@ -23,7 +23,7 @@ Vendor: Trinity Project
URL: http://www.trinitydesktop.org/
Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}.tar.gz
@@ -37,7 +37,7 @@ Requires: qt3 >= 3.3.8.d
BuildRequires: gcc-c++
BuildRequires: pth-devel
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xi-devel
%else
BuildRequires: libXi-devel
@@ -63,7 +63,11 @@ Development files for %{name}
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
-%{?!mgaversion:%__mkdir build; cd build}
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
%cmake \
-DQT_PREFIX_DIR=${QTDIR} \
-DQT_VERSION=3 \
diff --git a/redhat/extras/akode/akode-cflags.patch b/redhat/extras/akode/akode-cflags.patch
deleted file mode 100644
index ecad48ff6..000000000
--- a/redhat/extras/akode/akode-cflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- akode-2.0.2/akode/lib/Makefile.am.ORI 2012-01-16 19:17:09.849211160 +0100
-+++ akode-2.0.2/akode/lib/Makefile.am 2012-01-16 19:17:24.496410002 +0100
-@@ -12,6 +12,7 @@
- player.cpp magic.cpp
-
- AM_CPPFLAGS = -DAKODE_SEARCHDIR=\"$(libdir)\"
-+AM_CXXFLAGS = -fPIC
-
- libakode_la_LDFLAGS = -no-undefined -version-info 2:0:0 $(all_libraries)
- libakode_la_LIBADD = $(LIBPTHREAD) $(AKODE_LIBDL) $(LIBSEM)
diff --git a/redhat/extras/akode/trinity-akode.spec b/redhat/extras/akode/trinity-akode.spec
index 1395777de..6579f7bef 100644
--- a/redhat/extras/akode/trinity-akode.spec
+++ b/redhat/extras/akode/trinity-akode.spec
@@ -1,14 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%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
@@ -21,7 +21,7 @@
Summary: Audio-decoding framework
Name: trinity-akode
Version: 2.0.2
-Release: 1%{?dist}%{?_variant}
+Release: 2%{?dist}%{?_variant}
License: LGPLv2+
Group: System Environment/Libraries
@@ -29,7 +29,8 @@ Group: System Environment/Libraries
URL: http://www.kde-apps.org/content/show.php?content=30375
Source0: http://www.kde-apps.org/CONTENT/content-files/akode-%{version}.tar.bz2
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Legacy Fedora 9 patches
@@ -47,7 +48,7 @@ Patch10: akode-autotools.patch
%define _with_libsamplerate --with-libsamplerate
# Pulseaudio is not available on RHEL 5 and earlier
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion}
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion}
%define _with_pulseaudio --with-pulseaudio
%endif
@@ -57,7 +58,7 @@ BuildRequires: alsa-lib-devel
BuildRequires: libvorbis-devel
BuildRequires: speex-devel
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
%{?_with_jack:BuildRequires: %{_lib}jack-devel}
%{?_with_flac:BuildRequires: %{_lib}flac-devel}
%{?_with_pulseaudio:BuildRequires: %{_lib}pulseaudio-devel}
@@ -164,7 +165,7 @@ Requires: %{name} = %{version}-%{release}
%__make install DESTDIR=%{buildroot}
# unpackaged files
-%__rm -f %{buildroot}%{_libdir}/lib*.a
+%__rm -f %{buildroot}%{tde_libdir}/*.a
# rpmdocs
for file in AUTHORS COPYING NEWS README TODO ; do
diff --git a/redhat/extras/libkarma/trinity-libkarma.spec b/redhat/extras/libkarma/trinity-libkarma.spec
index 364567f05..242f933ac 100644
--- a/redhat/extras/libkarma/trinity-libkarma.spec
+++ b/redhat/extras/libkarma/trinity-libkarma.spec
@@ -1,76 +1,102 @@
-%define _prefix /opt/trinity
-%define _docdir %{_datadir}/doc
-%define _mandir %{_datadir}/man
+# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
+%if "%{?tde_prefix}" != "/usr"
+%define _variant .opt
+%endif
+
+# TDE 3.5.13 specific building variables
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
+%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}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
+%define tde_tdelibdir %{tde_libdir}/trinity
+
+%define _docdir %{tde_docdir}
+
Summary: Rio Karma tools
Name: trinity-libkarma
Version: 0.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System/Libraries
Url: http://www.freakysoft.de/html/libkarma/
+
Source: http://www.freakysoft.de/libkarma/libkarma-%{version}.tar.gz
-Source2: http://bobcopeland.com/karma/banshee/preferences.fdi
-Source3: http://bobcopeland.com/karma/banshee/multimedia-player-rio-karma.png
-Source4: karma-sharp.dll.config
+Source2: http://bobcopeland.com/karma/banshee/preferences.fdi
+Source3: http://bobcopeland.com/karma/banshee/multimedia-player-rio-karma.png
+Source4: karma-sharp.dll.config
+
+# [libkarma] Fix installation directories
+Patch1: libkarma-0.1.2-fix_installation.patch
+
BuildRoot: %{_tmppath}/%name-root
+
BuildRequires: mono-devel
BuildRequires: taglib-devel
BuildRequires: libusb-devel
BuildRequires: zlib-devel
-Requires: %{name}-libs >= %version
-%define _requires_exceptions libkarma
+Obsoletes: trinity-libkarma-libs < %{version}-%{release}
+Provides: trinity-libkarma-libs = %{version}-%{release}
%description
Rio Karma access library
-%package libs
-Summary: Rio Karma access library
-Group: System/Libraries
-
-%description libs
-Rio Karma access library
-
%package devel
Summary: Rio Karma development files
Group: Development/C
-Requires: %{name}-libs = %version
+Requires: %{name} = %{version}-%{release}
%description devel
Rio Karma development files
-%package -n karma-sharp
+%package -n trinity-karma-sharp
Summary: Rio Karma C# bindings
Group: Development/Other
-Requires: %{name} = %version
+Requires: %{name} = %{version}-%{release}
+
+Obsoletes: karma-sharp < %{version}-%{release}
+Provides: karma-sharp = %{version}-%{release}
-%description -n karma-sharp
+%description -n trinity-karma-sharp
Rio Karma C# bindings
%prep
%setup -q -n libkarma-%{version}
+%patch1 -p1 -b .fixdir
%build
-make PREFIX=$RPM_BUILD_ROOT/%_prefix
+# Do *NOT* use LIBDIR variable, it is used for internal purpose !!!
+%__make \
+ DESTDIR=%{?buildroot} \
+ PREFIX=%{tde_prefix} \
+ LIB=%{_lib}
+
%install
-rm -rf $RPM_BUILD_ROOT installed-docs
-mkdir -p $RPM_BUILD_ROOT
-make install PREFIX=$RPM_BUILD_ROOT/%_prefix CHOWNPROG=/bin/true CHGRPPROG=/bin/true
-perl -pi -e "s^%buildroot^^" %buildroot%_prefix/lib/pkgconfig/karma-sharp.pc
-%if %_lib != lib
-mv %buildroot%_prefix/lib %buildroot%_libdir
-perl -pi -e "s^/lib^/%_lib^" %buildroot%_libdir/pkgconfig/karma-sharp.pc
-%endif
+%__rm -rf $RPM_BUILD_ROOT
+%__mkdir_p $RPM_BUILD_ROOT
+
+%__make install \
+ DESTDIR=%{?buildroot} \
+ PREFIX=%{tde_prefix} \
+ LIB=%{_lib} \
+ CHOWNPROG=/bin/true \
+ CHGRPPROG=/bin/true
install -m 644 -D libkarma.fdi %buildroot%_sysconfdir/hal/fdi/information/20-rio-karma.fdi
install -m 644 -D %SOURCE2 %buildroot%_sysconfdir/hal/fdi/policy/preferences.fdi
-install -m 644 -D %SOURCE3 %buildroot%_datadir/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png
+install -m 644 -D %SOURCE3 %buildroot%{tde_datadir}/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png
cat > README%{?dist} << EOF
For automatic mounting, add the following line to your
@@ -81,51 +107,61 @@ device, as it doesn't know about the Karma's proprietary filesystem.
EOF
-install -m 644 %SOURCE4 %buildroot%_libdir/karma-sharp/karma-sharp.dll.config
+install -m 644 -D %SOURCE4 %buildroot%{tde_libdir}/karma-sharp/karma-sharp.dll.config
+
+# Removes doc
+%__rm -rf %{?buildroot}%{tde_docdir}/libkarma/
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
%post
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
%postun
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+/sbin/ldconfig || :
+
+%post devel
+/sbin/ldconfig || :
+
+%postun devel
+/sbin/ldconfig || :
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
-%doc THANKS TODO README%{?dist}
+%doc ChangeLog THANKS TODO README%{?dist}
%config(noreplace) %_sysconfdir/hal/fdi/information/20-rio-karma.fdi
%config(noreplace) %_sysconfdir/hal/fdi/policy/preferences.fdi
-%_bindir/riocp
-%_bindir/chprop
-%_mandir/man1/*.1*
-%attr(4755,root,root) %_bindir/karma_helper
-%_datadir/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png
-%_docdir/libkarma
-
-%files libs
-%defattr(-,root,root)
-%_libdir/libkarma.so.0*
+%{tde_bindir}/riocp
+%{tde_bindir}/chprop
+%{tde_mandir}/man1/*.1*
+%attr(4755,root,root) %{tde_bindir}/karma_helper
+%{tde_datadir}/icons/hicolor/32x32/devices/multimedia-player-rio-karma.png
+%{tde_libdir}/libkarma.so.0*
%files devel
%defattr(-,root,root)
-%_includedir/*
-%_libdir/libkarma.a
-%_libdir/libkarma.so
+%{tde_includedir}/libkarma/
+%{tde_libdir}/libkarma.a
+%{tde_libdir}/libkarma.so
-%files -n karma-sharp
+%files -n trinity-karma-sharp
%defattr(-,root,root)
-%_libdir/karma-sharp/*
-%_libdir/pkgconfig/karma-sharp.pc
+%{tde_libdir}/karma-sharp/*
+%{tde_libdir}/pkgconfig/karma-sharp.pc
%changelog
+* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> 0.1.2-2
+- Add support for MGA2 and MDV2011
+- Removes 'libs' subpackage
+- Fix installation directories
+
* Mon Apr 30 2012 Francois Andriot <francois.andriot@free.fr> 0.1.2-1
- Build for RHEL 5, RHEL 6, Fedora 15, Fedora 16, Fedora 17
- Based on 'libkarma-0.1.2-1mdv2011.0'
diff --git a/redhat/extras/trinity-live/tperl.spec b/redhat/extras/trinity-live/tperl.spec
new file mode 100644
index 000000000..d30c67929
--- /dev/null
+++ b/redhat/extras/trinity-live/tperl.spec
@@ -0,0 +1,25 @@
+Name: tperl
+Version: 1.0
+Release: 1%{?dist}
+Summary: Hack to get TDE installed with Perl
+
+License: GPL
+URL: http://www.trinitydesktop.org
+
+Requires: perl
+Provides: /bin/perl
+
+BuildArch: noarch
+
+%description
+%{summary}
+
+%prep
+
+%build
+
+%install
+
+%files
+
+%changelog
diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh
index aa8b5e681..04b21d382 100755
--- a/redhat/genrpm.sh
+++ b/redhat/genrpm.sh
@@ -3,6 +3,13 @@
cd "$( dirname "$0" )"
ARGS=""
+if [ ! -d /var/cache/ccache ]; then
+ DIST="$(rpmdist.sh --dist)"
+ if [ -n "${DIST}" ]; then
+ export CCACHE_DIR=~/.ccache${DIST}.$(uname -m)
+ fi
+fi
+
while [ $# -gt 0 ]; do
case "$1" in
"--auto"|"-a") AUTO=1;;
@@ -99,7 +106,7 @@ EOF
# Specific prefix for installation of some components
case "${COMP##*/}" in
- "qt3"|"libkarma") PREFIX="/usr";;
+ "qt3") PREFIX="/usr";;
esac
# Determines if we are running an i386 or x86_64 distro
@@ -114,7 +121,7 @@ set -x
rpmbuild -ba \
${ARGS} \
--define "_sourcedir ${PWD}/${COMP}" \
- --define "_prefix ${PREFIX:-/opt/trinity}" \
+ --define "tde_prefix ${PREFIX:-/opt/trinity}" \
--define "version ${VERSION:-3.5.13}" \
${COMP}/${SPEC} || exit 1
) 2>&1 | tee ${LOGFILE}
diff --git a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec
index 880c05570..ac9095577 100644
--- a/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec
+++ b/redhat/kdeaccessibility/trinity-kdeaccessibility-3.5.13.spec
@@ -1,15 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{_datadir}/doc
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -36,7 +35,8 @@ Source0: kdeaccessibility-%{version}.tar.gz
# [kdeaccessibility] Missing LDFLAGS causing FTBFS
Patch1: kdeaccessibility-3.5.13-missing_ldflags.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake >= 2.8
BuildRequires: desktop-file-utils
@@ -50,13 +50,12 @@ BuildRequires: trinity-tdemultimedia-devel >= 3.5.13
BuildRequires: libXtst-devel
%endif
-%if 0%{?mgaversion}
-# Special packages for missing '.la' files on Mageia 2
-BuildRequires: %{_lib}xi-devel %{_lib}xi-devel-libtool
-BuildRequires: %{_lib}xext6-devel %{_lib}xext6-devel-libtool
-BuildRequires: %{_lib}x11_6-devel %{_lib}x11_6-devel-libtool
-BuildRequires: %{_lib}xcb-devel %{_lib}xcb-devel-libtool
-BuildRequires: %{_lib}xau6-devel %{_lib}xau6-devel-libtool
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xi-devel
+BuildRequires: %{_lib}xext%{?mgaversion:6}-devel
+BuildRequires: %{_lib}x11%{?mgaversion:_6}-devel
+BuildRequires: %{_lib}xcb-devel
+BuildRequires: %{_lib}xau%{?mgaversion:6}-devel
%else
BuildRequires: libXi-devel
BuildRequires: libXext-devel
@@ -67,6 +66,15 @@ BuildRequires: libxcb-devel
BuildRequires: libXau-devel
%endif
+# Mageia only: Special packages were built for missing '.la' files on Mageia 2 !!!
+%if 0%{?mgaversion}
+BuildRequires: %{_lib}xi-devel-libtool
+BuildRequires: %{_lib}xext6-devel-libtool
+BuildRequires: %{_lib}x11_6-devel-libtool
+BuildRequires: %{_lib}xcb-devel-libtool
+BuildRequires: %{_lib}xau6-devel-libtool
+%endif
+
Obsoletes: trinity-kdeaccessibility < %{version}-%{release}
Provides: trinity-kdeaccessibility = %{version}-%{release}
Obsoletes: trinity-kdeaccessibility-libs < %{version}-%{release}
@@ -448,11 +456,11 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Avoir conflict with KDE4, if installed
# see file: '/etc/profile.d/kde.sh' from package 'kde-settings'
-export KDEDIRS=%{_prefix}
-export KDEDIR=%{_prefix}
+export KDEDIRS=%{tde_prefix}
+export KDEDIR=%{tde_prefix}
%configure \
- --exec-prefix=%{_prefix} \
+ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
@@ -464,7 +472,7 @@ export KDEDIR=%{_prefix}
--enable-final \
--enable-ksayit-audio-plugins \
--with-akode \
- --with-extra-includes=%{tde_includedir}/tqt
+ --with-extra-includes=%{tde_includedir}:%{tde_includedir}/tqt
%__make %{?_smp_mflags}
diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
index cf8496217..36d377062 100644
--- a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
+++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec
@@ -1,14 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -34,7 +34,7 @@ Provides: trinity-kdeaddons = %{version}-%{release}
Obsoletes: trinity-kdeaddons-extras < %{version}-%{release}
Provides: trinity-kdeaddons-extras = %{version}-%{release}
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdeaddons-%{version}.tar.gz
@@ -348,7 +348,11 @@ and various local news sources.
%package -n trinity-konq-plugins
Summary: plugins for Konqueror, the Trinity file/web/doc browser
Group: Applications/Utilities
+%if 0%{?mgaversion} || 0%{?mdkversion}
+Requires: %{_lib}jpeg8
+%else
Requires: libjpeg
+%endif
Requires: python
Requires: rsync
#Requires: unison
@@ -659,7 +663,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%configure \
- --exec-prefix=%{_prefix} \
+ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
diff --git a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
index a4aeac80e..8f74f748d 100644
--- a/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
+++ b/redhat/kdeadmin/trinity-kdeadmin-3.5.13.spec
@@ -1,15 +1,15 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_sbindir %{_prefix}/sbin
+%define tde_bindir %{tde_prefix}/bin
+%define tde_sbindir %{tde_prefix}/sbin
%define tde_datadir %{_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -32,7 +32,7 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
Obsoletes: trinity-kdeadmin < %{version}-%{release}
Provides: trinity-kdeadmin = %{version}-%{release}
@@ -55,7 +55,7 @@ BuildRequires: autoconf automake libtool m4
BuildRequires: trinity-kdelibs-devel
BuildRequires: rpm-devel
BuildRequires: pam-devel
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: lilo
%endif
@@ -67,7 +67,7 @@ Requires: trinity-knetworkconf = %{version}-%{release}
Requires: trinity-kpackage = %{version}-%{release}
Requires: trinity-ksysv = %{version}-%{release}
Requires: trinity-kuser = %{version}-%{release}
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
Requires: trinity-lilo-config = %{version}-%{release}
%endif
@@ -79,23 +79,6 @@ kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
%files
%defattr(-,root,root,-)
-# The following files are not installed in any binary package.
-# This is deliberate.
-
-# - This file serves no purpose that we can see, and conflicts
-# with GNOME system tools, so be sure to leave it out.
-%exclude %{tde_libdir}/pkgconfig/*.pc
-
-# Extract from changelog:
-# tdeadmin (4:3.5.5-2) unstable; urgency=low
-# +++ Changes by Ana Beatriz Guerrero Lopez:
-# * Removed useless program secpolicy. (Closes: #399426)
-%exclude %{tde_bindir}/secpolicy
-
-# LILO is not provided in RHEL or Fedora
-%if 0%{?rhel} || 0%{?fedora}
-%exclude %{tde_tdedocdir}/HTML/en/lilo-config/
-%endif
##########
@@ -340,7 +323,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
%package -n trinity-lilo-config
Summary: Trinity frontend for lilo configuration
Group: Applications/Utilities
@@ -392,7 +375,7 @@ export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --exec-prefix=%{_prefix} \
+ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--sbindir=%{tde_sbindir} \
--libdir=%{tde_libdir} \
@@ -455,6 +438,24 @@ for dir in $comps ; do
done
done
+# The following files are not installed in any binary package.
+# This is deliberate.
+
+# - This file serves no purpose that we can see, and conflicts
+# with GNOME system tools, so be sure to leave it out.
+%__rm -f %{?buildroot}%{tde_libdir}/pkgconfig/*.pc
+
+# Extract from changelog:
+# tdeadmin (4:3.5.5-2) unstable; urgency=low
+# +++ Changes by Ana Beatriz Guerrero Lopez:
+# * Removed useless program secpolicy. (Closes: #399426)
+%__rm -f %{?buildroot}%{tde_bindir}/secpolicy
+
+# LILO is not provided in RHEL or Fedora
+%if 0%{?rhel} || 0%{?fedora}
+%exclude %{tde_tdedocdir}/HTML/en/lilo-config/
+%endif
+
%clean
%__rm -rf %{buildroot}
diff --git a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
index 6e08ef7d8..00debd329 100644
--- a/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
+++ b/redhat/kdeartwork/trinity-kdeartwork-3.5.13.spec
@@ -1,14 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -19,7 +19,7 @@
# kdeartwork specific settings
# On RHEL 6, libart is too old !
-%if 0%{?fedora} >= 15 || 0%{?mgaversion}
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
%define with_libart 1
%endif
@@ -48,14 +48,16 @@ BuildRequires: trinity-tdebase-devel >= 3.5.13
BuildRequires: gettext
BuildRequires: esound-devel
-%if 0%{?fedora} || 0%{?mgaversion}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_xscreensaver 1
BuildRequires: nas-devel
BuildRequires: xscreensaver
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}jack-devel
+BuildRequires: xscreensaver-base
BuildRequires: xscreensaver-extrusion
+BuildRequires: xscreensaver-gl
%else
BuildRequires: jack-audio-connection-kit-devel
%endif
@@ -280,7 +282,7 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/apps/kscreensaver/
# RHEL 5 and 6 do not build theses files - not sure why ...
-%if 0%{?fedora} || 0%{?mgaversion}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%{tde_bindir}/kspace.kss
%{tde_bindir}/kclock.kss
%{tde_bindir}/kswarm.kss
@@ -386,7 +388,7 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/skytentacles.desktop
# These screensavers do not exist on Mageia 2
-%if 0%{?mgaversion} == 0
+%if 0%{?mgaversion} == 0 && 0%{?mdkversion} == 0
%{tde_datadir}/applnk/System/ScreenSavers/glmatrix.desktop
%endif
@@ -567,8 +569,8 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/xspirograph.desktop
%{tde_datadir}/applnk/System/ScreenSavers/zoom.desktop
-# These screensavers do not exist on Mageia 2
-%if 0%{?mgaversion} == 0
+# These screensavers do not exist on Mageia 2 and Mandriva 2011
+%if 0%{?mgaversion} == 0 && 0%{mdkversion}==0
%{tde_datadir}/applnk/System/ScreenSavers/xjack.desktop
%{tde_datadir}/applnk/System/ScreenSavers/xmatrix.desktop
%endif
@@ -589,10 +591,18 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export LD_LIBRARY_PATH="%{tde_libdir}"
-%{?!mgaversion:%__mkdir build; cd build}
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
%cmake \
- -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
%if 0%{?with_xscreensaver}
-DWITH_XSCREENSAVER=ON \
%else
diff --git a/redhat/kdebase/pamd.kcheckpass-trinity.mdv2011.0 b/redhat/kdebase/pamd.kcheckpass-trinity.mdv2011.0
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kcheckpass-trinity.mdv2011.0
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/kdebase/pamd.kdm-trinity-np.mdv2011.0 b/redhat/kdebase/pamd.kdm-trinity-np.mdv2011.0
new file mode 100644
index 000000000..690b4df08
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity-np.mdv2011.0
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth required pam_env.so
+auth required pam_permit.so
+account include system-auth
+password include system-auth
+session include system-auth
+session optional pam_console.so
diff --git a/redhat/kdebase/pamd.kdm-trinity.mdv2011.0 b/redhat/kdebase/pamd.kdm-trinity.mdv2011.0
new file mode 100644
index 000000000..87d080f58
--- /dev/null
+++ b/redhat/kdebase/pamd.kdm-trinity.mdv2011.0
@@ -0,0 +1,8 @@
+#%PAM-1.0
+auth include system-auth
+auth required pam_nologin.so
+account include system-auth
+password include system-auth
+session include system-auth
+session optional pam_console.so
+session required pam_namespace.so
diff --git a/redhat/kdebase/pamd.kscreensaver-trinity.mdv2011.0 b/redhat/kdebase/pamd.kscreensaver-trinity.mdv2011.0
new file mode 100644
index 000000000..0a37e6e13
--- /dev/null
+++ b/redhat/kdebase/pamd.kscreensaver-trinity.mdv2011.0
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth include system-auth
+account include system-auth
+password include system-auth
+session include system-auth
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index 5fa527e4c..fd1e2fa99 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -1,14 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -17,7 +17,7 @@
# Older RHEL/Fedora versions use packages named "qt", "qt-devel", ..
# whereas newer versions use "qt3", "qt3-devel" ...
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 || 0%{?mgaversion}
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 8 || 0%{?mgaversion} || 0%{?mdkversion}
%define _qt_suffix 3
%endif
@@ -42,7 +42,7 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdebase-%{version}.tar.gz
@@ -237,6 +237,17 @@ Requires: indexhtml
%define tde_aboutpage /usr/share/mga/about/index.html
%endif
+# Mandriva 2011 Theme: "rosa"
+%if "%{?mdkversion}" == "201100"
+Requires: mandriva-theme
+%define tde_bg /usr/share/mdk/backgrounds/default.jpg
+%define tde_starticon /usr/share/icons/mandriva.png
+
+Requires: indexhtml
+%define tde_aboutlabel Mandriva 2011
+%define tde_aboutpage /usr/share/mdk/about/index.html
+%endif
+
BuildRequires: cmake >= 2.8
BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel
@@ -265,7 +276,7 @@ BuildRequires: nas-devel
BuildRequires: pcre-devel
BuildRequires: avahi-tqt-devel
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion}
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libudev-devel
%endif
@@ -273,16 +284,16 @@ BuildRequires: libudev-devel
BuildRequires: perl-Digest-MD5
%endif
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
BuildRequires: %{_lib}jack-devel
-BuildRequires: %{_lib}xcomposite1-devel
+BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
BuildRequires: %{_lib}xdamage-devel
-BuildRequires: %{_lib}xdmcp6-devel
+BuildRequires: %{_lib}xdmcp%{?mgaversion:6}-devel
BuildRequires: %{_lib}xtst-devel
BuildRequires: x11-font-util
BuildRequires: x11-proto-devel
-BuildRequires: %{_lib}xscrnsaver1-devel
+BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
Requires: %{_lib}avahi-client3
%else
BuildRequires: avahi-devel
@@ -293,7 +304,11 @@ BuildRequires: libXdmcp-devel
BuildRequires: libXtst-devel
BuildRequires: xorg-x11-font-utils
BuildRequires: xorg-x11-proto-devel
+%if 0%{?rhel} == 5
+BuildRequires: gnome-screensaver
+%else
BuildRequires: xscreensaver
+%endif
Requires: avahi-qt3
%endif
@@ -340,7 +355,7 @@ Requires: dbus-tqt
# RHEL 6 Configuration files are provided in separate packages
%if 0%{?rhel} || 0%{?fedora}
-%if "%{?_prefix}" == "/usr"
+%if "%{?tde_prefix}" == "/usr"
Requires: kde-settings-kdm
%endif
Requires: redhat-menus
@@ -594,7 +609,7 @@ Requires: trinity-kate = %{version}-%{release}
%{summary}
%files -n trinity-kate-devel
-%{tde_includedir}/kate/
+%{tde_tdeincludedir}/kate/
%{tde_libdir}/libkateutils.so
%{tde_libdir}/libkateutils.la
%{tde_libdir}/libkateinterfaces.so
@@ -1339,11 +1354,11 @@ needed for a basic TDE desktop installation.
%{tde_datadir}/sounds/
%{tde_datadir}/wallpapers/*
-%if "%{_prefix}" != "/usr"
-%{_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu
-%{_prefix}/etc/xdg/menus/kde-information.menu
-%{_prefix}/etc/xdg/menus/kde-screensavers.menu
-%{_prefix}/etc/xdg/menus/kde-settings.menu
+%if "%{tde_prefix}" != "/usr"
+%{tde_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu
+%{tde_prefix}/etc/xdg/menus/kde-information.menu
+%{tde_prefix}/etc/xdg/menus/kde-screensavers.menu
+%{tde_prefix}/etc/xdg/menus/kde-settings.menu
%else
%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
%{_sysconfdir}/xdg/menus/kde-information.menu
@@ -1351,8 +1366,8 @@ needed for a basic TDE desktop installation.
%{_sysconfdir}/xdg/menus/kde-settings.menu
%endif
-%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
%{tde_tdedocdir}/HTML/en/kcontrol/
+%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
%{tde_tdedocdir}/HTML/en/kinfocenter/
%post data
@@ -1361,6 +1376,14 @@ for f in crystalsvg ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
+%if 0%{?mdkversion}
+# Mandriva-specific: we have to choose a background for current distribution variant
+# 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}"
+%endif
+
%postun data
for f in crystalsvg ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
@@ -1601,22 +1624,28 @@ Installation of smbclient will make you able to use smb shared printers.
%{tde_libdir}/lib[kt]deinit_kprinter.la
%{tde_libdir}/lib[kt]deinit_kprinter.so
%{tde_tdeappdir}/[kt]deprintfax.desktop
-%{tde_tdeappdir}/kjobviewer.desktop
+%{tde_tdeappdir}/[kt]jobviewer.desktop
%{tde_tdeappdir}/printers.desktop
-%{tde_datadir}/apps/[kt]deprintfax/
-%{tde_datadir}/apps/[kt]deprint_part/[kt]deprint_part.rc
%{tde_datadir}/apps/[kt]deprint/
-%{tde_datadir}/apps/kjobviewer/kjobviewerui.rc
-%{tde_datadir}/icons/hicolor/*/apps/[kt]deprintfax.png
+%{tde_datadir}/apps/[kt]deprintfax/
+%{tde_datadir}/apps/[kt]jobviewer/
+%{tde_datadir}/apps/[kt]deprint_part/kdeprint_part.rc
+%{tde_datadir}/icons/hicolor/*/apps/kdeprintfax.png
%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.png
%{tde_datadir}/icons/hicolor/*/apps/printmgr.png
-%{tde_datadir}/icons/hicolor/*/apps/[kt]deprintfax.svgz
-%{tde_datadir}/icons/hicolor/*/apps/kjobviewer.svgz
-%{tde_datadir}/icons/hicolor/*/apps/printmgr.svgz
-%{tde_datadir}/mimelnk/print
-%{tde_datadir}/services/[kt]deprint_part.desktop
-%{tde_datadir}/services/printdb.protocol
+%{tde_datadir}/icons/hicolor/scalable/apps/kdeprintfax.svgz
+%{tde_datadir}/icons/hicolor/scalable/apps/kjobviewer.svgz
+%{tde_datadir}/icons/hicolor/scalable/apps/printmgr.svgz
+%{tde_datadir}/mimelnk/print/class.desktop
+%{tde_datadir}/mimelnk/print/driver.desktop
+%{tde_datadir}/mimelnk/print/folder.desktop
+%{tde_datadir}/mimelnk/print/jobs.desktop
+%{tde_datadir}/mimelnk/print/manager.desktop
+%{tde_datadir}/mimelnk/print/printer.desktop
+%{tde_datadir}/mimelnk/print/printermodel.desktop
+%{tde_datadir}/services/kdeprint_part.desktop
%{tde_datadir}/services/print.protocol
+%{tde_datadir}/services/printdb.protocol
%{tde_tdedocdir}/HTML/en/[kt]deprint/
%post -n trinity-tdeprint
@@ -1697,9 +1726,9 @@ Requires: trinity-kdesktop = %{version}-%{release}
%{summary}
%files -n trinity-kdesktop-devel
-%{tde_includedir}/KBackgroundIface.h
-%{tde_includedir}/KDesktopIface.h
-%{tde_includedir}/KScreensaverIface.h
+%{tde_tdeincludedir}/KBackgroundIface.h
+%{tde_tdeincludedir}/KDesktopIface.h
+%{tde_tdeincludedir}/KScreensaverIface.h
##########
@@ -1711,7 +1740,7 @@ Requires: %{name}-data = %{version}-%{release}
Requires: pam
# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
Requires: xinitrc
%else
Requires: xorg-x11-xinit
@@ -1764,7 +1793,7 @@ already. Most users won't need this.
%endif
%{_sysconfdir}/pam.d/kdm-trinity
%{_sysconfdir}/pam.d/kdm-trinity-np
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
%{_sysconfdir}/X11/wmsession.d/*
%post -n trinity-tdm
@@ -1785,7 +1814,7 @@ Requires: trinity-tdm = %{version}-%{release}
%{summary}
%files -n trinity-tdm-devel
-%{tde_includedir}/kgreeterplugin.h
+%{tde_tdeincludedir}/kgreeterplugin.h
##########
@@ -1968,7 +1997,9 @@ functionality.
%{tde_datadir}/apps/kconf_update/kicker-3.5-kconfigXTize.pl
%{tde_datadir}/apps/kconf_update/kicker-3.5-taskbarEnums.pl
%{tde_datadir}/apps/kconf_update/kickerrc.upd
-%{tde_datadir}/apps/kicker
+%{tde_datadir}/apps/kicker/
+%exclude %{tde_datadir}/apps/kicker/applets/klipper.desktop
+%exclude %{tde_datadir}/apps/kicker/applets/ksysguardapplet.desktop
%{tde_datadir}/apps/naughtyapplet/pics/naughty-happy.png
%{tde_datadir}/apps/naughtyapplet/pics/naughty-sad.png
%{tde_datadir}/autostart/panel.desktop
@@ -2016,8 +2047,8 @@ Requires: trinity-kicker = %{version}-%{release}
%{summary}
%files -n trinity-kicker-devel
-%{tde_includedir}/kickoff-search-plugin.h
-%{tde_includedir}/kickoffsearchinterface.h
+%{tde_tdeincludedir}/kickoff-search-plugin.h
+%{tde_tdeincludedir}/kickoffsearchinterface.h
%{tde_libdir}/libkasbar.la
%{tde_libdir}/libkasbar.so
%{tde_libdir}/libkickermain.la
@@ -2131,7 +2162,6 @@ Requires: trinity-kcontrol = %{version}-%{release}
Requires: %{name}-kio-plugins = %{version}-%{release}
Requires: trinity-kdesktop = %{version}-%{release}
Requires: trinity-kfind = %{version}-%{release}
-Requires: trinity-konqueror-nsplugins = %{version}-%{release}
Requires: trinity-libkonq = %{version}-%{release}
%description -n trinity-konqueror
@@ -2292,8 +2322,8 @@ Requires: trinity-konqueror = %{version}-%{release}
%{summary}
%files -n trinity-konqueror-devel
-%{tde_includedir}/konqsidebarplugin.h
-%{tde_includedir}/KonquerorIface.h
+%{tde_tdeincludedir}/konqsidebarplugin.h
+%{tde_tdeincludedir}/KonquerorIface.h
%{tde_libdir}/libkonqsidebarplugin.la
%{tde_libdir}/libkonqsidebarplugin.so
@@ -2379,8 +2409,8 @@ Using Konsole, a user can open:
%{tde_datadir}/services/konsole-script.desktop
%{tde_datadir}/services/kwrited.desktop
%{tde_datadir}/servicetypes/terminalemulator.desktop
-%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
%{tde_tdedocdir}/HTML/en/konsole/
+%{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
%post -n trinity-konsole
update-desktop-database %{tde_appdir} 2> /dev/null || :
@@ -2499,7 +2529,7 @@ KDE will start, but many good defaults will not be set.
%{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png
# Remove conflicts with redhat-menus
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%{tde_bindir}/plasma-desktop
%endif
@@ -2558,7 +2588,7 @@ Requires: trinity-ksplash = %{version}-%{release}
%{summary}
%files -n trinity-ksplash-devel
-%{tde_includedir}/ksplash/*
+%{tde_tdeincludedir}/ksplash/*
%{tde_libdir}/libksplashthemes.la
%{tde_libdir}/libksplashthemes.so
@@ -2621,7 +2651,7 @@ Requires: trinity-ksysguard = %{version}-%{release}
%{summary}
%files -n trinity-ksysguard-devel
-%{tde_includedir}/ksgrd/*
+%{tde_tdeincludedir}/ksgrd/*
%{tde_libdir}/libksgrd.la
%{tde_libdir}/libksgrd.so
@@ -2767,13 +2797,13 @@ Requires: trinity-twin = %{version}-%{release}
%{summary}
%files -n trinity-twin-devel
-%{tde_includedir}/[kt]win/
-%{tde_includedir}/kcommondecoration.h
-%{tde_includedir}/kdecoration.h
-%{tde_includedir}/kdecoration_p.h
-%{tde_includedir}/kdecoration_plugins_p.h
-%{tde_includedir}/kdecorationfactory.h
-%{tde_includedir}/KWinInterface.h
+%{tde_tdeincludedir}/[kt]win/
+%{tde_tdeincludedir}/kcommondecoration.h
+%{tde_tdeincludedir}/kdecoration.h
+%{tde_tdeincludedir}/kdecoration_p.h
+%{tde_tdeincludedir}/kdecoration_plugins_p.h
+%{tde_tdeincludedir}/kdecorationfactory.h
+%{tde_tdeincludedir}/KWinInterface.h
%{tde_libdir}/libkdecorations.la
%{tde_libdir}/libkdecorations.so
@@ -2851,12 +2881,12 @@ Konqueror libraries.
%files -n trinity-libkonq-devel
%defattr(-,root,root,-)
-%{tde_includedir}/kfileivi.h
-%{tde_includedir}/kivdirectoryoverlay.h
-%{tde_includedir}/knewmenu.h
-%{tde_includedir}/konqbookmarkmanager.h
-%{tde_includedir}/konq_*.h
-%{tde_includedir}/libkonq_export.h
+%{tde_tdeincludedir}/kfileivi.h
+%{tde_tdeincludedir}/kivdirectoryoverlay.h
+%{tde_tdeincludedir}/knewmenu.h
+%{tde_tdeincludedir}/konqbookmarkmanager.h
+%{tde_tdeincludedir}/konq_*.h
+%{tde_tdeincludedir}/libkonq_export.h
%{tde_libdir}/libkonq.la
%{tde_libdir}/libkonq.so
@@ -2887,8 +2917,8 @@ Konqueror libraries.
%patch16 -p1
%patch20 -p4
-%if 0%{?rhel} || 0%{?mgaversion}
-%patch21 -p1
+%if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion}
+%patch21 -p1 -b .man
%endif
%patch22 -p1
%patch23 -p1
@@ -2901,7 +2931,7 @@ Konqueror libraries.
%patch30 -p1
%patch31 -p1
%patch32 -p1
-%if 0%{?fedora} >= 15 || 0%{?mgaversion}
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
%patch33 -p1
%patch34 -p1
%endif
@@ -2962,7 +2992,7 @@ Konqueror libraries.
# TDE default directory in 'startkde' script (KDEDIR)
%__sed -i "startkde" \
- -e "s|/opt/trinity|%{_prefix}|g"
+ -e "s|/opt/trinity|%{tde_prefix}|g"
# TDE default start button icon
%__sed -i "startkde" \
@@ -2976,7 +3006,11 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export LD_LIBRARY_PATH="%{tde_libdir}"
-%{?!mgaversion:%__mkdir build; cd build}
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
%cmake \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
@@ -3033,7 +3067,7 @@ export LD_LIBRARY_PATH="%{tde_libdir}"
%endif
# Mageia/Mandriva stores its session file in different folder than RHEL/Fedora
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
NAME=TDE
@@ -3051,7 +3085,7 @@ EOF
%{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{tde_bindir}"
%endif
@@ -3070,9 +3104,9 @@ EOF
%endif
# Moves the XDG configuration files to TDE directory
-%if "%{_prefix}" != "/usr"
-%__mkdir_p "%{?buildroot}%{_prefix}/etc"
-%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{_prefix}/etc"
+%if "%{tde_prefix}" != "/usr"
+%__mkdir_p "%{?buildroot}%{tde_prefix}/etc"
+%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{tde_prefix}/etc"
%endif
# Symlinks 'usb.ids'
diff --git a/redhat/kdebindings/kdebindings-3.5.13-fix_dcopc_header_location.patch b/redhat/kdebindings/kdebindings-3.5.13-fix_dcopc_header_location.patch
new file mode 100644
index 000000000..d9880371a
--- /dev/null
+++ b/redhat/kdebindings/kdebindings-3.5.13-fix_dcopc_header_location.patch
@@ -0,0 +1,12 @@
+--- kdebindings/dcopc/Makefile.am.ORI 2012-08-02 19:39:33.981833237 +0000
++++ kdebindings/dcopc/Makefile.am 2012-08-02 19:39:45.085467620 +0000
+@@ -10,7 +10,7 @@
+ libdcopc_la_LDFLAGS = -version-info 1:0 $(X_LDFLAGS) -lICE -no-undefined
+
+-include_HEADERS = dcopc.h marshal.h dcopobject.h util.h
+-includedir = $(prefix)/include/dcopc
++dcopcinclude_HEADERS = dcopc.h marshal.h dcopobject.h util.h
++dcopcincludedir = $(includedir)/dcopc
+
+ noinst_HEADERS = global.h
+
diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
index 0e6db1035..e095efe8a 100644
--- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
+++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec
@@ -1,14 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%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
@@ -30,7 +30,7 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdebindings-%{version}.tar.gz
@@ -46,7 +46,8 @@ Patch3: kdebindings-3.5.13-ruby_1.9.patch
Patch4: kdebindings-3.5.13-fixes.patch
# [kdebindings] Fix smoke compilation on MGA2 (missing LDFLAGS)
Patch5: kdebindings-3.5.13-missing_ldflags.patch
-
+# [kdebindings] Fix directory for dcopc include
+Patch6: kdebindings-3.5.13-fix_dcopc_header_location.patch
BuildRequires: autoconf automake libtool m4
BuildRequires: tqtinterface-devel
@@ -64,12 +65,12 @@ BuildRequires: xulrunner-devel
BuildRequires: glib-devel
BuildRequires: gtk+-devel
%endif
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}glib1.2-devel
BuildRequires: %{_lib}gtk+-devel
%endif
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}gdk_pixbuf2.0-devel
%else
%if 0%{?fedora} >= 17
@@ -354,7 +355,7 @@ This package is part of the official TDE bindings module.
%files -n trinity-libsmokeqt-devel
%defattr(-,root,root,-)
-%{tde_includedir}/smoke.h
+%{tde_tdeincludedir}/smoke.h
%{tde_libdir}/libsmokeqt.so
%{tde_libdir}/libsmokeqt.la
@@ -530,7 +531,7 @@ This package is part of the official TDE bindings module.
%files -n trinity-libkjsembed-devel
%defattr(-,root,root,-)
-%{tde_includedir}/kjsembed/
+%{tde_tdeincludedir}/kjsembed/
%{tde_libdir}/libkjsembed.so
%{tde_libdir}/libkjsembed.la
%{tde_docdir}/trinity-libkjsembed-devel/plugin-examples/customobject/
@@ -765,7 +766,7 @@ Requires: trinity-libkdexparts1 = %{version}-%{release}
%files -n trinity-libxparts-devel
%defattr(-,root,root,-)
-%{tde_includedir}/xkparts/
+%{tde_tdeincludedir}/xkparts/
%{tde_libdir}/libgtkxparts.so
%{tde_libdir}/libkdexparts.so
@@ -828,7 +829,7 @@ Requires: trinity-libdcop-c = %{version}-%{release}
%defattr(-,root,root,-)
%{tde_libdir}/libdcopc.so
%{tde_libdir}/libdcopc.la
-%{tde_includedir}/dcopc/
+%{tde_tdeincludedir}/dcopc/
%post -n trinity-libdcop-c-devel
/sbin/ldconfig || :
@@ -872,6 +873,7 @@ Development files for the TDE bindings.
%endif
%patch4 -p1
%patch5 -p1
+%patch6 -p1 -b .dcopcinclude
# Adds non-standard Ruby include path in include dirs
for d in \
@@ -911,11 +913,12 @@ unset JAVA_HOME ||:
export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
%configure \
- --exec-prefix=%{_prefix} \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--docdir=%{tde_docdir} \
- --includedir=%{tde_includedir} \
+ --includedir=%{tde_tdeincludedir} \
--libdir=%{tde_libdir} \
--mandir=%{tde_mandir} \
--disable-rpath \
diff --git a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
index b6facf9e9..4a7000cdd 100644
--- a/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
+++ b/redhat/kdeedu/trinity-kdeedu-3.5.13.spec
@@ -1,14 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -32,7 +32,7 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdeedu-%{version}.tar.gz
@@ -535,7 +535,7 @@ This package is part of Trinity, as a component of the KDE education module.
%{tde_tdelibdir}/libkigpart.la
%{tde_tdelibdir}/libkigpart.so
%{tde_tdeappdir}/kig.desktop
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion}
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%{tde_datadir}/apps/katepart/syntax/python-kig.xml
%endif
%{tde_datadir}/apps/kig/
@@ -1349,7 +1349,7 @@ export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --exec-prefix=%{_prefix} \
+ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
@@ -1357,7 +1357,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
--enable-new-ldflags \
--disable-dependency-tracking \
--disable-rpath \
-%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion}
+%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion}
--enable-kig-python-scripting \
%else
--disable-kig-python-scripting \
diff --git a/redhat/kdegames/trinity-kdegames-3.5.13.spec b/redhat/kdegames/trinity-kdegames-3.5.13.spec
index 80271fe56..d81424740 100644
--- a/redhat/kdegames/trinity-kdegames-3.5.13.spec
+++ b/redhat/kdegames/trinity-kdegames-3.5.13.spec
@@ -1,14 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -30,7 +30,7 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: kdegames-%{version}.tar.gz
@@ -1539,7 +1539,7 @@ export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --exec-prefix=%{_prefix} \
+ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
diff --git a/redhat/kdegraphics/kdegraphics-3.5.13-disable_kuickshow_doc.patch b/redhat/kdegraphics/kdegraphics-3.5.13-disable_kuickshow_doc.patch
new file mode 100644
index 000000000..b33ee2b8d
--- /dev/null
+++ b/redhat/kdegraphics/kdegraphics-3.5.13-disable_kuickshow_doc.patch
@@ -0,0 +1,10 @@
+--- kdegraphics/doc/kuickshow/CMakeLists.txt.ORI 2012-08-02 20:57:35.855904888 +0000
++++ kdegraphics/doc/kuickshow/CMakeLists.txt 2012-08-02 20:57:53.872026818 +0000
+@@ -9,4 +9,6 @@
+ #
+ #################################################
+
+-tde_create_handbook( DESTINATION kuickshow )
++if( BUILD_KUICKSHOW )
++ tde_create_handbook( DESTINATION kuickshow )
++endif( )
diff --git a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
index 780b0f1d5..58493cf25 100644
--- a/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
+++ b/redhat/kdegraphics/trinity-kdegraphics-3.5.13.spec
@@ -1,14 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -25,7 +25,7 @@ License: GPL
Summary: Trinity Desktop Environment - Graphics Applications
Group: Applications/Multimedia
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
@@ -57,6 +57,8 @@ Patch7: kdegraphics-3.5.13-fix_corrupt_image_file.patch
Patch8: kdegraphics-3.5.13-add_poppler_tqt_pc.patch
# [tdegraphics] Fix poppler include directory location
Patch9: kdegraphics-3.5.13-fix_poppler_include_dir.patch
+# [tdegraphics] Disable kuickshow documentation if kuickshow is not built
+Patch10: kdegraphics-3.5.13-disable_kuickshow_doc.patch
BuildRequires: cmake >= 2.8
BuildRequires: tqtinterface-devel >= 3.5.13
@@ -73,7 +75,7 @@ BuildRequires: libusb-devel
BuildRequires: libdrm-devel
BuildRequires: pcre-devel
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}sane1-devel
BuildRequires: %{_lib}t1lib-devel
BuildRequires: %{_lib}paper-devel
@@ -84,7 +86,7 @@ BuildRequires: %{_lib}xi-devel
# kgamma
BuildRequires: %{_lib}xxf86vm-devel
# ksvg
-BuildRequires: %{_lib}xmu6-devel
+BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
# kpovmodeler
BuildRequires: %{_lib}mesagl1-devel
BuildRequires: %{_lib}mesaglu1-devel
@@ -110,14 +112,18 @@ BuildRequires: OpenEXR-devel
# kpdf
BuildRequires: freetype-devel
-%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?mgaversion}
+%if 0%{?rhel} >=6 || 0%{?fedora} >= 15
BuildRequires: poppler-devel >= 0.12
#BuildRequires: poppler-qt-devel >= 0.12
%else
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}poppler-devel
+%else
# On RHEL 5, the distro-provided poppler is too old. We built a newer one.
BuildRequires: trinity-poppler-devel
BuildRequires: trinity-poppler-qt3-devel >= 0.12
%endif
+%endif
# ksvg
BuildRequires: fontconfig-devel
@@ -588,7 +594,6 @@ Homepage: http://www.kpovmodeler.org
%doc rpmdocs/kpovmodeler/
%{tde_bindir}/kpovmodeler
%{tde_libdir}/libkpovmodeler.so.*
-%{tde_libdir}/libkpovmodeler.la
%{tde_tdelibdir}/libkpovmodelerpart.*
%{tde_tdeappdir}/kpovmodeler.desktop
%{tde_datadir}/apps/kpovmodeler/
@@ -876,15 +881,15 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
############
# Excludes kuickshow (built separately)
-%exclude %{tde_bindir}/kuickshow
-%exclude %{tde_tdelibdir}/kuickshow.la
-%exclude %{tde_tdelibdir}/kuickshow.so
-%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.la
-%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.so
-%exclude %{tde_tdeappdir}/kuickshow.desktop
-%exclude %{tde_datadir}/apps/kuickshow/
-%exclude %{tde_datadir}/icons/hicolor/*/apps/kuickshow.png
-%exclude %{tde_tdedocdir}/HTML/en/kuickshow/
+#%exclude %{tde_bindir}/kuickshow
+#%exclude %{tde_tdelibdir}/kuickshow.la
+#%exclude %{tde_tdelibdir}/kuickshow.so
+#%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.la
+#%exclude %{tde_libdir}/lib[kt]deinit_kuickshow.so
+#%exclude %{tde_tdeappdir}/kuickshow.desktop
+#%exclude %{tde_datadir}/apps/kuickshow/
+#%exclude %{tde_datadir}/icons/hicolor/*/apps/kuickshow.png
+#%exclude %{tde_tdedocdir}/HTML/en/kuickshow/
##########
@@ -902,6 +907,7 @@ Requires: %{name}-libpoppler-tqt-devel = %{version}-%{release}
%patch7 -p1
%patch8 -p1
%patch9 -p1
+%patch10 -p1 -b .kuickshowdoc
%build
@@ -911,7 +917,11 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
#export LD_LIBRARY_PATH="%{tde_libdir}"
-%{?!mgaversion:%__mkdir build; cd build}
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
%cmake \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
@@ -926,6 +936,7 @@ export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-DWITH_PDF=ON \
-DWITH_PDF=ON \
-DBUILD_ALL=ON \
+ -DBUILD_KUICKSHOW=OFF \
..
%__make %{?_smp_mflags}
@@ -962,10 +973,6 @@ for dir in k* ; do
done
done
-# unpackaged files
-# omit kpovmodeler-devel files (for now) -- Rex
-rm -f %{buildroot}/libkpovmodeler.so
-
%clean
%__rm -rf %{buildroot}
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index 89e939507..3fdabccf1 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -1,16 +1,17 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdedocdir %{tde_docdir}/kde
+%define tde_tdeincludedir %{tde_includedir}/kde
%define tde_tdelibdir %{tde_libdir}/trinity
%define _docdir %{tde_docdir}
@@ -26,7 +27,7 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdelibs-%{version}.tar.gz
@@ -112,11 +113,11 @@ BuildRequires: avahi-tqt-devel >= 3.5.13
# LUA support are not ready yet
#BuildRequires: lua-devel
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}avahi-client-devel
BuildRequires: %{_lib}ltdl-devel
BuildRequires: x11-proto-devel
-BuildRequires: %{_lib}xcomposite1-devel
+BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
Requires: %{_lib}avahi-client3
%else
BuildRequires: avahi-devel
@@ -215,7 +216,7 @@ kimgio (image manipulation).
%{tde_datadir}/icons/crystalsvg/
%{tde_tdedocdir}/HTML/en/kspell/
# remove conflicts with kdelibs-4
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%{tde_bindir}/checkXML
%{tde_bindir}/ksvgtopng
%{tde_bindir}/kunittestmodrunner
@@ -240,10 +241,10 @@ kimgio (image manipulation).
%endif
# Avoid conflict with 'redhat-menus' package
-%if "%{_prefix}" == "/usr"
+%if "%{tde_prefix}" == "/usr"
%{_sysconfdir}/xdg/menus/kde-applications.menu
%else
-%{_prefix}/etc/xdg/menus/kde-applications.menu
+%{tde_prefix}/etc/xdg/menus/kde-applications.menu
%endif
# New in TDE 3.5.13
@@ -277,7 +278,7 @@ applications for TDE.
%{tde_bindir}/kconfig_compiler
%{tde_bindir}/makekdewidgets
%{tde_datadir}/apps/ksgmltools2/
-%{tde_includedir}/*
+%{tde_tdeincludedir}/*
%{tde_libdir}/*.la
%{tde_libdir}/*.so
%{tde_libdir}/*.a
@@ -334,11 +335,16 @@ export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export LD_LIBRARY_PATH="%{tde_libdir}"
-%{?!mgaversion:%__mkdir build; cd build}
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
%cmake \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DDOC_INSTALL_DIR=%{tde_docdir} \
- -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DPKGCONFIG_INSTALL_DIR=%{tde_libdir}/pkgconfig \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
@@ -369,7 +375,7 @@ export LD_LIBRARY_PATH="%{tde_libdir}"
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} -C build
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
%{tde_libdir}
@@ -377,10 +383,10 @@ EOF
%endif
# Moves the XDG configuration files to TDE directory
-%if "%{_prefix}" != "/usr"
+%if "%{tde_prefix}" != "/usr"
%__install -p -D -m644 \
"%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
- "%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu"
+ "%{?buildroot}%{tde_prefix}/etc/xdg/menus/kde-applications.menu"
%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
%else
%__mv -f "%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" "%{?buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu"
diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch b/redhat/kdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch
index 20770d670..f064303b7 100644
--- a/redhat/kdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch
+++ b/redhat/kdemultimedia/kdemultimedia-3.5.13-missing_ldflags.patch
@@ -38,7 +38,7 @@
$(top_builddir)/arts/midi/libartsmidi_idl.la \
$(top_builddir)/arts/modules/synth/libartsmodulessynth.la \
- -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE)
-+ -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) -lqt-mt -lvorbisfile
++ -lartsflow -lartsflow_idl -lmcop $(LIB_KDECORE) -lqt-mt -lvorbisfile -lgthread-2.0
libartsmodulescommon_la_LDFLAGS = $(all_libraries) -L$(arts_libraries) -no-undefined
diff --git a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
index 408a596e5..cc44f9a02 100644
--- a/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
+++ b/redhat/kdemultimedia/trinity-kdemultimedia-3.5.13.spec
@@ -1,14 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -39,14 +39,11 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdemultimedia-%{version}.tar.gz
-%if "%{_prefix}" == "/usr"
-Provides: kdemultimedia3 = %{version}-%{release}
-%endif
# RedHat Legacy patches (from Fedora 8)
Patch3: kdemultimedia-3.4.0-xdg.patch
@@ -90,14 +87,14 @@ BuildRequires: automake libtool
%{?_with_taglib:BuildRequires: taglib-devel}
BuildRequires: cdparanoia
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}gstreamer0.10-devel
BuildRequires: %{_lib}flac-devel
+BuildRequires: libcdda-devel
%{?_with_xine:BuildRequires: %{_lib}xine-devel}
BuildRequires: %{_lib}xxf86dga-devel
BuildRequires: %{_lib}xxf86vm-devel
BuildRequires: %{_lib}xtst-devel
-BuildRequires: libcdda-devel
%else
BuildRequires: gstreamer-devel
BuildRequires: flac-devel
@@ -515,7 +512,7 @@ This package provides data on multimedia applications for kappfinder.
%defattr(-,root,root,-)
%{tde_datadir}/apps/kappfinder/*
%{tde_datadir}/desktop-directories/[kt]de-multimedia-music.directory
-%{_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu
+%{tde_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu
##########
@@ -898,7 +895,8 @@ and WAV playback
Summary: Media player for Trinity
Group: Applications/Multimedia
-%if 0%{?mgaversion}
+# 20120802: Hack to avoir dependency issue on MGA2 and MDV2011
+%if 0%{?mgaversion} || 0%{?mdkversion}
Provides: devel(libnoatunarts)
Provides: devel(libnoatunarts(64bit))
%endif
@@ -997,7 +995,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
Summary: Development files for %{name}, aRts and noatun plugins
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: trinity-kdelibs-devel
+Requires: trinity-tdelibs-devel >= 3.5.13
Obsoletes: trinity-kdemultimedia-devel < %{version}-%{release}
Provides: trinity-kdemultimedia-devel = %{version}-%{release}
@@ -1093,13 +1091,13 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
# Required for some distro
-export KDEDIRS=%{_prefix}
+export KDEDIRS=%{tde_prefix}
%configure \
- --exec-prefix=%{_prefix} \
+ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
- --includedir=%{tde_includedir} \
+ --includedir=%{tde_tdeincludedir} \
--datadir=%{tde_datadir} \
--enable-new-ldflags \
--disable-dependency-tracking \
@@ -1118,7 +1116,7 @@ export KDEDIRS=%{_prefix}
%{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \
%{?_with_taglib} %{!?_with_taglib:--without-taglib} \
%{?_with_xine} %{!?_with_xine:--without-xine} \
- --with-extra-includes="%{_usr}/include/cdda:%{_usr}/include/cddb:%{tde_includedir}/tqt" \
+ --with-extra-includes="%{_includedir}/cdda:%{_includedir}/cddb:%{tde_includedir}/tqt:%{tde_tdeincludedir}/arts:%{tde_includedir}/artsc" \
--enable-closure
%__make %{?_smp_mflags}
@@ -1152,7 +1150,7 @@ fi
# Moves the XDG configuration files to TDE directory
%__install -p -D -m644 \
"%{?buildroot}%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu" \
- "%{?buildroot}%{_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu"
+ "%{?buildroot}%{tde_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu"
%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
diff --git a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
index 676dcf495..85fe3a196 100644
--- a/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
+++ b/redhat/kdenetwork/trinity-kdenetwork-3.5.13.spec
@@ -1,15 +1,15 @@
# If TDE is built iwn a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
-%define tde_sbindir %{_prefix}/sbin
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_sbindir %{tde_prefix}/sbin
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -40,7 +40,7 @@ URL: http://www.trinitydesktop.org/
License: GPLv2
Group: Applications/Internet
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdenetwork-%{version}.tar.gz
@@ -96,7 +96,7 @@ BuildRequires: libXmu-devel libXScrnSaver-devel libXtst-devel libXxf86vm-devel
%if 0%{?fedora} > 5 || 0%{?rhel} > 4
BuildRequires: wireless-tools-devel
%else
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}iw29-devel
%else
# RHEL 5
@@ -114,7 +114,7 @@ BuildRequires: valgrind
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
BuildRequires: libv4l-devel
%endif
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}v4l-devel
%endif
@@ -1050,7 +1050,10 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export LD_LIBRARY_PATH="%{tde_libdir}"
-%{?!mgaversion:%__mkdir build; cd build}
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
%cmake \
-DBIN_INSTALL_DIR=%{tde_bindir} \
diff --git a/redhat/kdepim/kdepim-3.5.13-fix_include_directory.patch b/redhat/kdepim/kdepim-3.5.13-fix_include_directory.patch
new file mode 100644
index 000000000..2d12817b2
--- /dev/null
+++ b/redhat/kdepim/kdepim-3.5.13-fix_include_directory.patch
@@ -0,0 +1,219 @@
+--- kdepim/akregator/src/CMakeLists.txt.ORI 2012-08-02 23:49:19.725396251 +0200
++++ kdepim/akregator/src/CMakeLists.txt 2012-08-02 23:49:26.428291587 +0200
+@@ -39,7 +39,7 @@
+ install( FILES
+ plugin.h articleinterceptor.h akregator_export.h storage.h
+ feedstorage.h storagefactory.h storagefactoryregistry.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/akregator )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/akregator )
+
+
+ ##### other data ################################
+--- kdepim/libksieve/ksieve/CMakeLists.txt.ORI 2012-08-02 22:02:44.380776017 +0000
++++ kdepim/libksieve/ksieve/CMakeLists.txt 2012-08-02 22:03:27.102148170 +0000
+@@ -11,4 +11,4 @@
+
+ install( FILES
+ error.h lexer.h parser.h scriptbuilder.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/ksieve )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/ksieve )
+--- kdepim/libemailfunctions/CMakeLists.txt.ORI 2012-08-02 22:02:44.381775953 +0000
++++ kdepim/libemailfunctions/CMakeLists.txt 2012-08-02 22:03:27.103148111 +0000
+@@ -25,7 +25,7 @@
+ ##### header files ################################
+
+ if( BUILD_LIBKDEPIM )
+- install( FILES idmapper.h DESTINATION ${INCLUDE_INSTALL_DIR}/kde/libemailfunctions )
++ install( FILES idmapper.h DESTINATION ${INCLUDE_INSTALL_DIR}/libemailfunctions )
+ endif()
+
+
+--- kdepim/libkdenetwork/qgpgme/CMakeLists.txt.ORI 2012-08-02 22:02:44.381775953 +0000
++++ kdepim/libkdenetwork/qgpgme/CMakeLists.txt 2012-08-02 22:03:27.104148051 +0000
+@@ -27,7 +27,7 @@
+
+ install( FILES
+ eventloopinteractor.h dataprovider.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/qgpgme )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/qgpgme )
+
+
+ ##### qgpgme (shared) ###########################
+--- kdepim/libkdenetwork/gpgmepp/CMakeLists.txt.ORI 2012-08-02 22:02:44.382775890 +0000
++++ kdepim/libkdenetwork/gpgmepp/CMakeLists.txt 2012-08-02 22:03:27.105147991 +0000
+@@ -35,7 +35,7 @@
+ keygenerationresult.h importresult.h decryptionresult.h
+ verificationresult.h signingresult.h encryptionresult.h
+ engineinfo.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/gpgme++ )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/gpgme++ )
+
+
+ ##### gpgme++ (shared) ##########################
+--- kdepim/kontact/interfaces/CMakeLists.txt.ORI 2012-08-02 22:02:44.383775827 +0000
++++ kdepim/kontact/interfaces/CMakeLists.txt 2012-08-02 22:03:27.106147931 +0000
+@@ -26,7 +26,7 @@
+
+ install( FILES
+ core.h plugin.h summary.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kontact )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kontact )
+
+
+ ##### other data ################################
+--- kdepim/libkcal/CMakeLists.txt.ORI 2012-08-02 22:02:44.384775764 +0000
++++ kdepim/libkcal/CMakeLists.txt 2012-08-02 22:03:27.107147871 +0000
+@@ -49,7 +49,7 @@
+ resourcelocaldirconfig.h resourcelocaldir.h resourcelocal.h
+ scheduler.h libkcal_export.h todo.h vcaldrag.h vcalformat.h
+ attachmenthandler.h ${CMAKE_CURRENT_BINARY_DIR}/htmlexportsettings.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/libkcal )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/libkcal )
+
+
+ ##### other data ################################
+--- kdepim/kresources/egroupware/CMakeLists.txt.ORI 2012-08-02 22:02:44.385775701 +0000
++++ kdepim/kresources/egroupware/CMakeLists.txt 2012-08-02 22:03:27.108147811 +0000
+@@ -28,7 +28,7 @@
+
+ install( FILES
+ kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kabc )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+
+
+ ##### other data ################################
+--- kdepim/indexlib/CMakeLists.txt.ORI 2012-08-02 22:02:44.386775637 +0000
++++ kdepim/indexlib/CMakeLists.txt 2012-08-02 22:03:27.109147752 +0000
+@@ -26,7 +26,7 @@
+
+ install( FILES
+ create.h index.h lockfile.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/index )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/index )
+
+
+ ##### other data ################################
+--- kdepim/kaddressbook/interfaces/CMakeLists.txt.ORI 2012-08-02 22:02:44.386775637 +0000
++++ kdepim/kaddressbook/interfaces/CMakeLists.txt 2012-08-02 22:03:27.110147693 +0000
+@@ -28,7 +28,7 @@
+ install( FILES
+ configurewidget.h contacteditorwidget.h core.h
+ extensionwidget.h xxport.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kaddressbook )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kaddressbook )
+
+
+ ##### other data ################################
+--- kdepim/mimelib/mimelib/CMakeLists.txt.ORI 2012-08-02 22:02:44.387775573 +0000
++++ kdepim/mimelib/mimelib/CMakeLists.txt 2012-08-02 22:03:27.111147634 +0000
+@@ -16,4 +16,4 @@
+ mboxlist.h mechansm.h mediatyp.h message.h mimepp.h
+ msgcmp.h msgid.h nntp.h param.h pop.h protocol.h
+ string.h text.h token.h utility.h uuencode.h binhex.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/mimelib )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/mimelib )
+--- kdepim/certmanager/lib/kleo/CMakeLists.txt.ORI 2012-08-02 22:02:44.388775510 +0000
++++ kdepim/certmanager/lib/kleo/CMakeLists.txt 2012-08-02 22:03:27.112147575 +0000
+@@ -34,7 +34,7 @@
+ verifyopaquejob.h decryptverifyjob.h signencryptjob.h
+ refreshkeysjob.h multideletejob.h hierarchicalkeylistjob.h
+ keyfilter.h keyfiltermanager.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kleo )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo )
+
+
+ ##### kleopatra_core (static) ###################
+--- kdepim/korganizer/interfaces/calendar/CMakeLists.txt.ORI 2012-08-02 22:02:44.390775383 +0000
++++ kdepim/korganizer/interfaces/calendar/CMakeLists.txt 2012-08-02 22:03:27.114147455 +0000
+@@ -11,7 +11,7 @@
+
+ install( FILES
+ plugin.h calendardecoration.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/calendar )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/calendar )
+
+ install( FILES
+ calendarplugin.desktop calendardecoration.desktop
+--- kdepim/korganizer/interfaces/korganizer/CMakeLists.txt.ORI 2012-08-02 22:02:44.391775319 +0000
++++ kdepim/korganizer/interfaces/korganizer/CMakeLists.txt 2012-08-02 22:03:27.114147455 +0000
+@@ -11,7 +11,7 @@
+
+ install( FILES
+ part.h baseview.h calendarviewbase.h mainwindow.h corehelper.h printplugin.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/korganizer )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/korganizer )
+
+ install( FILES
+ korganizerpart.desktop korgprintplugin.desktop
+--- kdepim/kmail/interfaces/CMakeLists.txt.ORI 2012-08-02 22:02:44.392775255 +0000
++++ kdepim/kmail/interfaces/CMakeLists.txt 2012-08-02 22:03:27.116147335 +0000
+@@ -12,4 +12,4 @@
+ install( FILES
+ observer.h observable.h htmlwriter.h bodypart.h
+ bodypartformatter.h bodyparturlhandler.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kmail/interfaces )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kmail/interfaces )
+--- kdepim/kgantt/kgantt/CMakeLists.txt.ORI 2012-08-02 22:02:44.393775192 +0000
++++ kdepim/kgantt/kgantt/CMakeLists.txt 2012-08-02 22:03:27.117147275 +0000
+@@ -26,7 +26,7 @@
+ install( FILES
+ KGantt.h KGanttItem.h KGanttRelation.h xQGanttBarView.h xQGanttBarViewPort.h
+ xQGanttListView.h xQGanttListViewPort.h KGanttBarConfig.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kgantt )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kgantt )
+
+
+ ##### kgantt (shared) ###########################
+--- kdepim/libkpimexchange/core/CMakeLists.txt.ORI 2012-08-02 22:02:44.394775129 +0000
++++ kdepim/libkpimexchange/core/CMakeLists.txt 2012-08-02 22:03:27.118147215 +0000
+@@ -30,7 +30,7 @@
+
+ install( FILES
+ exchangeclient.h exchangeaccount.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kdepim )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/kdepim )
+
+
+ ##### kpimexchange (shared) #####################
+--- kdepim/ktnef/ktnef/CMakeLists.txt.ORI 2012-08-02 22:02:44.395775066 +0000
++++ kdepim/ktnef/ktnef/CMakeLists.txt 2012-08-02 22:03:27.119147156 +0000
+@@ -13,4 +13,4 @@
+ ktnefparser.h ktnefattach.h ktnefproperty.h
+ ktnefpropertyset.h ktnefmessage.h ktnefwriter.h
+ ktnefdefs.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/ktnef )
++ DESTINATION ${INCLUDE_INSTALL_DIR}/ktnef )
+--- ./knotes/CMakeLists.txt.ORI 2012-08-02 22:07:47.777059775 +0000
++++ ./knotes/CMakeLists.txt 2012-08-02 22:08:42.414825054 +0000
+@@ -34,7 +34,7 @@
+
+ ##### headers ###################################
+
+-install( FILES KNotesIface.h KNotesAppIface.h DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
++install( FILES KNotesIface.h KNotesAppIface.h DESTINATION ${INCLUDE_INSTALL_DIR} )
+
+
+ ##### other data ################################
+--- ./kmail/CMakeLists.txt.ORI 2012-08-02 22:07:47.777059775 +0000
++++ ./kmail/CMakeLists.txt 2012-08-02 22:08:42.415825014 +0000
+@@ -65,7 +65,7 @@
+
+ install( FILES
+ kmailIface.h kmailpartIface.h kmailicalIface.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
++ DESTINATION ${INCLUDE_INSTALL_DIR} )
+
+
+ ##### other data ################################
+--- ./libkdepim/CMakeLists.txt.ORI 2012-08-02 22:07:47.778059734 +0000
++++ ./libkdepim/CMakeLists.txt 2012-08-02 22:08:42.416824973 +0000
+@@ -40,7 +40,7 @@
+
+ install( FILES
+ kdepimmacros.h kpimprefs.h
+- DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
++ DESTINATION ${INCLUDE_INSTALL_DIR} )
+
+
+ ##### other data ################################
diff --git a/redhat/kdepim/trinity-kdepim-3.5.13.spec b/redhat/kdepim/trinity-kdepim-3.5.13.spec
index ba06d01ee..5cb8ec509 100644
--- a/redhat/kdepim/trinity-kdepim-3.5.13.spec
+++ b/redhat/kdepim/trinity-kdepim-3.5.13.spec
@@ -1,15 +1,15 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -19,7 +19,7 @@ BuildRequires: cmake >= 2.8
%define _docdir %{tde_docdir}
# KDEPIM specific features
-%if 0%{?fedora} || 0%{?mgaversion}
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
%define with_gnokii 1
%else
%define with_gnokii 0
@@ -40,7 +40,7 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
Summary: Personal Information Management apps from the official Trinity release
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
Source0: kdepim-%{version}.tar.gz
@@ -67,6 +67,8 @@ Patch10: kdepim-3.5.13-fix_segv.patch
Patch11: kdepim-3.5.13-fix_kalarm_icon_reference.patch
# [tdepim] Disable unneccesary fsync() in cached IMAP handler [Bug #467] [Commit #82d4a938]
Patch12: kdepim-3.5.13-disable_fsync_in_cached_imap.patch
+# [tdepim] Fix include directory location
+Patch13: kdepim-3.5.13-fix_include_directory.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -99,8 +101,8 @@ BuildRequires: trinity-libcurl-devel
BuildRequires: curl-devel
%endif
-%if 0%{?mgaversion}
-BuildRequires: %{_lib}xcomposite1-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
BuildRequires: %{_lib}sasl2-devel
%else
BuildRequires: libXcomposite-devel
@@ -218,7 +220,6 @@ thousands of internet feeds in a quick, efficient, and familiar way.
%{tde_datadir}/apps/akregator
%{tde_datadir}/config.kcfg/akregator.kcfg
%{tde_datadir}/config.kcfg/mk4config.kcfg
-%{tde_datadir}/icons/hicolor/128x128/apps/akregator.png
%{tde_datadir}/icons/crystalsvg/*/actions/rss_tag.png
%{tde_datadir}/icons/crystalsvg/16x16/apps/akregator_empty.png
%{tde_datadir}/icons/hicolor/*/apps/akregator.png
@@ -1344,7 +1345,7 @@ installed.
%{tde_datadir}/servicetypes/dcopcalendar.desktop
%{tde_datadir}/servicetypes/korganizerpart.desktop
%{tde_datadir}/servicetypes/korgprintplugin.desktop
-%{tde_includedir}/korganizer
+%{tde_tdeincludedir}/korganizer
%{tde_tdeincludedir}/korganizer
%{tde_tdeincludedir}/calendar
%{tde_tdedocdir}/HTML/en/korganizer/
@@ -1575,7 +1576,6 @@ library.
%files -n trinity-libkcal-devel
%{tde_tdeincludedir}/libemailfunctions/idmapper.h
%{tde_tdeincludedir}/libkcal
-%{tde_includedir}/libkcal
%{tde_libdir}/libkcal.la
%{tde_libdir}/libkcal.so
%{tde_libdir}/libkcal_resourceremote.la
@@ -1753,9 +1753,7 @@ libkleopatra-trinity library.
%files -n trinity-libkleopatra-devel
%{tde_tdeincludedir}/gpgme++
-%{tde_includedir}/gpgme++
%{tde_tdeincludedir}/kleo
-%{tde_includedir}/kleo
%{tde_tdeincludedir}/qgpgme
%{tde_libdir}/libgpgme++.la
%{tde_libdir}/libgpgme++.so
@@ -2098,7 +2096,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%patch10 -p1 -b .segv
%patch11 -p1
%patch12 -p1
-
+%patch13 -p1 -b .incdir
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -2107,12 +2105,16 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
export LD_LIBRARY_PATH="%{tde_libdir}"
-%{?!mgaversion:%__mkdir build; cd build}
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
%cmake \
+ -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-DBIN_INSTALL_DIR=%{tde_bindir} \
- -DINCLUDE_INSTALL_DIR=%{tde_includedir} \
+ -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
- -DPKGCONFIG_INSTALL_DIR=%{tde_tdelibdir}/pkgconfig \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
-DCMAKE_SKIP_RPATH="OFF" \
-DWITH_ARTS=ON \
diff --git a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
index 6bb248eb3..6d5ee5cde 100644
--- a/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
+++ b/redhat/kdesdk/trinity-kdesdk-3.5.13.spec
@@ -1,14 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%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
@@ -28,7 +28,7 @@ URL: http://www.trinitydesktop.org/
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: kdesdk-%{version}.tar.gz
@@ -51,7 +51,11 @@ BuildRequires: pcre-devel
BuildRequires: trinity-tdelibs-devel
# for kbugbuster/libkcal
BuildRequires: trinity-tdepim-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}db5.1-devel
+%else
BuildRequires: db4-devel
+%endif
BuildRequires: desktop-file-utils
# kbabel, F-7+: flex >= 2.5.33-9
BuildRequires: flex
@@ -60,7 +64,7 @@ BuildRequires: libxslt-devel libxml2-devel
BuildRequires: perl
BuildRequires: subversion-devel neon-devel
-%if 0%{?mgaversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}ltdl-devel
BuildRequires: %{_lib}binutils-devel
%else
@@ -613,7 +617,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
#debian/desktop-i18n/findfiles /opt/trinity/lib/kubuntu-desktop-i18n/
#debian/desktop-i18n/msgsplit /opt/trinity/lib/kubuntu-desktop-i18n/
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%{tde_bindir}/licensecheck
%else
%exclude %{tde_bindir}/licensecheck
@@ -1042,7 +1046,11 @@ export LD_LIBRARY_PATH="%{tde_libdir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-%{?!mgaversion:%__mkdir build; cd build}
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
%cmake \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_includedir} \
diff --git a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
index e50ffbbb2..57f11f2a8 100644
--- a/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
+++ b/redhat/kdetoys/trinity-kdetoys-3.5.13.spec
@@ -1,14 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -34,7 +34,7 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: autoconf automake libtool m4
@@ -96,7 +96,6 @@ This package is part of Trinity, and a component of the TDE toys module.
%files -n trinity-amor
%defattr(-,root,root,-)
%{tde_bindir}/amor
-%exclude %{tde_tdeincludedir}/AmorIface.h
%{tde_datadir}/apps/amor/
%{tde_tdeappdir}/amor.desktop
%{tde_datadir}/icons/hicolor/*/apps/amor.png
@@ -393,7 +392,8 @@ export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --exec-prefix=%{_prefix} \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
@@ -434,6 +434,9 @@ for lang_dir in %{buildroot}$HTML_DIR/* ; do
done
fi
+# Useless include file from Amor
+%__rm -f %{buildroot}%{tde_tdeincludedir}/AmorIface.h
+
%clean
%__rm -rf %{buildroot}
diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
index bd99c4d25..3c32f5e12 100755
--- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
+++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec
@@ -1,16 +1,16 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%define _docdir %{tde_datadir}/doc
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
-%define tde_sbindir %{_prefix}/sbin
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_sbindir %{tde_prefix}/sbin
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -30,7 +30,7 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdeutils-%{version}.tar.gz
@@ -959,7 +959,8 @@ export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --exec-prefix=%{_prefix} \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
index 2f1381a8f..95df4fa44 100644
--- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
+++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec
@@ -1,14 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%define tde_includedir %{tde_prefix}/include
+%define tde_libdir %{tde_prefix}/%{_lib}
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/kde
@@ -29,7 +29,7 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: kdevelop-%{version}.tar.gz
@@ -66,7 +66,11 @@ BuildRequires: tqtinterface-devel >= 3.5.13
BuildRequires: trinity-arts-devel >= 3.5.13
BuildRequires: trinity-tdelibs-devel >= 3.5.13
#BuildRequires: qt3-devel-docs >= 3.3.8.d
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}db5.1-devel
+%else
BuildRequires: db4-devel
+%endif
BuildRequires: flex
# FIXME: No CVS support in KDevelop? This is going to suck...
# Requires kdesdk3.
@@ -218,7 +222,7 @@ export LD_LIBRARY_PATH="%{tde_libdir}"
# c references
pushd c_cpp_reference-2.0.2_for_KDE_3.0
%configure \
- --exec-prefix=%{_prefix} \
+ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
@@ -228,7 +232,11 @@ pushd c_cpp_reference-2.0.2_for_KDE_3.0
--with-extra-libs=%{tde_libdir}
popd
-%{?!mgaversion:%__mkdir build; cd build}
+%if 0%{?rhel} || 0%{?fedora}
+%__mkdir_p build
+cd build
+%endif
+
%cmake \
-DBIN_INSTALL_DIR=%{tde_bindir} \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
@@ -254,7 +262,7 @@ cd ..
%__make install DESTDIR=%{buildroot} -C c_cpp_reference-2.0.2_for_KDE_3.0
# remove useless files
-%__rm -rf %{buildroot}%{_prefix}/kdevbdb
+#%__rm -rf %{buildroot}%{tde_prefix}/kdevbdb
%clean
diff --git a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec
index 0460226b1..2dec2ccc3 100644
--- a/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec
+++ b/redhat/kdewebdev/trinity-kdewebdev-3.5.13.spec
@@ -1,14 +1,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?_prefix}" != "/usr"
+%if "%{?tde_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
-%define tde_bindir %{_prefix}/bin
-%define tde_datadir %{_prefix}/share
+%define tde_bindir %{tde_prefix}/bin
+%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{_prefix}/include
-%define tde_libdir %{_prefix}/%{_lib}
+%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
@@ -29,7 +29,7 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
-Prefix: %{_prefix}
+Prefix: %{tde_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: kdewebdev-%{version}.tar.gz
@@ -495,7 +495,8 @@ export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --exec-prefix=%{_prefix} \
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
--bindir=%{tde_bindir} \
--datadir=%{tde_datadir} \
--libdir=%{tde_libdir} \