RHEL/Fedora: adds support for Mandriva 2011 in packaging

2 files changed, 239 insertions, 18 deletions

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 \