RPM: enable libbeagle and kerry packages

17 files changed, 36 insertions, 115 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index 4bf7a6bd6..733b96e57 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -26,7 +26,7 @@ all:	dependencies main libraries applications i18n meta
 dependencies:	tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt
 main:	tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
 libraries:	kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
-applications:	abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
+applications:	abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kerry kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
 i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 extras:	icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kompose koverartist kpacman mathemagics png2qrgb
 
@@ -182,6 +182,9 @@ ifneq (,$(filter $(DIST),.el7 .el8 .oss150 .oss151 .osstw .mga7))
 	$(call buildpkg,3rdparty/lcms)
 endif
 
+libbeagle:
+	$(call buildpkg,3rdparty/libbeagle)
+
 lilypond: mftrace
 # Build on CentOS 6 only
 ifneq (,$(filter $(DIST),.el6))
@@ -425,7 +428,7 @@ ifeq (,$(filter $(DIST),.el5))
 	$(call buildpkg,applications/kerberostray)
 endif
 
-kerry:	tdebase
+kerry:	tdebase libbeagle
 	$(call buildpkg,applications/kerry)
 
 kftpgrabber:	tdebase
diff --git a/redhat/applications/kerry/kerry.1.docbook b/redhat/applications/kerry/kerry.1.docbook
deleted file mode 100644
index 49eb68460..000000000
--- a/redhat/applications/kerry/kerry.1.docbook
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
-  <refentryinfo>
-    <author>
-      <firstname>Jonathan Patrick</firstname>
-      <surname>Davies</surname>
-      <email>jpatrick@ubuntu.com</email>
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>Jonathan Patrick Davies</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2006-03-26</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>kerry</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>kerry</refname>
-    <refpurpose>a Beagle frontend for KDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>kautoclick</command>
-      <arg choice="opt">
-        <option><replaceable>Qt-options</replaceable></option>
-      </arg>
-      <arg choice="opt">
-        <option><replaceable>KDE-options</replaceable></option>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      Kerry is a frontend for Beagle for the <productname>KDE</productname> desktop.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      All <productname>KDE</productname> and <productname>Qt</productname>
-      programs accept a some common command-line options.  Kerry has no
-      application-specific options.
-    </para>
-    <para>
-      <variablelist>
-        <title>Generic options:</title>
-        <varlistentry>
-          <term> <option>--help</option> </term>
-          <listitem> <para>Show help about options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-qt</option> </term>
-          <listitem> <para>Show Qt specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-kde</option> </term>
-          <listitem> <para>Show KDE specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-all</option> </term>
-          <listitem> <para>Show all options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--author</option> </term>
-          <listitem> <para>Show author information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>-v</option>, <option>--version</option> </term>
-          <listitem> <para>Show version information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--license</option> </term>
-          <listitem> <para>Show license information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--</option> </term>
-          <listitem> <para>Indicates end of options</para> </listitem>
-        </varlistentry>
-      </variablelist>
-      <!-- TODO * add all the rest of the options, but maybe find an automated
-      way to keep it up to date -->
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>COPYRIGHT</title>
-    <para>
-      This manual page was written by Jonathan Patrick Davies
-      <email>jpatrick@ubuntu.com</email> for the
-      <productname>Ubuntu</productname> system (but may be used by others).
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the <acronym>GNU</acronym> General Public License,
-      Version 2 or any later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in
-      <filename>/usr/share/common-licenses/GPL</filename>.
-    </para>
-  </refsect1>
-</refentry>
diff --git a/redhat/applications/kerry/kerry.spec b/redhat/applications/kerry/kerry.spec
index d1116ebde..76469a51a 100644
--- a/redhat/applications/kerry/kerry.spec
+++ b/redhat/applications/kerry/kerry.spec
@@ -67,7 +67,7 @@ BuildRequires:	gettext
 BuildRequires:	libbeagle-devel >= 0.3.0
 
 
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 BuildRequires:	docbook2x
 %else
 BuildRequires:	docbook2X
@@ -86,6 +86,10 @@ filesystems, chat logs, mail and data, RSS and other.
 
 
 %prep
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+
+
+%build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
@@ -151,6 +155,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/autostart/beagled.desktop
 %{tde_datadir}/autostart/kerry.autostart.desktop
 %{tde_datadir}/icons/hicolor/*/*/*
+%{tde_mandir}/man1/kerry.*
 
 
 %changelog
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 8a010993e..75c377d4e 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -22,7 +22,7 @@ case "${PKGNAME}" in
   # Most TDE dependencies have no prefix
   "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";;
   # 3rd party dependencies
