- apply xinitrc fix

- fix build (add missing prototypes)
- rel 7

diff --git a/gdm2.20.spec b/gdm2.20.spec
index cd78702980943bca3eb7dc7f0940157a0fe47882..91e6e5e152cf4ab65e5c439b00d67f724014e991 100644 (file)
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -15,7 +15,7 @@ Summary(ru.UTF-8):    Дисплейный менеджер GNOME
 Summary(uk.UTF-8):     Дисплейний менеджер GNOME
 Name:          gdm2.20
 Version:       2.20.11
-Release:       6
+Release:       7
 License:       GPL/LGPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/gdm-%{version}.tar.bz2
@@ -33,6 +33,7 @@ Patch2:               gdm-xsession.patch
 Patch3:                gdm-desktop.patch
 Patch4:                gdm-defaults.patch
 Patch5:                xinit-sh.patch
+Patch6:                missing-prototypes.patch
 URL:           http://www.gnome.org/projects/gdm/
 BuildRequires: ConsoleKit-devel
 BuildRequires: attr-devel
@@ -168,6 +169,8 @@ Skrypt init dla GDM-a.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
 mv po/sr@{Latn,latin}.po

diff --git a/missing-prototypes.patch b/missing-prototypes.patch
new file mode 100644 (file)
index 0000000..cdcd06f
--- /dev/null
+++ b/missing-prototypes.patch
@@ -0,0 +1,19 @@
+--- gdm-2.20.11/daemon/gdm-daemon-config.h~    2010-06-03 03:06:25.000000000 +0200
++++ gdm-2.20.11/daemon/gdm-daemon-config.h     2013-12-07 15:23:30.982654875 +0100
+@@ -78,6 +78,7 @@
+ gboolean       gdm_daemon_config_to_string            (const char *key,
+                                                        const char *display,
+                                                        char **retval);
++void           gdm_daemon_load_config_file            (GdmConfig **load_config);
+ gboolean       gdm_daemon_config_update_key           (const char *key);
+ 
+ 
+--- gdm-2.20.11/gui/gdmlanguages.h~    2010-06-03 03:06:25.000000000 +0200
++++ gdm-2.20.11/gui/gdmlanguages.h     2013-12-07 15:25:16.432654112 +0100
+@@ -67,4 +67,6 @@
+ void          gdm_lang_op_always_restart      (const gchar *args);
+ gint            gdm_lang_ask_restart            (gchar *language);
+ 
++void          lang_set_custom_callback        (gchar *language);
++
+ #endif /* GDM_LANGUAGES_H */