Accepting request 60791 from home:vuntz:branches:GNOME:Factory

Forwarding to openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/60791
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-terminal?expand=0&rev=68
This commit is contained in:
Vincent Untz 2011-02-13 21:11:10 +00:00 committed by Git OBS Bridge
parent 78567f1186
commit 8e061e2963
2 changed files with 26 additions and 5 deletions

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Feb 13 16:18:24 CET 2011 - vuntz@opensuse.org
- Call relevant macros in %post/%postun:
+ %desktop_database_post/postun because the package ships at
least one desktop file.
- 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.
-------------------------------------------------------------------
Tue Dec 14 15:06:47 CET 2010 - vuntz@opensuse.org

View File

@ -39,7 +39,7 @@ Source: %{name}-%{version}.tar.bz2
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: filesystem gconf2
Requires: %{name}-lang = %{version}
Recommends: %{name}-lang
%gconf_schemas_prereq
%description
@ -66,7 +66,7 @@ translation-update-upstream
# scrollkeeper from BuildRequires.
rm -r $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
%suse_update_desktop_file -N "GNOME Terminal" -G "Terminal" %name TerminalEmulator
%find_lang %{name}
%find_lang %{name} %{?no_lang_C}
%find_gconf_schemas
%fdupes $RPM_BUILD_ROOT
@ -75,20 +75,30 @@ rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
%post
%desktop_database_post
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
%postun
%desktop_database_postun
%files -f %{name}.schemas_list
%defattr (-, root, root)
%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
%{_bindir}/gnome-terminal
%{_datadir}/applications/gnome-terminal.desktop
%{_datadir}/gnome-terminal/
%files lang -f %{name}.lang
%defattr(-, root, root)
%dir %{_datadir}/gnome
%dir %{_datadir}/gnome/help
%changelog