-  "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
+  "cscope"|"dirmngr"|"esound"|"exempi"|"exiv2"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"libbeagle"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";;
   # Extra build stuff
   "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2"|"yaz") PREFIX="";;
   # Other
@@ -51,6 +51,7 @@ case "${PKGNAME}" in
   "koffice")          PKGRUNTIME="koffice-suite";;
   "lcms")             PKGRUNTIME="${lib}lcms1";;
   "libart-lgpl")      PKGRUNTIME="${lib}art_lgpl_2-2";;
+  "libbeagle")        PKGRUNTIME="${lib}beagle1";;
   "libcaldav")        PKGRUNTIME="${lib}caldav0";;
   "libcarddav")       PKGRUNTIME="${lib}carddav0";;
   "libkdcraw")        PKGRUNTIME="${lib}kdcraw4";;
@@ -101,6 +102,7 @@ if [ -n "${DEVEL}" ]; then
     "koffice")     PKGDEVEL="koffice-devel";;
     "lcms")        PKGDEVEL="${lib}lcms-devel";;
     "libart-lgpl") PKGDEVEL="libart_lgpl-devel";;
+    "libbeagle")   PKGDEVEL="${lib}beagle-devel";;
     "libcaldav")   PKGDEVEL="${lib}caldav-devel";;
     "libcarddav")  PKGDEVEL="${lib}carddav-devel";;
     "libkdcraw")   PKGDEVEL="${lib}kdcraw-devel";;
diff --git a/redhat/docker/el6/packages.trinity b/redhat/docker/el6/packages.trinity
index d24bc6636..242a46157 100644
--- a/redhat/docker/el6/packages.trinity
+++ b/redhat/docker/el6/packages.trinity
@@ -29,6 +29,7 @@ db4-devel
 dbus-glib-devel
 djvulibre
 djvulibre-devel
+docbook2X
 doxygen
 e2fsprogs-devel
 emacs
@@ -182,6 +183,7 @@ perl(Test::More)
 perl(Test::Pod)
 perl(XML::Parser)
 pilot-link-devel
+pkgconfig(pygtk-2.0)
 pkcs11-helper-devel
 poppler-devel
 postgresql-devel
diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages
index 57d04e7f0..f5bd79e8d 100644
--- a/redhat/docker/el7/packages
+++ b/redhat/docker/el7/packages
@@ -27,6 +27,7 @@ db4-devel
 dbus-glib-devel
 djvulibre
 djvulibre-devel
+docbook2X
 doxygen
 emacs
 esound-devel
@@ -164,6 +165,7 @@ perl(PAR::Packer)
 perl(XML::Parser)
 pilot-link-devel
 pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
 poppler-devel
 postgresql-devel
 pth-devel
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages
index 716acb2fc..45ace1eb3 100644
--- a/redhat/docker/el8/packages
+++ b/redhat/docker/el8/packages
@@ -23,6 +23,7 @@ createrepo
 cryptsetup-devel
 cups-devel
 dbus-glib-devel
+docbook2X
 doxygen
 emacs
 exempi-devel
@@ -154,6 +155,7 @@ perl(IPC::Run3)
 perl(Module::Signature)
 perl(XML::Parser)
 pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
 poppler-devel
 postgresql
 postgresql-devel
diff --git a/redhat/docker/f30/packages b/redhat/docker/f30/packages
index 9d2c5eba2..7b22aeacf 100644
--- a/redhat/docker/f30/packages
+++ b/redhat/docker/f30/packages
@@ -29,6 +29,7 @@ db4-devel
 dbus-glib-devel
 djvulibre
 djvulibre-devel
+docbook2X
 doxygen
 dssi-devel
 esound-devel
@@ -180,6 +181,7 @@ perl(PAR::Packer)
 perl(XML::Parser)
 pilot-link-devel
 pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
 poppler-devel
 postgresql
 postgresql-devel
diff --git a/redhat/docker/f31/packages b/redhat/docker/f31/packages
index 2451e7e02..4264c7af8 100644
--- a/redhat/docker/f31/packages
+++ b/redhat/docker/f31/packages
@@ -183,6 +183,7 @@ perl-PAR-Packer
 perl(XML::Parser)
 pilot-link-devel
 pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
 poppler-devel
 postgresql
 postgresql-devel
diff --git a/redhat/docker/mga6/packages.i686 b/redhat/docker/mga6/packages.i686
index dbba1fc69..bbf5987ed 100644
--- a/redhat/docker/mga6/packages.i686
+++ b/redhat/docker/mga6/packages.i686
@@ -27,6 +27,7 @@ djvulibre
 docbook-dtd412-xml
 docbook-style-xsl
 docbook-utils
