From 7e5db6a2da8066ccde9e2875129c5cebcb9dc6ae51afb9096cc313f94b88eac1 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 24 Aug 2010 13:29:46 +0000 Subject: [PATCH 1/4] 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 --- file-roller-2.31.5.tar.bz2 | 3 --- file-roller-2.31.90.tar.bz2 | 3 +++ file-roller.changes | 12 ++++++++++++ file-roller.spec | 22 ++++++++++++++-------- 4 files changed, 29 insertions(+), 11 deletions(-) delete mode 100644 file-roller-2.31.5.tar.bz2 create mode 100644 file-roller-2.31.90.tar.bz2 diff --git a/file-roller-2.31.5.tar.bz2 b/file-roller-2.31.5.tar.bz2 deleted file mode 100644 index 1e0e5a5..0000000 --- a/file-roller-2.31.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66e3e254c721e4ff8f91ab62360bb1b724495a9ce6244ede5efb92dcc4280554 -size 1853480 diff --git a/file-roller-2.31.90.tar.bz2 b/file-roller-2.31.90.tar.bz2 new file mode 100644 index 0000000..96a20ec --- /dev/null +++ b/file-roller-2.31.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97bab2495027233b771187c8e146daba2dbcfeba5821aceaa42a0c7135eca8ed +size 1868646 diff --git a/file-roller.changes b/file-roller.changes index 30be904..f9f4f75 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -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 diff --git a/file-roller.spec b/file-roller.spec index b6c3a32..6a9c501 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -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. # @@ -18,7 +18,7 @@ Name: file-roller -Version: 2.31.5 +Version: 2.31.90 Release: 1 License: GPLv2+ Summary: An Archive Manager for GNOME @@ -31,6 +31,7 @@ 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} @@ -63,7 +64,7 @@ DocDir: %{_defaultdocdir} #Suggests: unace #Suggests: unalz #Suggests: unstuff -%glib2_gsettings_schema_requires +%gconf_schemas_prereq %description File Roller is an archive manager for GNOME. With it, you can create @@ -91,7 +92,8 @@ translation-update-upstream %build %configure\ - --disable-scrollkeeper + --disable-scrollkeeper \ + --disable-schemas-install %__make %{?jobs:-j%jobs} %install @@ -101,32 +103,36 @@ 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 +%files -f %{name}.schemas_list %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 From fadc888c43d2f3d9fcfb037e8a9670f421d642f5aedc619405696ce347ab4c69 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 24 Aug 2010 13:31:06 +0000 Subject: [PATCH 2/4] Accepting request 46096 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/file-roller via accept of submit request 46096 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/46096 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=83 --- file-roller.changes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/file-roller.changes b/file-roller.changes index f9f4f75..7c98d11 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -5,9 +5,9 @@ Tue Aug 17 10:59:58 CEST 2010 - dimstar@opensuse.org + 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 +- 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. ------------------------------------------------------------------- From 940a6671a97dd1062cab323a62c9a48f54f24feb75f0f8da9e40b59f0c84c8eb Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 27 Aug 2010 21:25:39 +0000 Subject: [PATCH 3/4] 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 | 3 +++ file-roller-2.31.90.tar.bz2 | 3 --- file-roller.changes | 12 ------------ file-roller.spec | 22 ++++++++-------------- 4 files changed, 11 insertions(+), 29 deletions(-) create mode 100644 file-roller-2.31.5.tar.bz2 delete mode 100644 file-roller-2.31.90.tar.bz2 diff --git a/file-roller-2.31.5.tar.bz2 b/file-roller-2.31.5.tar.bz2 new file mode 100644 index 0000000..1e0e5a5 --- /dev/null +++ b/file-roller-2.31.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66e3e254c721e4ff8f91ab62360bb1b724495a9ce6244ede5efb92dcc4280554 +size 1853480 diff --git a/file-roller-2.31.90.tar.bz2 b/file-roller-2.31.90.tar.bz2 deleted file mode 100644 index 96a20ec..0000000 --- a/file-roller-2.31.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97bab2495027233b771187c8e146daba2dbcfeba5821aceaa42a0c7135eca8ed -size 1868646 diff --git a/file-roller.changes b/file-roller.changes index 7c98d11..30be904 100644 --- a/file-roller.changes +++ b/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 diff --git a/file-roller.spec b/file-roller.spec index 6a9c501..b6c3a32 100644 --- a/file-roller.spec +++ b/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 From 23b08022d6e0d5a57f6e65dd1a2e9840c78f463d02d96229b61b613636d26e81 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 27 Aug 2010 21:25:41 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/file-roller revision 56.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/file-roller?expand=0&rev=e54ca58a8a7956a89a25a144ffccb2db --- file-roller-2.31.5.tar.bz2 | 3 --- file-roller-2.31.90.tar.bz2 | 3 +++ file-roller.changes | 12 ++++++++++++ file-roller.spec | 22 ++++++++++++++-------- 4 files changed, 29 insertions(+), 11 deletions(-) delete mode 100644 file-roller-2.31.5.tar.bz2 create mode 100644 file-roller-2.31.90.tar.bz2 diff --git a/file-roller-2.31.5.tar.bz2 b/file-roller-2.31.5.tar.bz2 deleted file mode 100644 index 1e0e5a5..0000000 --- a/file-roller-2.31.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:66e3e254c721e4ff8f91ab62360bb1b724495a9ce6244ede5efb92dcc4280554 -size 1853480 diff --git a/file-roller-2.31.90.tar.bz2 b/file-roller-2.31.90.tar.bz2 new file mode 100644 index 0000000..96a20ec --- /dev/null +++ b/file-roller-2.31.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97bab2495027233b771187c8e146daba2dbcfeba5821aceaa42a0c7135eca8ed +size 1868646 diff --git a/file-roller.changes b/file-roller.changes index 30be904..7c98d11 100644 --- a/file-roller.changes +++ b/file-roller.changes @@ -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: + + 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 diff --git a/file-roller.spec b/file-roller.spec index b6c3a32..6a9c501 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -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. # @@ -18,7 +18,7 @@ Name: file-roller -Version: 2.31.5 +Version: 2.31.90 Release: 1 License: GPLv2+ Summary: An Archive Manager for GNOME @@ -31,6 +31,7 @@ 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} @@ -63,7 +64,7 @@ DocDir: %{_defaultdocdir} #Suggests: unace #Suggests: unalz #Suggests: unstuff -%glib2_gsettings_schema_requires +%gconf_schemas_prereq %description File Roller is an archive manager for GNOME. With it, you can create @@ -91,7 +92,8 @@ translation-update-upstream %build %configure\ - --disable-scrollkeeper + --disable-scrollkeeper \ + --disable-schemas-install %__make %{?jobs:-j%jobs} %install @@ -101,32 +103,36 @@ 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 +%files -f %{name}.schemas_list %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