SHA256
1
0
forked from pool/gdm

Accepting request 563666 from home:Zaitor:branches:GNOME:Factory

- Add gdm-nb-translations.patch: Update Norwegian Bokmål
  translations.
- Drop gdmflexiserver Obsoletes from main package, we ship
  gdmflexiserver again, so this is not needed nor wanted.
- Do minor spec-cleanup, silence a couple of rpmlint warnings.

OBS-URL: https://build.opensuse.org/request/show/563666
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=369
This commit is contained in:
2018-01-11 19:50:55 +00:00
committed by Git OBS Bridge
parent 8027bb6b6a
commit f37958337b
3 changed files with 345 additions and 12 deletions

View File

@@ -45,6 +45,8 @@ Source5: X11-displaymanager-gdm
Source8: autogen.sh
# PATCH-FEATURE-OPENSUSE gdm-workaround-boo971852.patch zaitor@opensuse.org -- Work around boo971852 - xsessions is just not going to happen for a gdm user - Those users ALL have gnome-shell installed (which is mandatory for gdm to operate) - openSUSE only
Patch0: gdm-workaround-boo971852.patch
# PATCH-FIX-UPSTREAM gdm-nb-translations.patch zaitor@opensuse.org -- Update Norwegian Bokmål translations.
Patch1: gdm-nb-translations.patch
# PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts
Patch7: gdm-suse-xsession.patch
# WARNING: do not remove/significantly change patch8 without updating the relevant patch in accountsservice too
@@ -126,9 +128,6 @@ Provides: gdm2 = %{version}
Obsoletes: gdm2 < %{version}
Provides: gnome-applets-gdm = %{version}
Obsoletes: gnome-applets-gdm < %{version}
# gdmflexiserver is dropped since 3.5.90
Obsoletes: gdmflexiserver < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
DocDir: %{_defaultdocdir}
%description
@@ -145,7 +144,7 @@ The GNOME Display Manager is a system service that is responsible for
providing graphical log-ins and managing local and remote displays.
%package -n typelib-1_0-Gdm-1_0
Summary: Client Library for Communicating with GDM Greeter Server -- Introspection bindings
Summary: Introspection bindings for gdm
Group: System/Libraries
%description -n typelib-1_0-Gdm-1_0
@@ -184,7 +183,7 @@ providing graphical log-ins and managing local and remote displays.
This package provides the upstream default configuration for gdm.
%package -n gdmflexiserver
Summary: Gdmflexiserver Compatibility Wrapper for Display Managers
Summary: Compatibility Wrapper for Display Managers
Group: System/GUI/GNOME
Suggests: gdm
BuildArch: noarch
@@ -206,6 +205,7 @@ translation-update-upstream
# Disabled for now, see boo#981372 and boo#971852
#patch0 -p1
%endif
%patch1 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
@@ -342,11 +342,9 @@ dconf update
--remove default-displaymanager %{_libexecdir}/X11/displaymanagers/gdm
%post -n libgdm1 -p /sbin/ldconfig
%postun -n libgdm1 -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README
%doc %{_datadir}/help/C/%{name}/
%dir %config %{_sysconfdir}/gdm
@@ -386,15 +384,12 @@ dconf update
%ghost %{_sysconfdir}/alternatives/default-displaymanager
%files -n libgdm1
%defattr(-,root,root)
%{_libdir}/libgdm.so.*
%files -n typelib-1_0-Gdm-1_0
%defattr(-,root,root)
%{_libdir}/girepository-1.0/Gdm-1.0.typelib
%files devel
%defattr(-,root,root)
%{_includedir}/gdm/
%{_libdir}/libgdm.so
%{_libdir}/pkgconfig/gdm.pc
@@ -402,11 +397,9 @@ dconf update
%{_datadir}/gir-1.0/Gdm-1.0.gir
%files branding-upstream
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/gdm/custom.conf
%files -n gdmflexiserver
%defattr(-,root,root)
%{_bindir}/gdmflexiserver
%files lang -f %{name}.lang