Hello community, here is the log from the commit of package shotwell for openSUSE:Factory checked in at Fri Sep 9 11:52:15 CEST 2011.
-------- --- GNOME/shotwell/shotwell.changes 2011-08-10 14:00:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/shotwell/shotwell.changes 2011-09-07 02:48:24.000000000 +0200 @@ -1,0 +2,35 @@ +Wed Sep 7 00:37:15 UTC 2011 - [email protected] + +- Add shotwell-disable-schema-compile.patch: add a + --disable-schemas-compile configure option to not call + glib-compile-schemas on install. +- Add shotwell-remove-gconf-schema.patch: remove gconf schema. +- Remove --disable-schemas-install from configure, and add + --disable-schemas-compile there. +- Remove manual removal of gsettings schema blob: it's not created + anymore. +- Remove all the gconf schema packaging machinery. +- Remove unneeded pkgconfig() BuildRequires that disappeared in + previous releases: dbus-glib-1, gnome-vfs-2.0, json-glib-1.0. +- Add explicit pkgconfig(gio-unix-2.0) BuildRequires. + +------------------------------------------------------------------- +Sat Aug 27 20:28:20 CEST 2011 - [email protected] + +- Update to version 0.11.0: + + Hierarchical tags + + Support for RAW+JPEG and selectable RAW developer + + Switched from GConf to GSettings + + "Hide Photos Already Imported" is now persistent + + New Saved Search options + + Mimics no longer stored in home directory + + Added support for BMP format + + Many, many bugfixes +- Add pkgconfig(gstreamer-pbutils-0.10) BuildRequires: new + dependency. +- Add gsettings schema handling with %glib2_gsettings_schema_* + macros. +- Manually remove gsettings schema blob since "make install" + creates it, but this shouldn't get packaged. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- shotwell-0.10.1.tar.bz2 New: ---- shotwell-0.11.0.tar.bz2 shotwell-disable-schema-compile.patch shotwell-remove-gconf-schema.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shotwell.spec ++++++ --- /var/tmp/diff_new_pack.k9CIaT/_old 2011-09-09 11:52:11.000000000 +0200 +++ /var/tmp/diff_new_pack.k9CIaT/_new 2011-09-09 11:52:11.000000000 +0200 @@ -18,30 +18,33 @@ Name: shotwell -Version: 0.10.1 -Release: 2 +Version: 0.11.0 +Release: 1 # FIXME: Check if the hack to remove --fatal-warnings is still required. Also see http://redmine.yorba.org/issues/3760 License: LGPLv2.1+ Summary: Photo Manager for GNOME Url: http://yorba.org/shotwell/ Group: Productivity/Graphics/Viewers -Source: %{name}-%{version}.tar.bz2 +Source: http://yorba.org/download/shotwell/0.11/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM shotwell-disable-schema-compile.patch [email protected] -- Add --disable-schemas-compile configure flag, sent upstream by mail +Patch0: shotwell-disable-schema-compile.patch +# PATCH-FIX-UPSTREAM shotwell-remove-gconf-schema.patch [email protected] -- Drop useless gconf schema, sent upstream by mail +Patch1: shotwell-remove-gconf-schema.patch BuildRequires: libraw-devel-static BuildRequires: vala BuildRequires: update-desktop-files BuildRequires: pkgconfig(atk) -BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(gdk-2.0) BuildRequires: pkgconfig(gdk-x11-2.0) BuildRequires: pkgconfig(gee-1.0) BuildRequires: pkgconfig(gexiv2) -BuildRequires: pkgconfig(gnome-vfs-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-base-0.10) +BuildRequires: pkgconfig(gstreamer-pbutils-0.10) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gudev-1.0) -BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libexif) BuildRequires: pkgconfig(libgphoto2) BuildRequires: pkgconfig(libsoup-2.4) @@ -51,7 +54,7 @@ BuildRequires: pkgconfig(webkit-1.0) Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build -%gconf_schemas_prereq +%glib2_gsettings_schema_requires %description Shotwell is a digital photo organizer designed for the GNOME desktop @@ -62,6 +65,8 @@ %lang_package %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build # We can't use the configure macro: it's not a standard autotools configure script @@ -72,7 +77,7 @@ ./configure \ --prefix=%{_prefix} \ --lib=%{_lib} \ - --disable-schemas-install \ + --disable-schemas-compile \ --disable-desktop-update \ --disable-icon-update %__make %{?_smp_mfalgs} @@ -81,22 +86,16 @@ %makeinstall %find_lang %{name} %{?no_lang_C} %find_lang shotwell-extras shotwell.lang %{no_lang_C} -%find_gconf_schemas %suse_update_desktop_file shotwell %suse_update_desktop_file shotwell-viewer %clean rm -rf %{buildroot} -%pre -f %{name}.schemas_pre - -%posttrans -f %{name}.schemas_posttrans - -%preun -f %{name}.schemas_preun - %if 0%{?suse_version} > 1130 %post +%glib2_gsettings_schema_post %desktop_database_post %icon_theme_cache_post %endif @@ -104,11 +103,12 @@ %if 0%{?suse_version} > 1130 %postun +%glib2_gsettings_schema_postun %desktop_database_postun %icon_theme_cache_postun %endif -%files -f %{name}.schemas_list +%files %defattr(-,root,root) %doc AUTHORS COPYING MAINTAINERS NEWS README THANKS %dir %{_datadir}/gnome/ @@ -118,6 +118,9 @@ %{_bindir}/shotwell %{_bindir}/shotwell-video-thumbnailer %{_datadir}/applications/shotwell*.desktop +%{_datadir}/GConf/gsettings/shotwell.convert +%{_datadir}/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml +%{_datadir}/glib-2.0/schemas/org.yorba.shotwell.gschema.xml %{_datadir}/icons/hicolor/*/apps/shotwell.svg %{_datadir}/shotwell/ %{_libdir}/shotwell/ ++++++ shotwell-0.10.1.tar.bz2 -> shotwell-0.11.0.tar.bz2 ++++++ ++++ 177470 lines of diff (skipped) ++++++ shotwell-disable-schema-compile.patch ++++++ >From fb1cc4f3a9d24a1a3089167a986aab156a4bd7ce Mon Sep 17 00:00:00 2001 From: Vincent Untz <[email protected]> Date: Wed, 7 Sep 2011 02:31:02 +0200 Subject: [PATCH 1/2] Add --disable-schemas-compile option to not call glib-compile-schemas This is useful when creating packages. --- Makefile | 4 ++++ configure | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 1fdd1e1..e7c5268 100644 --- a/Makefile +++ b/Makefile @@ -552,7 +552,9 @@ install: mkdir -p $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas $(INSTALL_DATA) misc/org.yorba.shotwell.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas $(INSTALL_DATA) misc/org.yorba.shotwell-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas +ifndef DISABLE_SCHEMAS_COMPILE glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas +endif mkdir -p $(DESTDIR)/usr/share/GConf/gsettings $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)/usr/share/GConf/gsettings ifndef DISABLE_ICON_UPDATE @@ -643,7 +645,9 @@ ifdef INSTALL_HEADERS endif rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.yorba.shotwell.gschema.xml rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml +ifndef DISABLE_SCHEMAS_COMPILE glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas +endif rm -f $(DESTDIR)/usr/share/GConf/gsettings/shotwell.convert $(PC_FILE): $(PC_INPUT) $(MAKE_FILES) diff --git a/configure b/configure index e357e01..d507106 100755 --- a/configure +++ b/configure @@ -99,6 +99,9 @@ do --define) variables="${variables}USER_VALAFLAGS+=--define=$value\n" ;; + --disable-schemas-compile) variables="${variables}DISABLE_SCHEMAS_COMPILE=1\n" + ;; + --with-gconf-schema-file-dir) if [ ! $value ] then abort $1 -- 1.7.6.1 ++++++ shotwell-remove-gconf-schema.patch ++++++ ++++ 773 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