+docbook2x
 doxygen
 drakconf
 dssi-devel
@@ -206,6 +207,7 @@ pilot-link-devel
 pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
+pkgconfig(pygtk-2.0)
 polkit-agent-none
 postgresql9.4
 postgresql9.4-devel
diff --git a/redhat/docker/mga6/packages.x86_64 b/redhat/docker/mga6/packages.x86_64
index 677636f1c..0af3e9a35 100644
--- a/redhat/docker/mga6/packages.x86_64
+++ b/redhat/docker/mga6/packages.x86_64
@@ -27,6 +27,7 @@ djvulibre
 docbook-dtd412-xml
 docbook-style-xsl
 docbook-utils
+docbook2x
 doxygen
 drakconf
 dssi-devel
@@ -206,6 +207,7 @@ pilot-link-devel
 pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
+pkgconfig(pygtk-2.0)
 polkit-agent-none
 postgresql9.4
 postgresql9.4-devel
diff --git a/redhat/docker/mga7/packages.i686 b/redhat/docker/mga7/packages.i686
index da20adaac..078349609 100644
--- a/redhat/docker/mga7/packages.i686
+++ b/redhat/docker/mga7/packages.i686
@@ -205,6 +205,7 @@ pilot-link-devel
 pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
+pkgconfig(pygtk-2.0)
 polkit-agent-none
 postgresql9.6
 postgresql9.6-devel
diff --git a/redhat/docker/mga7/packages.x86_64 b/redhat/docker/mga7/packages.x86_64
index ba6b8e05c..0789fcdd4 100644
--- a/redhat/docker/mga7/packages.x86_64
+++ b/redhat/docker/mga7/packages.x86_64
@@ -206,6 +206,7 @@ pilot-link-devel
 pinentry-gtk2
 pkgconfig(audiofile)
 pkgconfig(libpng16)
+pkgconfig(pygtk-2.0)
 polkit-agent-none
 postgresql9.6
 postgresql9.6-devel
diff --git a/redhat/docker/oss151/packages b/redhat/docker/oss151/packages
index 629720348..11eeec1f3 100644
--- a/redhat/docker/oss151/packages
+++ b/redhat/docker/oss151/packages
@@ -25,6 +25,7 @@ dbus-1-glib-devel
 djvulibre
 docbook-utils
 docbook-xsl-stylesheets
+docbook2x
 doxygen GraphicsMagick
 dssi-devel
 fdupes
@@ -157,6 +158,7 @@ pcsc-lite-devel
 perl-PAR-Packer
 perl-pcsc
 pkcs11-helper-devel
+pkgconfig(pygtk-2.0)
 postgresql
 postgresql-devel
 python-devel
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 3a374a3b9..f808826c5 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -26,6 +26,7 @@ djvulibre
 docbook-utils
 docbook-xsl-stylesheets
 doxygen GraphicsMagick
+docbook2x
 dssi-devel
 fdupes
 ffmpeg-devel
@@ -171,6 +172,7 @@ postgresql-devel
 postgresql10
 postgresql10-devel
 python-devel
+python-gtk-devel
 python3-devel
 rpcgen
 rpm-build
diff --git a/redhat/docker/pclinuxos/packages.x86_64 b/redhat/docker/pclinuxos/packages.x86_64
index c1472b30b..fb3d39521 100644
--- a/redhat/docker/pclinuxos/packages.x86_64
+++ b/redhat/docker/pclinuxos/packages.x86_64
@@ -14,6 +14,7 @@ cups-devel
 desktop-file-utils
 djvulibre
 docbook-style-xsl
+docbook2x
 doxygen
 drakconf
 dssi-devel
@@ -151,6 +152,7 @@ perl-devel
 perl-PAR-Packer
 perl-pcsc-perl
 pilot-link-devel
+pkgconfig(pygtk-2.0)
 postgresql
 postgresql-devel
 pth-devel
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 5766196c3..bac4d4a50 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -134,6 +134,7 @@ Requires: trinity-kdiff3
 Requires: trinity-kdirstat
 Requires: trinity-keep
 Requires: trinity-kerberostray
+Requires: trinity-kerry
 Requires: trinity-kftpgrabber
 Requires: trinity-kile
 Requires: trinity-kima
@@ -237,8 +238,6 @@ Requires: trinity-rosegarden
 
 #Requires: trinity-gwenview-i18n
 
-# Beagle does not exist anymore, so Kerry is now useless.
-#Requires: trinity-kerry
 
 %description applications
 %{summary}