From 2d4b1216e089a2259539e514761f2c11b0b93212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 30 Jun 2013 21:15:08 +0200 Subject: [PATCH] RPM Packaging: updates --- .../koffice/trinity-koffice-3.5.13.2.spec | 5 + ...de-guidance-3.5.13.2-fix_mountconfig.patch | 51 ++++++ .../trinity-tde-guidance-3.5.13.2.spec | 12 +- .../trinity-tde-systemsettings-3.5.13.2.spec | 5 +- .../tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch | 35 +++++ .../tdmtheme/trinity-tdmtheme-3.5.13.2.spec | 9 +- .../tqca-tls/trinity-tqca-tls-3.5.13.2.spec | 8 +- .../tqca/trinity-tqca-3.5.13.2.spec | 8 +- redhat/genrpm.sh | 9 +- redhat/tdebase/trinity-tdebase-14.0.0.spec | 12 +- redhat/tdebase/trinity-tdebase-3.5.13.2.spec | 14 +- .../trinity-tdebindings-3.5.13.2.spec | 5 + .../trinity-tdemultimedia-3.5.13.2.spec | 2 +- .../trinity-tdenetwork-3.5.13.2.spec | 3 +- redhat/tdepim/trinity-tdepim-14.0.0.spec | 148 +++++++++--------- 15 files changed, 229 insertions(+), 97 deletions(-) create mode 100644 redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch create mode 100644 redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch diff --git a/redhat/applications/koffice/trinity-koffice-3.5.13.2.spec b/redhat/applications/koffice/trinity-koffice-3.5.13.2.spec index 57cfda50e..ab290b820 100644 --- a/redhat/applications/koffice/trinity-koffice-3.5.13.2.spec +++ b/redhat/applications/koffice/trinity-koffice-3.5.13.2.spec @@ -149,7 +149,12 @@ BuildRequires: libwpd-devel Obsoletes: trinity-libwpd # WV2 support +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}wv2-devel +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} BuildRequires: wv2-devel +%endif # MESA support %if 0%{?mgaversion} || 0%{?mdkversion} diff --git a/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch new file mode 100644 index 000000000..34b15b791 --- /dev/null +++ b/redhat/applications/tde-guidance/tde-guidance-3.5.13.2-fix_mountconfig.patch @@ -0,0 +1,51 @@ +commit 3b6ac8e5301bb482b02af7e2b1f0ec613be61218 +Author: Francois Andriot +Date: 1371158323 -0500 + + Work around mountconfig incorrectly handling LABEL tag + This resolves Bug 1545 + Add ext4 support + +diff --git a/mountconfig/MicroHAL.py b/mountconfig/MicroHAL.py +index 9ce8b83..9a913fa 100755 +--- a/mountconfig/MicroHAL.py ++++ b/mountconfig/MicroHAL.py +@@ -669,6 +669,10 @@ class MicroHAL(object): + + if u"volume.label" in parsed_hash: + new_device.label = self._parseString(parsed_hash[u"volume.label"][0]) ++ # If HAL returns label beginning with '#', it usually means that the ++ # actual label contains an Unix path. So we replace '#' with '/'. ++ if len(new_device.label) and new_device.label[0]=='%': ++ new_device.label = new_device.label.replace('%', '/') + + if u"volume.size" in parsed_hash: + size = parsed_hash[u"volume.size"][0] +diff --git a/mountconfig/mountconfig.py b/mountconfig/mountconfig.py +index eefa9fd..9c00b7d 100755 +--- a/mountconfig/mountconfig.py ++++ b/mountconfig/mountconfig.py +@@ -82,6 +82,7 @@ Supported filesystems + nfs + ext2 + ext3 ++ext4 + reiserfs + vfat + ntfs +@@ -1047,6 +1048,7 @@ class MountEntry(object): + + 'ext2' : (MountEntryExtCommonUnixLocal,i18n("Ext2 - Second Extended FS")), + 'ext3' : (MountEntryExtCommonUnixLocal,i18n("Ext3 - Third Extended FS")), ++ 'ext4' : (MountEntryExtCommonUnixLocal,i18n("Ext4 - Fourth Extended FS")), + 'reiserfs' : (MountEntryExtCommonUnixLocal,i18n("ReiserFS")), + 'reiser4' : (MountEntryExtCommonUnixLocal,i18n("Reiser4")), + 'xfs' : (MountEntryExtCommonUnixLocal,i18n("XFS - SGI's journaling filesystem")), +@@ -2389,6 +2391,7 @@ class MountEntryDialog(KDialogBase): + MountTypeEditorsDisk = { + 'ext2' : MountEntryDialogOptionsCommonUnix, + 'ext3' : MountEntryDialogOptionsCommonUnix, ++ 'ext4' : MountEntryDialogOptionsCommonUnix, + 'reiserfs' : MountEntryDialogOptionsCommonUnix, + 'reiser4' : MountEntryDialogOptionsCommonUnix, + 'xfs' : MountEntryDialogOptionsCommonUnix, diff --git a/redhat/applications/tde-guidance/trinity-tde-guidance-3.5.13.2.spec b/redhat/applications/tde-guidance/trinity-tde-guidance-3.5.13.2.spec index 8c4aef75b..6d287c7d3 100644 --- a/redhat/applications/tde-guidance/trinity-tde-guidance-3.5.13.2.spec +++ b/redhat/applications/tde-guidance/trinity-tde-guidance-3.5.13.2.spec @@ -28,7 +28,7 @@ Name: trinity-tde-guidance Summary: A collection of system administration tools for Trinity Version: 0.8.0svn20080103 -Release: 5%{?dist}%{?_variant} +Release: 6%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -42,6 +42,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: trinity-tde-guidance-3.5.13.2.tar.gz +# [tde-guidance] Work around mountconfig incorrectly handling LABEL tag +# This resolves Bug 1545 +# Add ext4 support +Patch1: tde-guidance-3.5.13.2-fix_mountconfig.patch + BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 BuildRequires: trinity-tdebase-devel >= 3.5.13.2 @@ -149,7 +154,7 @@ suspend using HAL. %prep %setup -q -n trinity-tde-guidance-3.5.13.2 - +%patch1 -p1 -b .mountconfig %build unset QTDIR; . /etc/profile.d/qt3.sh @@ -423,6 +428,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %changelog +* Thu Jun 27 2013 Francois Andriot - 0.8.0svn20080103-6 +- Work around mountconfig incorrectly handling LABEL tag + * Mon Jun 03 2013 Francois Andriot - 0.8.0svn20080103-5 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/tde-systemsettings/trinity-tde-systemsettings-3.5.13.2.spec b/redhat/applications/tde-systemsettings/trinity-tde-systemsettings-3.5.13.2.spec index e311d1809..767ed5d21 100644 --- a/redhat/applications/tde-systemsettings/trinity-tde-systemsettings-3.5.13.2.spec +++ b/redhat/applications/tde-systemsettings/trinity-tde-systemsettings-3.5.13.2.spec @@ -28,7 +28,7 @@ Name: trinity-tde-systemsettings Summary: easy to use control centre for TDE Version: 0.0svn20070312 -Release: 6%{?dist}%{?_variant} +Release: 7%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -145,6 +145,9 @@ xdg-user-dirs-update %changelog +* Sat Jun 29 2013 Francois Andriot - 0.0svn20070312-7 +- Rebuild + * Mon Jun 03 2013 Francois Andriot - 0.0svn20070312-6 - Initial release for TDE 3.5.13.2 diff --git a/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch new file mode 100644 index 000000000..64272fe6a --- /dev/null +++ b/redhat/applications/tdmtheme/tdmtheme-3.5.13.2-fix_segv.patch @@ -0,0 +1,35 @@ +--- trinity-tdmtheme-3.5.13.2/src/kdmtheme.cpp.ORI 2013-06-13 08:36:49.449599069 +0200 ++++ trinity-tdmtheme-3.5.13.2/src/kdmtheme.cpp 2013-06-13 08:44:01.014366366 +0200 +@@ -268,16 +268,22 @@ + + void KDMThemeWidget::updateInfoView( ThemeData *theme ) + { +- info->setText( +- ((theme->copyright.length() > 0) ? +- i18n("Copyright: %1
", +- theme->copyright) : "") + +- ((theme->description.length() > 0) ? +- i18n("Description: %1", +- theme->description) : "") ); +- preview->setPixmap( theme->path + '/' + theme->screenShot ); +- preview->setText( theme->screenShot.isEmpty() ? +- "Screenshot not available" : TQString() ); ++ if(theme) { ++ info->setText( ++ ((theme->copyright.length() > 0) ? ++ i18n("Copyright: %1
", ++ theme->copyright) : "") + ++ ((theme->description.length() > 0) ? ++ i18n("Description: %1", ++ theme->description) : "") ); ++ preview->setPixmap( theme->path + '/' + theme->screenShot ); ++ preview->setText( theme->screenShot.isEmpty() ? ++ i18n("Screenshot not available") : TQString() ); ++ } else { ++ info->setText(i18n("No theme selected.")); ++ preview->setPixmap(NULL); ++ preview->setText(i18n("Screenshot not available")); ++ } + } + + void KDMThemeWidget::installNewTheme() diff --git a/redhat/applications/tdmtheme/trinity-tdmtheme-3.5.13.2.spec b/redhat/applications/tdmtheme/trinity-tdmtheme-3.5.13.2.spec index c4962b772..a75c032ef 100644 --- a/redhat/applications/tdmtheme/trinity-tdmtheme-3.5.13.2.spec +++ b/redhat/applications/tdmtheme/trinity-tdmtheme-3.5.13.2.spec @@ -26,7 +26,7 @@ Name: trinity-%{tdecomp} Summary: theme manager for TDM [Trinity] Version: 1.2.2 -Release: 4%{?dist}%{?_variant} +Release: 5%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -40,6 +40,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-3.5.13.2.tar.gz +# [tdmtheme] Fix tdmtheme crash. This resolves Bug 1544 +Patch1: tdmtheme-3.5.13.2-fix_segv.patch + BuildRequires: trinity-tqtinterface-devel >= 3.5.13.2 BuildRequires: trinity-tdelibs-devel >= 3.5.13.2 BuildRequires: trinity-tdebase-devel >= 3.5.13.2 @@ -63,6 +66,7 @@ that allows you to easily install, remove and change your KDM themes. %prep %setup -q -n %{name}-3.5.13.2 +%patch1 -p1 -b .segv # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -121,6 +125,9 @@ update-desktop-database %{tde_appdir} &> /dev/null %changelog +* Thu Jun 27 2013 Francois Andriot - 1.2.2-5 +- Fix tdmtheme crash. This resolves Bug 1544 + * Mon Jun 03 2013 Francois Andriot - 1.2.2-4 - Initial release for TDE 3.5.13.2 diff --git a/redhat/dependencies/tqca-tls/trinity-tqca-tls-3.5.13.2.spec b/redhat/dependencies/tqca-tls/trinity-tqca-tls-3.5.13.2.spec index 4d33e8d02..003eb95e5 100644 --- a/redhat/dependencies/tqca-tls/trinity-tqca-tls-3.5.13.2.spec +++ b/redhat/dependencies/tqca-tls/trinity-tqca-tls-3.5.13.2.spec @@ -14,7 +14,7 @@ Name: trinity-tqca-tls Version: 1.0 -Release: 1%{?dist}%{?_variant} +Release: 2%{?dist}%{?_variant} Summary: TLS plugin for the TQt Cryptographic Architecture License: LGPLv2+ @@ -61,6 +61,9 @@ contains the TLS plugin. %patch2 -p1 -b .ossl10 %patch10 -p1 -b .qt +# Revert TQCA to QCA +%__sed -i * -e "s|TQCA|QCA|g" + %build unset QTDIR || : ; . /etc/profile.d/qt3.sh @@ -96,5 +99,8 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %changelog +* Thu Jun 27 2013 Francois Andriot - 1.0-2 +- Renames TQCA to QCA in source code + * Mon Jun 03 2013 Francois Andriot - 1.0-1 - Initial build for TDE 3.5.13.2 diff --git a/redhat/dependencies/tqca/trinity-tqca-3.5.13.2.spec b/redhat/dependencies/tqca/trinity-tqca-3.5.13.2.spec index e8e0bdcbc..eefe8a16e 100644 --- a/redhat/dependencies/tqca/trinity-tqca-3.5.13.2.spec +++ b/redhat/dependencies/tqca/trinity-tqca-3.5.13.2.spec @@ -15,7 +15,7 @@ Name: trinity-tqca Version: 1.0 -Release: 1%{?dist}%{?_variant} +Release: 2%{?dist}%{?_variant} Summary: TQt Cryptographic Architecture @@ -95,6 +95,9 @@ This packages contains the development files for TQCA # Fix 'lib64' library directory perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra +# Revert TQCA to QCA +%__sed -i examples/*/*.cpp src/*.h src/*.cpp -e "s|TQCA|QCA|g" + %build unset QTDIR || : ; . /etc/profile.d/qt3.sh @@ -121,5 +124,8 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %changelog +* Thu Jun 27 2013 Francois Andriot - 1.0-2 +- Renames TQCA to QCA in source code + * Mon Jun 03 2013 Francois Andriot - 1.0-1 - Initial build for TDE 3.5.13.2 diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh index f5c65ed4b..4b8c496c1 100755 --- a/redhat/genrpm.sh +++ b/redhat/genrpm.sh @@ -3,8 +3,6 @@ cd "$( dirname "$0" )" ARGS="" -#eval TARBALLS_DIR=~/tde/tde-tarballs/3.5.13.2 -eval TARBALLS_DIR=~/tde/tde-tarballs/14.0.0 DIST="$(rpmdist.sh --dist)" # CCACHE related stuff @@ -25,6 +23,13 @@ while [ $# -gt 0 ]; do shift done +if [ -d ~/tde/tde-tarballs/${REQVERSION} ]; then + eval TARBALLS_DIR=~/tde/tde-tarballs/${REQVERSION} +else + eval TARBALLS_DIR=~/tde/tde-tarballs/3.5.13.2 + #eval TARBALLS_DIR=~/tde/tde-tarballs/14.0.0 +fi + clear cat <"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE" diff --git a/redhat/tdebase/trinity-tdebase-3.5.13.2.spec b/redhat/tdebase/trinity-tdebase-3.5.13.2.spec index e3b90f11f..48e7b887a 100644 --- a/redhat/tdebase/trinity-tdebase-3.5.13.2.spec +++ b/redhat/tdebase/trinity-tdebase-3.5.13.2.spec @@ -2832,7 +2832,7 @@ KDE will start, but many good defaults will not be set. %files -n trinity-ksmserver %defattr(-,root,root,-) %{tde_bindir}/ksmserver -%{tde_bindir}/start[kt]de +%{tde_bindir}/startkde %{tde_bindir}/migratekde3 %{tde_tdelibdir}/ksmserver.la %{tde_tdelibdir}/ksmserver.so @@ -3281,19 +3281,19 @@ Windows and Samba shares. # Applies an optional distro-specific graphical theme %if "%{?tde_bg}" != "" # TDM Background -%__sed -i "tdm/kfrontend/gentdmconf.c" \ +%__sed -i "kdm/kfrontend/genkdmconf.c" \ -e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|' # TDE user default background %__sed -i "kpersonalizer/keyecandypage.cpp" \ -e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|' -%__sed -i "start[kt]de" \ +%__sed -i "startkde" \ -e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \ -e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|' %endif # TDE branding: removes KUbuntu references [Bug #617] -%__sed -i "kcontrol/[kt]dm/[kt]dm-appear.cpp" \ +%__sed -i "kcontrol/kdm/kdm-appear.cpp" \ -e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |" %__sed -i "konqueror/about/konq_aboutpage.cc" \ -e "s|About Kubuntu|About %{tde_aboutlabel}|" \ @@ -3301,15 +3301,15 @@ Windows and Samba shares. -e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|" %__sed -i "konqueror/about/launch.html" \ -e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|" -%__sed -i "[kt]dm/config.def" \ +%__sed -i "kdm/config.def" \ -e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |" # TDE default directory in 'startkde' script (KDEDIR) -%__sed -i "start[kt]de" \ +%__sed -i "startkde" \ -e "s|/opt/trinity|%{tde_prefix}|g" # TDE default start button icon -%__sed -i "start[kt]de" \ +%__sed -i "startkde" \ -e "s|%%{tde_starticon}|%{tde_starticon}|g" diff --git a/redhat/tdebindings/trinity-tdebindings-3.5.13.2.spec b/redhat/tdebindings/trinity-tdebindings-3.5.13.2.spec index 54e03d604..da5536070 100644 --- a/redhat/tdebindings/trinity-tdebindings-3.5.13.2.spec +++ b/redhat/tdebindings/trinity-tdebindings-3.5.13.2.spec @@ -927,6 +927,7 @@ Requires: trinity-libdcop-c = %{version}-%{release} Summary: Development files for %{name} Group: Development/Libraries Requires: trinity-tdelibs-devel +Requires: %{name} = %{version}-%{release} Obsoletes: trinity-kdebindings-devel < %{version}-%{release} Provides: trinity-kdebindings-devel = %{version}-%{release} @@ -958,6 +959,10 @@ Development files for the TDE bindings. %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %patch7 -p1 -b .dcopjavaldflags +%if "%{?perl_vendorarch}" == "" +exit 1 +%endif + %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 %patch18 -p1 -b .ruby %endif diff --git a/redhat/tdemultimedia/trinity-tdemultimedia-3.5.13.2.spec b/redhat/tdemultimedia/trinity-tdemultimedia-3.5.13.2.spec index 231084e35..1e4b2a989 100644 --- a/redhat/tdemultimedia/trinity-tdemultimedia-3.5.13.2.spec +++ b/redhat/tdemultimedia/trinity-tdemultimedia-3.5.13.2.spec @@ -60,7 +60,7 @@ BuildRequires: trinity-tdelibs-devel >= %{version} %if "%{?_with_akode}" != "" BuildRequires: trinity-akode-devel -%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} BuildRequires: trinity-akode-libmad %endif %endif diff --git a/redhat/tdenetwork/trinity-tdenetwork-3.5.13.2.spec b/redhat/tdenetwork/trinity-tdenetwork-3.5.13.2.spec index 3bdc75398..701f108df 100644 --- a/redhat/tdenetwork/trinity-tdenetwork-3.5.13.2.spec +++ b/redhat/tdenetwork/trinity-tdenetwork-3.5.13.2.spec @@ -252,11 +252,12 @@ update-desktop-database 2> /dev/null || : %package devel Summary: Development files for the Trinity network module Group: Development/Libraries +Requires: trinity-tdenetwork = %{version}-%{release} Requires: trinity-kdict = %{version}-%{release} Requires: trinity-kopete = %{version}-%{release} Requires: trinity-ksirc = %{version}-%{release} Requires: trinity-librss = %{version}-%{release} -Requires: trinity-kdelibs-devel +Requires: trinity-tdelibs-devel Obsoletes: trinity-kdenetwork-devel < %{version}-%{release} Provides: trinity-kdenetwork-devel = %{version}-%{release} diff --git a/redhat/tdepim/trinity-tdepim-14.0.0.spec b/redhat/tdepim/trinity-tdepim-14.0.0.spec index 5893dbe7a..3a5479727 100644 --- a/redhat/tdepim/trinity-tdepim-14.0.0.spec +++ b/redhat/tdepim/trinity-tdepim-14.0.0.spec @@ -11,7 +11,7 @@ BuildRequires: cmake >= 2.8 %define tde_includedir %{tde_prefix}/include %define tde_libdir %{tde_prefix}/%{_lib} -%define tde_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdeappdir %{tde_datadir}/applications/tde %define tde_tdedocdir %{tde_docdir}/tde %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity @@ -111,7 +111,7 @@ BuildRequires: xscreensaver Requires: trinity-libtdepim = %{version}-%{release} Requires: %{name}-kfile-plugins = %{version}-%{release} Requires: %{name}-tdeio-plugins = %{version}-%{release} -Requires: %{name}-kresources = %{version}-%{release} +Requires: %{name}-tderesources = %{version}-%{release} Requires: %{name}-wizards = %{version}-%{release} Requires: trinity-akregator = %{version}-%{release} Requires: trinity-kaddressbook = %{version}-%{release} @@ -186,7 +186,7 @@ Requires: trinity-libkpimidentities-devel = %{version}-%{release} Requires: trinity-libksieve-devel = %{version}-%{release} Requires: trinity-libktnef-devel = %{version}-%{release} Requires: trinity-libmimelib-devel = %{version}-%{release} -Requires: %{name}-kresources-devel = %{version}-%{release} +Requires: %{name}-tderesources-devel = %{version}-%{release} %description devel This metapackage includes all development files for TDE PIM. @@ -276,7 +276,7 @@ Requires: trinity-akregator = %{version}-%{release} Summary: TDE addressbook application Group: Applications/Communications Requires: trinity-kdebase-pim-ioslaves -Requires: %{name}-kresources = %{version}-%{release} +Requires: %{name}-tderesources = %{version}-%{release} %description -n trinity-kaddressbook KAddressBook is the main address book application for TDE; it enables you @@ -311,7 +311,7 @@ LDAP servers, and SQL databases. %{tde_datadir}/services/kabldapconfig.desktop %{tde_datadir}/services/kaddressbook %{tde_datadir}/services/kontact/kaddressbookplugin.desktop -%{tde_datadir}/services/kresources/kabc/imap.desktop +%{tde_datadir}/services/tderesources/tdeabc/imap.desktop %{tde_datadir}/services/ldifvcardthumbnail.desktop %{tde_datadir}/servicetypes/dcopaddressbook.desktop %{tde_datadir}/servicetypes/kaddressbook_contacteditorwidget.desktop @@ -322,7 +322,7 @@ LDAP servers, and SQL databases. %{tde_tdedocdir}/HTML/en/kaddressbook/ %{tde_datadir}/autostart/kabcdistlistupdater.desktop %{tde_tdeincludedir}/kaddressbook/ -%{tde_tdeincludedir}/kabc/ +%{tde_tdeincludedir}/tdeabc/ %post -n trinity-kaddressbook /sbin/ldconfig || : @@ -526,12 +526,12 @@ File dialog plugins for palm and vcf files. %files kfile-plugins %defattr(-,root,root,-) -%{tde_tdelibdir}/kfile_ics.la -%{tde_tdelibdir}/kfile_ics.so -%{tde_tdelibdir}/kfile_vcf.la -%{tde_tdelibdir}/kfile_vcf.so -%{tde_datadir}/services/kfile_ics.desktop -%{tde_datadir}/services/kfile_vcf.desktop +%{tde_tdelibdir}/tdefile_ics.la +%{tde_tdelibdir}/tdefile_ics.so +%{tde_tdelibdir}/tdefile_vcf.la +%{tde_tdelibdir}/tdefile_vcf.so +%{tde_datadir}/services/tdefile_ics.desktop +%{tde_datadir}/services/tdefile_vcf.desktop ########## @@ -549,16 +549,16 @@ and mbox. %files tdeio-plugins %defattr(-,root,root,-) -%{tde_tdelibdir}/kio_groupwise.la -%{tde_tdelibdir}/kio_groupwise.so -%{tde_tdelibdir}/kio_imap4.la -%{tde_tdelibdir}/kio_imap4.so -%{tde_tdelibdir}/kio_mbox.la -%{tde_tdelibdir}/kio_mbox.so -%{tde_tdelibdir}/kio_scalix.la -%{tde_tdelibdir}/kio_scalix.so -%{tde_tdelibdir}/kio_sieve.la -%{tde_tdelibdir}/kio_sieve.so +%{tde_tdelibdir}/tdeio_groupwise.la +%{tde_tdelibdir}/tdeio_groupwise.so +%{tde_tdelibdir}/tdeio_imap4.la +%{tde_tdelibdir}/tdeio_imap4.so +%{tde_tdelibdir}/tdeio_mbox.la +%{tde_tdelibdir}/tdeio_mbox.so +%{tde_tdelibdir}/tdeio_scalix.la +%{tde_tdelibdir}/tdeio_scalix.so +%{tde_tdelibdir}/tdeio_sieve.la +%{tde_tdelibdir}/tdeio_sieve.so %{tde_datadir}/services/groupwise.protocol %{tde_datadir}/services/groupwises.protocol %{tde_datadir}/services/imap4.protocol @@ -570,7 +570,7 @@ and mbox. ########## -%package kresources +%package tderesources Summary: Trinity pim resource plugins Group: Environment/Libraries #Requires: trinity-kaddressbook = %{version}-%{release} @@ -579,14 +579,14 @@ Group: Environment/Libraries Requires: libcaldav Requires: libcarddav -Obsoletes: tdepim-kresources < %{version}-%{release} +Obsoletes: tdepim-tderesources < %{version}-%{release} -%description kresources +%description tderesources This package includes several plugins needed to interface with groupware servers. It also includes plugins for features such as blogging and tracking feature plans. -%files kresources +%files tderesources %defattr(-,root,root,-) %{tde_tdelibdir}/kcal_caldav.la %{tde_tdelibdir}/kcal_caldav.so @@ -636,31 +636,31 @@ tracking feature plans. %{tde_libdir}/libknotes_xmlrpc.so.* %{tde_libdir}/libkslox.so.* %{tde_libdir}/libgwsoap.so.* -%{tde_datadir}/services/kresources/kabc/kabc_groupdav.desktop -%{tde_datadir}/services/kresources/kabc/kabc_groupwise.desktop -%{tde_datadir}/services/kresources/kabc/kabc_newexchange.desktop -%{tde_datadir}/services/kresources/kabc/kabc_opengroupware.desktop -%{tde_datadir}/services/kresources/kabc/kabc_ox.desktop -%{tde_datadir}/services/kresources/kabc/kabc_slox.desktop -%{tde_datadir}/services/kresources/kabc/kabc_xmlrpc.desktop -%{tde_datadir}/services/kresources/kabc/kolab.desktop -%{tde_datadir}/services/kresources/kabc/scalix.desktop -%{tde_datadir}/services/kresources/kcal/exchange.desktop -%{tde_datadir}/services/kresources/kcal/kcal_caldav.desktop -%{tde_datadir}/services/kresources/kabc/kabc_carddav.desktop -%{tde_datadir}/services/kresources/kcal/kcal_groupdav.desktop -%{tde_datadir}/services/kresources/kcal/kcal_groupwise.desktop -%{tde_datadir}/services/kresources/kcal/kcal_newexchange.desktop -%{tde_datadir}/services/kresources/kcal/kcal_opengroupware.desktop -%{tde_datadir}/services/kresources/kcal/kcal_ox.desktop -%{tde_datadir}/services/kresources/kcal/kcal_resourcefeatureplan.desktop -%{tde_datadir}/services/kresources/kcal/kcal_slox.desktop -%{tde_datadir}/services/kresources/kcal/kcal_xmlrpc.desktop -%{tde_datadir}/services/kresources/kcal/kolab.desktop -%{tde_datadir}/services/kresources/kcal/scalix.desktop -%{tde_datadir}/services/kresources/knotes/knotes_xmlrpc.desktop -%{tde_datadir}/services/kresources/knotes/kolabresource.desktop -%{tde_datadir}/services/kresources/knotes/scalix.desktop +%{tde_datadir}/services/tderesources/tdeabc/kabc_groupdav.desktop +%{tde_datadir}/services/tderesources/tdeabc/kabc_groupwise.desktop +%{tde_datadir}/services/tderesources/tdeabc/kabc_newexchange.desktop +%{tde_datadir}/services/tderesources/tdeabc/kabc_opengroupware.desktop +%{tde_datadir}/services/tderesources/tdeabc/kabc_ox.desktop +%{tde_datadir}/services/tderesources/tdeabc/kabc_slox.desktop +%{tde_datadir}/services/tderesources/tdeabc/kabc_xmlrpc.desktop +%{tde_datadir}/services/tderesources/tdeabc/kolab.desktop +%{tde_datadir}/services/tderesources/tdeabc/scalix.desktop +%{tde_datadir}/services/tderesources/kcal/exchange.desktop +%{tde_datadir}/services/tderesources/kcal/kcal_caldav.desktop +%{tde_datadir}/services/tderesources/tdeabc/kabc_carddav.desktop +%{tde_datadir}/services/tderesources/kcal/kcal_groupdav.desktop +%{tde_datadir}/services/tderesources/kcal/kcal_groupwise.desktop +%{tde_datadir}/services/tderesources/kcal/kcal_newexchange.desktop +%{tde_datadir}/services/tderesources/kcal/kcal_opengroupware.desktop +%{tde_datadir}/services/tderesources/kcal/kcal_ox.desktop +%{tde_datadir}/services/tderesources/kcal/kcal_resourcefeatureplan.desktop +%{tde_datadir}/services/tderesources/kcal/kcal_slox.desktop +%{tde_datadir}/services/tderesources/kcal/kcal_xmlrpc.desktop +%{tde_datadir}/services/tderesources/kcal/kolab.desktop +%{tde_datadir}/services/tderesources/kcal/scalix.desktop +%{tde_datadir}/services/tderesources/knotes/knotes_xmlrpc.desktop +%{tde_datadir}/services/tderesources/knotes/kolabresource.desktop +%{tde_datadir}/services/tderesources/knotes/scalix.desktop %{tde_datadir}/apps/kconf_update/upgrade-resourcetype.pl %{tde_datadir}/apps/kconf_update/kolab-resource.upd @@ -682,27 +682,27 @@ tracking feature plans. %{tde_tdelibdir}/kabc_xmlrpc.la %{tde_tdelibdir}/kabc_xmlrpc.so -%post kresources +%post tderesources /sbin/ldconfig || : -%postun kresources +%postun tderesources /sbin/ldconfig || : ########## -%package kresources-devel -Summary: Development files for kresources +%package tderesources-devel +Summary: Development files for tderesources Group: Development/Libraries -Requires: %{name}-kresources = %{version}-%{release} +Requires: %{name}-tderesources = %{version}-%{release} Requires: libcaldav Requires: libcarddav -Obsoletes: tdepim-kresources-devel < %{version}-%{release} +Obsoletes: tdepim-tderesources-devel < %{version}-%{release} -%description kresources-devel +%description tderesources-devel %{summary} -%files kresources-devel +%files tderesources-devel %defattr(-,root,root,-) %{tde_libdir}/libkslox.la %{tde_libdir}/libkslox.so @@ -754,10 +754,10 @@ Obsoletes: tdepim-kresources-devel < %{version}-%{release} %{tde_libdir}/libknotesscalix.so %{tde_tdeincludedir}/kpimprefs.h -%post kresources-devel +%post tderesources-devel /sbin/ldconfig || : -%postun kresources-devel +%postun tderesources-devel /sbin/ldconfig || : ########## @@ -1122,7 +1122,7 @@ Requires: trinity-knode = %{version}-%{release} %package -n trinity-knotes Summary: Trinity sticky notes Group: Applications/Utilities -Requires: trinity-tdepim-kresources = %{version}-%{release} +Requires: trinity-tdepim-tderesources = %{version}-%{release} %description -n trinity-knotes KNotes is a program that lets you write sticky notes. The notes are saved @@ -1140,9 +1140,9 @@ program. The program supports printing and mailing your notes. %{tde_datadir}/config.kcfg/knoteconfig.kcfg %{tde_datadir}/config.kcfg/knotesglobalconfig.kcfg %{tde_datadir}/icons/hicolor/*/apps/knotes.png -%{tde_datadir}/services/kresources/knotes/imap.desktop -%{tde_datadir}/services/kresources/knotes/local.desktop -%{tde_datadir}/services/kresources/knotes_manager.desktop +%{tde_datadir}/services/tderesources/knotes/imap.desktop +%{tde_datadir}/services/tderesources/knotes/local.desktop +%{tde_datadir}/services/tderesources/knotes_manager.desktop %{tde_datadir}/services/kontact/knotesplugin.desktop %{tde_tdedocdir}/HTML/en/knotes/ @@ -1168,7 +1168,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : Summary: Development files for knots Group: Development/Libraries Requires: trinity-knotes = %{version}-%{release} -Requires: %{name}-kresources-devel = %{version}-%{release} +Requires: %{name}-tderesources-devel = %{version}-%{release} %description -n trinity-knotes-devel %{summary} @@ -1367,7 +1367,7 @@ Summary: Trinity personal organizer Group: Applications/Productivity Requires: trinity-libkpimidentities = %{version}-%{release} Requires: trinity-libkpimexchange = %{version}-%{release} -Requires: %{name}-kresources = %{version}-%{release} +Requires: %{name}-tderesources = %{version}-%{release} Requires: perl %description -n trinity-korganizer @@ -1597,7 +1597,7 @@ library. %package -n trinity-libkcal Summary: Trinity calendaring library Group: Environment/Libraries -#Requires: %{name}-kresources = %{version}-%{release} +#Requires: %{name}-tderesources = %{version}-%{release} %description -n trinity-libkcal This library provides a C++ API for handling the vCalendar and iCalendar @@ -1619,12 +1619,12 @@ This is the runtime package for programs that use the libkcal-trinity library. %{tde_libdir}/libkcal_resourceremote.so.* %{tde_libdir}/libkholidays.so.* %{tde_datadir}/apps/libkholidays -%{tde_datadir}/services/kresources/kcal/imap.desktop -%{tde_datadir}/services/kresources/kcal/kabc.desktop -%{tde_datadir}/services/kresources/kcal/local.desktop -%{tde_datadir}/services/kresources/kcal/localdir.desktop -%{tde_datadir}/services/kresources/kcal/remote.desktop -%{tde_datadir}/services/kresources/kcal_manager.desktop +%{tde_datadir}/services/tderesources/kcal/imap.desktop +%{tde_datadir}/services/tderesources/kcal/kabc.desktop +%{tde_datadir}/services/tderesources/kcal/local.desktop +%{tde_datadir}/services/tderesources/kcal/localdir.desktop +%{tde_datadir}/services/tderesources/kcal/remote.desktop +%{tde_datadir}/services/tderesources/kcal_manager.desktop %post -n trinity-libkcal /sbin/ldconfig || :