Hello community, here is the log from the commit of package exo for openSUSE:Factory checked in at 2013-05-06 10:13:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/exo (Old) and /work/SRC/openSUSE:Factory/.exo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "exo" Changes: -------- --- /work/SRC/openSUSE:Factory/exo/exo.changes 2013-01-22 18:17:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.exo.new/exo.changes 2013-05-06 10:13:35.000000000 +0200 @@ -1,0 +2,16 @@ +Thu May 2 16:41:40 UTC 2013 - gber@opensuse.org + +- also deliver helpers.rc into a API-versioned subdirectory, it is + directly read by the library as well +- rename exo-branding-upstream to libexo-1-0-branding-upstream +- continue delivering %{_libdir}/xfce4 + +------------------------------------------------------------------- +Thu May 2 09:58:51 UTC 2013 - gber@opensuse.org + +- add use-versioned-helpers-db.patch in order to use a versioned + helpers files DB since some of the desktop files are tied to the + exo API version (e.g. by using exo-compose-mail-1) +- consequently also merge exo-data into libexo-1-0 + +------------------------------------------------------------------- New: ---- use-versioned-helpers-db.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ exo.spec ++++++ --- /var/tmp/diff_new_pack.sD2hEJ/_old 2013-05-06 10:13:37.000000000 +0200 +++ /var/tmp/diff_new_pack.sD2hEJ/_new 2013-05-06 10:13:37.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package exo # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,11 +30,14 @@ Source1: %{name}-icons.tar.bz2 # PATCH-FIX-UPSTREAM exo-firefox-params.patch bwalle@suse.de -- Removes obsolete Firefox commandline arguments Patch0: exo-firefox-params.patch +# PATCH-FIX-OPENSUSE use-versioned-helpers-db.patch gber@opensuse.org -- Use a versioned helpers files DB since some of the desktop files are tied to the exo API version (e.g. by using exo-compose-mail-1) +Patch1: use-versioned-helpers-db.patch BuildRequires: fdupes BuildRequires: gtk-doc BuildRequires: intltool BuildRequires: perl-URI BuildRequires: update-desktop-files +BuildRequires: xfce4-dev-tools BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) @@ -51,7 +54,6 @@ Summary: Tools for exo License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -Requires: %{name}-data = %{version} Provides: exo:%{_bindir}/exo-csource Provides: exo:%{_bindir}/exo-desktop-item-edit Provides: exo:%{_bindir}/exo-open @@ -60,26 +62,18 @@ %description tools This package provides tools and helpers for exo. -%package data -Summary: Helpers Data for exo -License: GPL-2.0+ and LGPL-2.1+ -Group: System/Libraries -Requires: %{name}-branding = %{version} -BuildArch: noarch - -%description data -This package provides the helpers data for exo. - %package -n %{libname} Summary: Application Development Library for Xfce License: GPL-2.0+ and LGPL-2.1+ Group: System/Libraries -Requires: %{name}-data +Requires: %{libname}-branding = %{version} Requires: perl-URI Provides: exo = %{version} Obsoletes: exo <= 0.6.2 Provides: exo-doc = %{version} Obsoletes: exo-doc <= 0.6.2 +Provides: exo-data = %{version} +Obsoletes: exo-data <= 0.10.2 Recommends: %{name}-lang = %{version} Recommends: %{name}-tools @@ -98,17 +92,20 @@ This package contains development files needed for developing applications based on exo. -%package branding-upstream +%package -n %{libname}-branding-upstream Summary: Upstream Branding of exo License: GPL-2.0+ Group: System/GUI/XFCE # BRAND: helpers.rc: Controls default applications and MIME handler. -Conflicts: otherproviders(exo-branding) +Conflicts: otherproviders(%{libname}-branding) +Provides: %{libname}-branding = %{version} Provides: exo-branding = %{version} -Supplements: packageand(exo-data:branding-upstream) +Provides: exo-branding-upstream = %{version} +Obsoletes: exo-branding-upstream <= 0.10.2 +Supplements: packageand(%{libname}:branding-upstream) BuildArch: noarch -%description branding-upstream +%description -n %{libname}-branding-upstream This package provides the upstream look and feel for the exo library. # this should be replaced by %%lang_package once bnc#513786 is resolved @@ -127,12 +124,15 @@ %prep %setup -q -b1 %patch0 -p1 +%patch1 -p1 find . -name '*.pl' | \ xargs sed -i 's|^#! */usr/bin/env *\perl|#!/usr/bin/perl|' %build +xdt-autogen %configure \ --docdir=%{_datadir}/xfce4/exo-preferred-applications \ + --with-helper-path-prefix=%{_libexecdir} \ --enable-gtk-doc \ --disable-static make %{?_smp_mflags} V=1 @@ -140,7 +140,10 @@ %install %make_install -rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{python_sitearch}/exo-0.6/_exo.la +# currently expected by too many Xfce packages +mkdir -p %{buildroot}%{_libdir}/xfce4 + +rm -f %{buildroot}%{_libdir}/*.la %if 0%{?suse_version} < 1220 # install icons @@ -155,7 +158,7 @@ # remove unsupported locales rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK} -%find_lang exo-1 +%find_lang exo-1 %{?no_lang_C} %suse_update_desktop_file exo-preferred-applications %suse_update_desktop_file exo-mail-reader @@ -190,11 +193,6 @@ %{_mandir}/man1/exo-open.1* %{_datadir}/icons/hicolor/*/*/* -%files data -%defattr(-,root,root) -%dir %{_datadir}/xfce4 -%{_datadir}/xfce4/helpers - %files lang -f exo-1.lang %files -n %{libname} @@ -202,10 +200,14 @@ %doc README ChangeLog NEWS COPYING AUTHORS THANKS TODO %{_libdir}/libexo-1.so.* %dir %{_libdir}/xfce4 -%dir %{_libdir}/xfce4/exo-1 +%dir %{_libexecdir}/xfce4 +%dir %{_libexecdir}/xfce4/exo-1 # helper binaries which can be considered part of the API -%{_libdir}/xfce4/exo-1/exo-compose-mail-1 -%{_libdir}/xfce4/exo-1/exo-helper-1 +%{_libexecdir}/xfce4/exo-1/exo-compose-mail-1 +%{_libexecdir}/xfce4/exo-1/exo-helper-1 +# the helper file db makes use of the above versioned binaries +%dir %{_datadir}/xfce4/exo-1 +%{_datadir}/xfce4/exo-1/helpers # frame image directly used by the library %dir %{_datadir}/pixmaps/exo-1/ %{_datadir}/pixmaps/exo-1/exo-thumbnail-frame.png @@ -217,9 +219,10 @@ %{_libdir}/pkgconfig/exo* %{_datadir}/gtk-doc/html/exo-1/ -%files branding-upstream +%files -n %{libname}-branding-upstream %defattr(-,root,root) %dir %{_sysconfdir}/xdg/xfce4 -%config %{_sysconfdir}/xdg/xfce4/helpers.rc +%dir %{_sysconfdir}/xdg/xfce4/exo-1 +%config %{_sysconfdir}/xdg/xfce4/exo-1/helpers.rc %changelog ++++++ use-versioned-helpers-db.patch ++++++ Index: exo-0.10.2/exo-helper/exo-helper.c =================================================================== --- exo-0.10.2.orig/exo-helper/exo-helper.c +++ exo-0.10.2/exo-helper/exo-helper.c @@ -532,7 +532,7 @@ exo_helper_database_lookup (ExoHelperDat g_return_val_if_fail (id != NULL, NULL); /* generate the spec for the helper */ - spec = g_strconcat ("xfce4/helpers/", id, ".desktop", NULL); + spec = g_strconcat ("xfce4/exo-" LIBEXO_VERSION_API "/helpers/", id, ".desktop", NULL); /* try to find a cached version */ helper = g_hash_table_lookup (database->helpers, spec); @@ -635,7 +635,7 @@ exo_helper_database_get_default (ExoHelp g_return_val_if_fail (EXO_IS_HELPER_DATABASE (database), NULL); g_return_val_if_fail (category < EXO_HELPER_N_CATEGORIES, NULL); - rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG, "xfce4/helpers.rc", TRUE); + rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG, "xfce4/exo-" LIBEXO_VERSION_API "/helpers.rc", TRUE); if (G_LIKELY (rc != NULL)) { key = exo_helper_category_to_string (category); @@ -682,7 +682,7 @@ exo_helper_database_set_default (ExoHelp g_return_val_if_fail (EXO_IS_HELPER (helper), FALSE); /* open the helpers.rc for writing */ - rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG, "xfce4/helpers.rc", FALSE); + rc = xfce_rc_config_open (XFCE_RESOURCE_CONFIG, "xfce4/exo-" LIBEXO_VERSION_API "/helpers.rc", FALSE); if (G_UNLIKELY (rc == NULL)) { g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_IO, _("Failed to open %s for writing"), "helpers.rc"); @@ -795,7 +795,7 @@ exo_helper_database_get_all (ExoHelperDa g_return_val_if_fail (category < EXO_HELPER_N_CATEGORIES, NULL); xfce_resource_push_path (XFCE_RESOURCE_DATA, DATADIR); - specs = xfce_resource_match (XFCE_RESOURCE_DATA, "xfce4/helpers/*.desktop", TRUE); + specs = xfce_resource_match (XFCE_RESOURCE_DATA, "xfce4/exo-" LIBEXO_VERSION_API "/helpers/*.desktop", TRUE); xfce_resource_pop_path (XFCE_RESOURCE_DATA); for (n = 0; specs[n] != NULL; ++n) @@ -884,7 +884,7 @@ exo_helper_database_set_custom (ExoHelpe /* determine the spec for the custom helper */ category_string = exo_helper_category_to_string (category); - g_snprintf (spec, sizeof (spec), "xfce4/helpers/custom-%s.desktop", category_string); + g_snprintf (spec, sizeof (spec), "xfce4/helpers/exo-" LIBEXO_VERSION_API "/custom-%s.desktop", category_string); /* lookup the resource save location */ file = xfce_resource_save_location (XFCE_RESOURCE_DATA, spec, TRUE); Index: exo-0.10.2/exo-helper/helpers/Makefile.am =================================================================== --- exo-0.10.2.orig/exo-helper/helpers/Makefile.am +++ exo-0.10.2/exo-helper/helpers/Makefile.am @@ -1,8 +1,8 @@ -defaultsdir = $(sysconfdir)/xdg/xfce4 +defaultsdir = $(sysconfdir)/xdg/xfce4/exo-$(LIBEXO_VERSION_API)/ defaults_DATA = helpers.rc -desktopdir = $(datadir)/xfce4/helpers +desktopdir = $(datadir)/xfce4/exo-$(LIBEXO_VERSION_API)/helpers desktop_in_in_files = \ aterm.desktop.in.in \ balsa.desktop.in.in \ Index: exo-0.10.2/exo-helper/Makefile.am =================================================================== --- exo-0.10.2.orig/exo-helper/Makefile.am +++ exo-0.10.2/exo-helper/Makefile.am @@ -7,7 +7,8 @@ INCLUDES = \ -DBINDIR=\"$(bindir)\" \ -DDATADIR=\"$(datadir)\" \ -DG_LOG_DOMAIN=\"exo-helper\" \ - -DPACKAGE_LOCALE_DIR=\"$(localedir)\" + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + -DLIBEXO_VERSION_API=\"$(LIBEXO_VERSION_API)\" exo_helperdir = $(HELPER_PATH_PREFIX)/xfce4/exo-$(LIBEXO_VERSION_API) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org