Accepting request 46090 from home:dimstar:branches:GNOME:Factory

Copy from home:dimstar:branches:GNOME:Factory/file-roller via accept of submit request 46090 revision 3.
Request was accepted with message:
thanks

OBS-URL: https://build.opensuse.org/request/show/46090
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=82
This commit is contained in:
Vincent Untz 2010-08-24 13:29:46 +00:00 committed by Git OBS Bridge
parent 3e936c9747
commit 7e5db6a2da
4 changed files with 29 additions and 11 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:66e3e254c721e4ff8f91ab62360bb1b724495a9ce6244ede5efb92dcc4280554
size 1853480

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:97bab2495027233b771187c8e146daba2dbcfeba5821aceaa42a0c7135eca8ed
size 1868646

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Aug 17 10:59:58 CEST 2010 - dimstar@opensuse.org
- Update to version 2.31.90:
+ Use GConf instead of GSettings
+ Updated translations.
- Add pkgconfig(gconf-2.0) BuildRequires.
- Revert back to gconf handling instead of gsettings
+ Drop gsettings - macros
+ Pass --disable-schemas-install to configure
+ Re-introduce gconf pre, preun and posttrans scriptlets.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 5 23:57:12 CEST 2010 - vuntz@opensuse.org Thu Aug 5 23:57:12 CEST 2010 - vuntz@opensuse.org

View File

@ -1,5 +1,5 @@
# #
# spec file for package file-roller (Version 2.31.5) # spec file for package file-roller (Version 2.31.90)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -18,7 +18,7 @@
Name: file-roller Name: file-roller
Version: 2.31.5 Version: 2.31.90
Release: 1 Release: 1
License: GPLv2+ License: GPLv2+
Summary: An Archive Manager for GNOME Summary: An Archive Manager for GNOME
@ -31,6 +31,7 @@ BuildRequires: gnome-doc-utils-devel
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
BuildRequires: intltool BuildRequires: intltool
BuildRequires: nautilus-devel BuildRequires: nautilus-devel
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
Requires: %{name}-lang = %{version} Requires: %{name}-lang = %{version}
@ -63,7 +64,7 @@ DocDir: %{_defaultdocdir}
#Suggests: unace #Suggests: unace
#Suggests: unalz #Suggests: unalz
#Suggests: unstuff #Suggests: unstuff
%glib2_gsettings_schema_requires %gconf_schemas_prereq
%description %description
File Roller is an archive manager for GNOME. With it, you can create File Roller is an archive manager for GNOME. With it, you can create
@ -91,7 +92,8 @@ translation-update-upstream
%build %build
%configure\ %configure\
--disable-scrollkeeper --disable-scrollkeeper \
--disable-schemas-install
%__make %{?jobs:-j%jobs} %__make %{?jobs:-j%jobs}
%install %install
@ -101,32 +103,36 @@ translation-update-upstream
%endif %endif
%suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving %suse_update_desktop_file -N "File Roller" -G "Archive Manager" %name Archiving
%find_lang %{name} %find_lang %{name}
%find_gconf_schemas
rm %{buildroot}%{_libdir}/*/*/*.*a rm %{buildroot}%{_libdir}/*/*/*.*a
%fdupes %{buildroot} %fdupes %{buildroot}
%clean %clean
rm -rf %{buildroot} rm -rf %{buildroot}
%pre -f %{name}.schemas_pre
%post %post
%glib2_gsettings_schema_post
if test -x usr/bin/update-mime-database ; then if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null usr/bin/update-mime-database usr/share/mime >/dev/null
fi fi
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
%postun %postun
%glib2_gsettings_schema_postun
if test -x usr/bin/update-mime-database ; then if test -x usr/bin/update-mime-database ; then
usr/bin/update-mime-database usr/share/mime >/dev/null usr/bin/update-mime-database usr/share/mime >/dev/null
fi fi
%files %files -f %{name}.schemas_list
%defattr(-, root, root) %defattr(-, root, root)
%doc AUTHORS NEWS README COPYING %doc AUTHORS NEWS README COPYING
%{_bindir}/file-roller %{_bindir}/file-roller
%{_libexecdir}/file-roller/ %{_libexecdir}/file-roller/
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%{_datadir}/file-roller/ %{_datadir}/file-roller/
%{_datadir}/glib-2.0/schemas/org.gnome.file-roller.gschema.xml
%{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg %{_datadir}/icons/hicolor/scalable/apps/*.svg