Accepting request 46446 from GNOME:Factory

checked in (request 46446)

OBS-URL: https://build.opensuse.org/request/show/46446
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=84

file-roller-2.31.5.tar.bz2

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

file-roller-2.31.90.tar.bz2

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

file-roller.changes

@@ -1,15 +1,3 @@
--------------------------------------------------------------------
-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:
-  + Stop using 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
 

file-roller.spec

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