Hello community,
here is the log from the commit of package byzanz for openSUSE:Factory
checked in at Mon Jul 11 10:01:41 CEST 2011.
--------
--- GNOME/byzanz/byzanz.changes 2011-06-23 17:37:52.000000000 +0200
+++ /mounts/work_src_done/STABLE/byzanz/byzanz.changes 2011-07-07
16:09:20.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Jul 7 16:06:55 CEST 2011 - vu...@opensuse.org
+
+- Correctly use "!%favor_gtk2": it has to be "!(0%{?favor_gtk2})",
+ since %favor_gtk2 will expand to a complex expression.
+- Add byzanz-own-datadir.patch to move the menu definition to a non
+ GNOME 2 directory. This fixes the build on Factory since we will
+ own this new directory which is byzanz-specific.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
byzanz-own-datadir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ byzanz.spec ++++++
--- /var/tmp/diff_new_pack.vT9i6j/_old 2011-07-11 10:01:17.000000000 +0200
+++ /var/tmp/diff_new_pack.vT9i6j/_new 2011-07-11 10:01:17.000000000 +0200
@@ -21,7 +21,7 @@
Name: byzanz
Version: 0.2.3
-Release: 4
+Release: 6
License: GPLv2+
Summary: Tool to record a running X desktop to an animated GIF file
Group: Productivity/Multimedia/Video/Editors and Convertors
@@ -29,6 +29,8 @@
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM byzanz-gnome3.patch vu...@opensuse.org -- Taken from git,
port to GNOME 3
Patch0: byzanz-gnome3.patch
+# PATCH-FIX-UPSTREAM byzanz-own-datadir.patch bgo#654158 vu...@opensuse.org --
Do not install a file in GNOME 2 directory
+Patch1: byzanz-own-datadir.patch
BuildRequires: gconf2
BuildRequires: intltool
BuildRequires: translation-update-upstream
@@ -62,8 +64,9 @@
%prep
%setup -q
translation-update-upstream
-%if !0%{?favor_gtk2}
+%if ! (0%{?favor_gtk2})
%patch0 -p1
+%patch1 -p1
NOCONFIGURE=1 gnome-autogen.sh
%endif
@@ -105,11 +108,12 @@
%{_libexecdir}/byzanz-applet
%if 0%{?favor_gtk2}
%{_libdir}/bonobo/servers/ByzanzApplet.server
+%{_datadir}/gnome-2.0/ui/byzanzapplet.xml
%else
+%{_datadir}/byzanz/
%{_datadir}/dbus-1/services/org.gnome.panel.applet.ByzanzAppletFactory.service
%{_datadir}/gnome-panel/4.0/applets/org.gnome.ByzanzApplet.panel-applet
%endif
-%{_datadir}/gnome-2.0/ui/byzanzapplet.xml
%{_datadir}/icons/hicolor/*/apps/byzanz*
%{_mandir}/man*/*.*
++++++ byzanz-own-datadir.patch ++++++
Index: byzanz-0.2.3/src/Makefile.am
===================================================================
--- byzanz-0.2.3.orig/src/Makefile.am
+++ byzanz-0.2.3/src/Makefile.am
@@ -113,7 +113,7 @@ org.gnome.panel.applet.ByzanzAppletFacto
-e "s|\@LIBEXECDIR\@|$(libexecdir)|" \
$< > $@
-uidir = $(datadir)/gnome-2.0/ui
+uidir = $(datadir)/byzanz
ui_DATA = byzanzapplet.xml
CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(schemas_DATA)
$(BUILT_SOURCES)
Index: byzanz-0.2.3/src/Makefile.in
===================================================================
--- byzanz-0.2.3.orig/src/Makefile.in
+++ byzanz-0.2.3/src/Makefile.in
@@ -385,7 +385,7 @@ schemas_DATA = $(schemas_in_files:.schem
serverdir = $(libdir)/bonobo/servers
server_in_files = ByzanzApplet.server.in
server_DATA = $(server_in_files:.server.in=.server)
-uidir = $(datadir)/gnome-2.0/ui
+uidir = $(datadir)/byzanz
ui_DATA = byzanzapplet.xml
CLEANFILES = $(server_in_files) $(server_DATA) $(schemas_DATA) $(BUILT_SOURCES)
EXTRA_DIST = \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
