- added gdm configuration patch

- rel. 2

Changed files:
    gdm.spec -> 1.71
    gdm2.20.spec -> 1.71

diff --git a/gdm.spec b/gdm.spec
index 21a71e36bf26f38339fc519610e06c1dc36a9449..601e43eb707771b0db6596f9f57fb5b141d1bf9a 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -12,16 +12,16 @@ Summary(ru):        
 Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
 Version:       2.4.0.11
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/2.0.1/sources/%{name}/%{name}-%{version}.tar.bz2
 Source1:       %{name}.pamd
 Source2:       %{name}.init
-Source3:       %{name}.conf
-Source4:       %{name}-pld-logo.png
+Source3:       %{name}-pld-logo.png
 Patch0:                %{name}-xdmcp.patch
+Patch1:                %{name}-conf.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
@@ -121,6 +121,7 @@ Skrypt init dla GDM-a.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 rm -f missing
@@ -152,9 +153,8 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/gdm.conf
 
-install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 

diff --git a/gdm2.20.spec b/gdm2.20.spec
index 21a71e36bf26f38339fc519610e06c1dc36a9449..601e43eb707771b0db6596f9f57fb5b141d1bf9a 100644 (file)
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -12,16 +12,16 @@ Summary(ru):        
 Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
 Version:       2.4.0.11
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/2.0.1/sources/%{name}/%{name}-%{version}.tar.bz2
 Source1:       %{name}.pamd
 Source2:       %{name}.init
-Source3:       %{name}.conf
-Source4:       %{name}-pld-logo.png
+Source3:       %{name}-pld-logo.png
 Patch0:                %{name}-xdmcp.patch
+Patch1:                %{name}-conf.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
@@ -121,6 +121,7 @@ Skrypt init dla GDM-a.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 rm -f missing
@@ -152,9 +153,8 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/gdm.conf
 
-install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir}
+install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm