@@ -49,81 +49,6 @@

 Requires: pam

 Obsoletes: rhev-agent-pam-rhev-cred

-%package gdm-plugin

-Summary: GDM plug-in for the oVirt Guest Agent

-# No gdm-devel package is available for plug-in development. So for now

-# we build the gdm package.

-%if 0%{?rhel}

-Source1: gdm-2.30.4-48.el6.src.rpm

-

-%define gdm_version gdm-2.30.4

-%define gdm_release %{gdm_version}-48.el6

-

-%define libauditver 1.0.6

-%define pango_version 1.2.0

-%define gtk2_version 2.6.0

-%define libglade2_version 2.0.0

-%define libgnomeui_version 2.2.0

-%define scrollkeeper_version 0.3.4

-%define pam_version 0.99.8.1-11

-%define desktop_file_utils_version 0.2.90

-%define gail_version 1.2.0

-%define nss_version 3.11.1

-%define consolekit_version 0.3.0-9

-%define hal_version 0.5.9

-%define fontconfig_version 2.6.0

-

-# The following requirements were copied from the gdm.spec file.

-BuildRequires: pkgconfig(libcanberra-gtk)

-BuildRequires: scrollkeeper >= 0:%{scrollkeeper_version}

-BuildRequires: pango-devel >= 0:%{pango_version}

-BuildRequires: gtk2-devel >= 0:%{gtk2_version}

-BuildRequires: libglade2-devel >= 0:%{libglade2_version}

-BuildRequires: libgnomeui-devel >= 0:%{libgnomeui_version}

-BuildRequires: pam-devel >= 0:%{pam_version}

-BuildRequires: fontconfig >= 0:%{fontconfig_version}

-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}

-BuildRequires: gail-devel >= 0:%{gail_version}

-BuildRequires: libtool automake autoconf

-BuildRequires: libattr-devel

-BuildRequires: gettext

-BuildRequires: gnome-doc-utils

-BuildRequires: libdmx-devel

-BuildRequires: audit-libs-devel >= %{libauditver}

-BuildRequires: autoconf automake libtool

-BuildRequires: intltool

-%ifnarch s390 s390x

-BuildRequires: xorg-x11-server-Xorg

-%endif

-BuildRequires: nss-devel >= %{nss_version}

-#BuildRequires: ConsoleKit

-BuildRequires: libselinux-devel

-BuildRequires: check-devel

-BuildRequires: iso-codes-devel

-BuildRequires: libxklavier-devel >= 4.0

-#BuildRequires: DeviceKit-power-devel 

-BuildRequires: pkgconfig(libgnomekbdui)

-BuildRequires: pkgconfig(libxklavier)

-BuildRequires: libXdmcp-devel

-%else

-BuildRequires: dbus-glib-devel

-BuildRequires: gdm-devel

-BuildRequires: gobject-introspection-devel

-BuildRequires: gtk2-devel

-%endif

-Requires: %{name} = %{version}-%{release}

-Requires: %{name}-pam-module = %{version}-%{release}

-Requires: gdm

-Obsoletes: rhev-agent-gdm-plugin-rhevcred

-

-%package kdm-plugin

-Summary: KDM plug-in for the oVirt Guest Agent

-BuildRequires: kdebase-workspace-devel

-Requires: %{name} = %{version}-%{release}

-Requires: %{name}-pam-module = %{version}-%{release}

-Requires: kdm

-Obsoletes: rhev-agent-kdm-plugin-rhevcred

-

 %description

 This is the oVirt management agent running inside the guest. The agent

 interfaces with the oVirt manager, supplying heart-beat info as well as

@@ -142,14 +67,6 @@

 The oVirt PAM module provides the functionality necessary to use the

 oVirt automatic log-in system.

-%description gdm-plugin

-The GDM plug-in provides the functionality necessary to use the

-oVirt automatic log-in system.

-

-%description kdm-plugin

-The KDM plug-in provides the functionality necessary to use the

-oVirt automatic log-in system.

-

 %prep

 %setup -q -n ovirt-guest-agent-%{version}

@@ -164,11 +81,6 @@

 sed -i s/AM_PROG_AR/#AM_PROG_AR/ge configure.ac

-cp -f gdm2-plugin/gdm2-Makefile.am gdm-plugin/Makefile.am

-cp -f gdm2-plugin/gdm-ovirtcred-extension.c gdm-plugin/

-cp -f gdm2-plugin/gdm-ovirtcred-extension.h gdm-plugin/

-cp -f gdm2-plugin/plugin.c gdm-plugin/

-

 rpmbuild --define="_topdir %{_topdir}" --recompile %{SOURCE1}

 autoreconf -i -f

@@ -177,7 +89,6 @@

 %configure \

     --enable-securedir=%{_moduledir} \

     --includedir=%{_includedir}/security \

-    --with-gdm-src-dir=%{_topdir}/BUILD/%{gdm_version} \

     --with-simple-greeter-plugins-dir=%{_libdir}/gdm/simple-greeter/plugins \

     --with-pam-prefix=%{_sysconfdir}

@@ -186,10 +97,7 @@

 %install

 # libtool will look for this file when relinking during installation.

 mkdir -p %{buildroot}%{_libdir}

-cp %{_topdir}/BUILDROOT/%{gdm_release}.%{?_arch}%{_libdir}/libgdmsimplegreeter.so \

-   %{buildroot}%{_libdir}

-sed -i "s~parent->setObjectName(\"welcome\");~parent->setObjectName(\"talker\");~" kdm-plugin/src/kgreet_ovirtcred.cpp

 make install DESTDIR=%{buildroot}

@@ -254,11 +162,6 @@

     /sbin/service ovirt-guest-agent start; } || :

-%post kdm-plugin

-if ! grep -q "^PluginsLogin=" "%{_kdmrc}";

-then

-    sed -i "s~^#PluginsLogin=winbind~PluginsLogin=ovirtcred,classic~" "%{_kdmrc}"

-fi

 %preun common

 if [ "$1" -eq 0 ]

@@ -334,28 +237,6 @@

 %exclude %{_moduledir}/pam_ovirt_cred.la

-%files gdm-plugin

-# This is intentionally NOT 'noreplace' If this is modified by an user,

-# this actually might break it.

-%config %{_sysconfdir}/pam.d/gdm-ovirtcred

-%{_datadir}/icons/hicolor/*/*/*.png

-%dir %{_datadir}/gdm/simple-greeter/extensions/ovirtcred

-%{_datadir}/gdm/simple-greeter/extensions/ovirtcred/page.ui

-%if 0%{?rhel}

-%{_libdir}/gdm/simple-greeter/plugins/ovirtcred.so

-%else

-%{_libdir}/gdm/simple-greeter/extensions/libovirtcred.so

-%endif

-# Unwanted files

-%exclude %{_libdir}/libgdmsimplegreeter.so

-%exclude %{_libdir}/gdm/simple-greeter/plugins/ovirtcred.a

-%exclude %{_libdir}/gdm/simple-greeter/plugins/ovirtcred.la

-

-%files kdm-plugin

-# This is intentionally NOT 'noreplace' If this is modified by an user,

-# this actually might break it.

-%config %{_sysconfdir}/pam.d/kdm-ovirtcred

-%attr (755,root,root) %{_libdir}/kde4/kgreet_ovirtcred.so

 %changelog

 * Thu May 29 2014 Vinzenz Feenstra <evilissimo@redhat.com> - 1.0.9-4

​