Accepting request 60743 from home:vuntz:branches:GNOME:Factory
Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/60743 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=152
This commit is contained in:
parent
5dbda68016
commit
838de185d6
11
gdm.changes
11
gdm.changes
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Feb 13 14:08:04 CET 2011 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
- Call relevant macros in %post/%postun:
|
||||||
|
+ %icon_theme_cache_post/postun because the package ships themed
|
||||||
|
icons.
|
||||||
|
- Pass %{?no_lang_C} to %find_lang so that english documentation
|
||||||
|
can be packaged with the program, and not in the lang subpackage.
|
||||||
|
- Change Requires of lang subpackage to Recommends, since the
|
||||||
|
english documentation is not there anymore.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jan 14 18:51:02 CET 2011 - vuntz@opensuse.org
|
Fri Jan 14 18:51:02 CET 2011 - vuntz@opensuse.org
|
||||||
|
|
||||||
|
15
gdm.spec
15
gdm.spec
@ -93,7 +93,6 @@ DocDir: %{_defaultdocdir}
|
|||||||
Provides: gdm2 = %{version}
|
Provides: gdm2 = %{version}
|
||||||
Obsoletes: gdm2 < %{version}
|
Obsoletes: gdm2 < %{version}
|
||||||
Requires: %{name}-branding
|
Requires: %{name}-branding
|
||||||
Requires: %{name}-lang = %{version}
|
|
||||||
Requires: ConsoleKit-x11
|
Requires: ConsoleKit-x11
|
||||||
Requires: gnome-session-core
|
Requires: gnome-session-core
|
||||||
Requires: gnome-themes
|
Requires: gnome-themes
|
||||||
@ -102,6 +101,7 @@ Requires: xorg-x11-server-extra
|
|||||||
# For groupadd, useradd, usermod
|
# For groupadd, useradd, usermod
|
||||||
PreReq: pwdutils
|
PreReq: pwdutils
|
||||||
PreReq: %insserv_prereq
|
PreReq: %insserv_prereq
|
||||||
|
Recommends: %{name}-lang
|
||||||
Recommends: gnome-power-manager
|
Recommends: gnome-power-manager
|
||||||
Recommends: gnome-settings-daemon
|
Recommends: gnome-settings-daemon
|
||||||
Recommends: iso-codes
|
Recommends: iso-codes
|
||||||
@ -201,7 +201,7 @@ cp %{S:2} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
|
|||||||
mv $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default.sample $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default
|
mv $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default.sample $RPM_BUILD_ROOT%{_sysconfdir}/gdm/PostLogin/Default
|
||||||
mkdir -p $RPM_BUILD_ROOT{_localstatedir}/log/gdm
|
mkdir -p $RPM_BUILD_ROOT{_localstatedir}/log/gdm
|
||||||
mkdir -p $RPM_BUILD_ROOT{_localstatedir}/run/gdm
|
mkdir -p $RPM_BUILD_ROOT{_localstatedir}/run/gdm
|
||||||
%find_lang %{name}
|
%find_lang %{name} %{?no_lang_C}
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
mkdir -p $RPM_BUILD_ROOT%{_bindir}
|
||||||
ln -s ../sbin/gdm $RPM_BUILD_ROOT%{_bindir}/gdm
|
ln -s ../sbin/gdm $RPM_BUILD_ROOT%{_bindir}/gdm
|
||||||
%fdupes $RPM_BUILD_ROOT
|
%fdupes $RPM_BUILD_ROOT
|
||||||
@ -237,16 +237,27 @@ if test -f /sbin/conf.d/SuSEconfig.gdm; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
%post
|
||||||
|
%icon_theme_cache_post
|
||||||
|
|
||||||
%preun -f %{name}.schemas_preun
|
%preun -f %{name}.schemas_preun
|
||||||
|
|
||||||
%posttrans -f %{name}.schemas_posttrans
|
%posttrans -f %{name}.schemas_posttrans
|
||||||
|
|
||||||
%postun
|
%postun
|
||||||
%insserv_cleanup
|
%insserv_cleanup
|
||||||
|
%icon_theme_cache_postun
|
||||||
|
|
||||||
%files -f %{name}.schemas_list
|
%files -f %{name}.schemas_list
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc AUTHORS COPYING ChangeLog NEWS README
|
%doc AUTHORS COPYING ChangeLog NEWS README
|
||||||
|
%dir %{_datadir}/gnome/
|
||||||
|
%dir %{_datadir}/gnome/help/
|
||||||
|
%dir %{_datadir}/gnome/help/%{name}/
|
||||||
|
%doc %{_datadir}/gnome/help/%{name}/C/
|
||||||
|
%dir %{_datadir}/omf/
|
||||||
|
%dir %{_datadir}/omf/%{name}/
|
||||||
|
%doc %{_datadir}/omf/%{name}/%{name}-C.omf
|
||||||
%dir %config %{_sysconfdir}/gdm
|
%dir %config %{_sysconfdir}/gdm
|
||||||
%config %{_sysconfdir}/gdm/[IPXl]*
|
%config %{_sysconfdir}/gdm/[IPXl]*
|
||||||
%{_sbindir}/gdm
|
%{_sbindir}/gdm
|
||||||
|
Loading…
x
Reference in New Issue
Block a user