commit byzanz for openSUSE:Factory

27 Aug 2013

Hello community,

here is the log from the commit of package byzanz for openSUSE:Factory checked in at 2013-08-27 20:34:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/byzanz (Old)
 and      /work/SRC/openSUSE:Factory/.byzanz.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "byzanz"

Changes:
--------

--- /work/SRC/openSUSE:Factory/byzanz/byzanz.changes	2012-01-09 21:42:38.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.byzanz.new/byzanz.changes	2013-08-27 20:34:14.000000000 +0200
@@ -1,0 +2,14 @@
+Wed Aug 21 20:14:47 UTC 2013 - dimstar@opensuse.org
+
+- Add byzanz-make-panel-optional.patch: make building the panel
+  applet optional.
+- Introduce build_applet defines (true for openSUSE < 13.1). If
+  evaluated to true, this results in:
+  + enabled pkgconfig(libpanelapplet-4.0) BuildRequires.
+  + conditional addition of panel-applet related files entries.
+- Move gnome-autogen.sh call to %build section.
+- Replace gconf2 BuildRequires with gconf2-devel: it's what we
+  actually require. When building the panel applet, this was
+  indirectly pulled in.
+
+-------------------------------------------------------------------

New:
----
  byzanz-make-panel-optional.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ byzanz.spec ++++++
--- /var/tmp/diff_new_pack.Dsh41P/_old	2013-08-27 20:34:15.000000000 +0200
+++ /var/tmp/diff_new_pack.Dsh41P/_new	2013-08-27 20:34:15.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package byzanz
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2007 wberrier@gmail.com
 #
 # All modifications and additions to the file contributed by third parties
@@ -16,6 +16,9 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+%define build_applet 0%{suse_version} < 1310
+
 Name:           byzanz
 Version:        0.2.3
 Release:        0
@@ -30,13 +33,14 @@
 Patch1:         byzanz-own-datadir.patch
 # PATCH-FIX-UPSTREAM byzanz-gnome-3.3.patch vuntz@opensuse.org -- Taken from git, fix use of deprecated APIs with GNOME 3.3
 Patch2:         byzanz-gnome-3.3.patch
-BuildRequires:  gconf2
+Patch3:         byzanz-make-panel-optional.patch
+BuildRequires:  gconf2-devel
 BuildRequires:  intltool
 BuildRequires:  translation-update-upstream
 %if 0%{?favor_gtk2}
-BuildRequires:  gtk2-devel
 BuildRequires:  gnome-panel-devel
 BuildRequires:  gstreamer-0_10-plugins-base-devel
+BuildRequires:  gtk2-devel
 BuildRequires:  xorg-x11-devel
 %else
 # needed by patch0
@@ -46,7 +50,9 @@
 BuildRequires:  pkgconfig(gstreamer-0.10)
 BuildRequires:  pkgconfig(gstreamer-app-0.10)
 BuildRequires:  pkgconfig(gtk+-3.0)
+%if %{build_applet}
 BuildRequires:  pkgconfig(libpanelapplet-4.0)
+%endif
 BuildRequires:  pkgconfig(x11)
 %endif
 Recommends:     %{name}-lang
@@ -68,11 +74,12 @@
 %patch1 -p1
 %if %{?suse_version} > 1210
 %patch2 -p1
+%patch3 -p1
 %endif
-NOCONFIGURE=1 gnome-autogen.sh
 %endif
 
 %build
+NOCONFIGURE=1 gnome-autogen.sh
 %configure \
         --disable-schemas-install
 make %{?_smp_mflags}
@@ -104,6 +111,7 @@
 %defattr(-, root, root)
 %{_bindir}/byzanz-playback
 %{_bindir}/byzanz-record
+%if %{build_applet}
 %{_libexecdir}/byzanz-applet
 %if 0%{?favor_gtk2}
 %{_libdir}/bonobo/servers/ByzanzApplet.server
@@ -113,6 +121,7 @@
 %{_datadir}/dbus-1/services/org.gnome.panel.applet.ByzanzAppletFactory.service
 %{_datadir}/gnome-panel/4.0/applets/org.gnome.ByzanzApplet.panel-applet
 %endif
+%endif
 %{_datadir}/icons/hicolor/*/apps/byzanz*
 %{_mandir}/man*/*.*
 

++++++ byzanz-make-panel-optional.patch ++++++
...
From d574a750f7bb3a6a6155ad62d99c13ae73fc962a Mon Sep 17 00:00:00 2001
From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue, 19 Mar 2013 17:30:03 +0000
Subject: Make the panel applet optional
---
Index: byzanz-0.2.3/configure.ac
===================================================================
--- byzanz-0.2.3.orig/configure.ac
+++ byzanz-0.2.3/configure.ac
@@ -75,9 +75,12 @@ PKG_CHECK_MODULES(GTK, cairo >= $CAIRO_R
 PKG_CHECK_MODULES(XDAMAGE, xdamage >= $XDAMAGE_REQ)
 
 LIBPANEL_APPLET="libpanelapplet-4.0"
-PKG_CHECK_MODULES(APPLET, $LIBPANEL_APPLET >= $APPLET_REQ)
-appletdir=`$PKG_CONFIG --variable=libpanel_applet_dir $LIBPANEL_APPLET`
-AC_SUBST(appletdir)
+PKG_CHECK_MODULES(APPLET, $LIBPANEL_APPLET >= $APPLET_REQ,
+                  have_applet=yes, have_applet=no)
+AM_CONDITIONAL(HAVE_APPLET, [test x$have_applet = xyes])
+AS_IF([test x$have_applet = xyes],
+      [appletdir=`$PKG_CONFIG --variable=libpanel_applet_dir $LIBPANEL_APPLET`
+       AC_SUBST(appletdir)],[])
 
 PKG_CHECK_MODULES(GST, gstreamer-app-0.10 >= $GST_REQ gstreamer-0.10 >= $GST_REQ)
 
Index: byzanz-0.2.3/src/Makefile.am
===================================================================
--- byzanz-0.2.3.orig/src/Makefile.am
+++ byzanz-0.2.3/src/Makefile.am
@@ -1,6 +1,5 @@
 noinst_LTLIBRARIES = libbyzanz.la
 bin_PROGRAMS = byzanz-record byzanz-playback
-libexec_PROGRAMS = byzanz-applet
 man_MANS = byzanz-record.1 byzanz-playback.1
 
 BUILT_SOURCES = \
@@ -50,7 +49,7 @@ libbyzanz_la_SOURCES = \
 
 libbyzanz_la_CFLAGS = $(BYZANZ_CFLAGS) -I$(top_srcdir)/gifenc
 libbyzanz_la_LIBADD = $(BYZANZ_LIBS) $(top_builddir)/gifenc/libgifenc.la
-		 
+
 byzanz_playback_SOURCES = \
 	playback.c
 
@@ -64,6 +63,8 @@ byzanz_record_SOURCES = \
 byzanz_record_CFLAGS = $(BYZANZ_CFLAGS)
 byzanz_record_LDADD = $(BYZANZ_LIBS) ./libbyzanz.la
 
+if HAVE_APPLET
+libexec_PROGRAMS = byzanz-applet
 
 byzanz_applet_SOURCES = \
 	byzanzapplet.c \
@@ -73,26 +74,6 @@ byzanz_applet_SOURCES = \
 byzanz_applet_CFLAGS = -DBYZANZ_MENU_UI_DIR=\""$(uidir)"\" $(APPLET_CFLAGS)
 byzanz_applet_LDADD = $(APPLET_LIBS) ./libbyzanz.la
 
-
-byzanzmarshal.h: byzanzmarshal.list
-	$(GLIB_GENMARSHAL) --prefix=byzanz_marshal $(srcdir)/byzanzmarshal.list --header > byzanzmarshal.h
-
-byzanzmarshal.c: byzanzmarshal.list
-	(echo "#include \"byzanzmarshal.h\""; \
-	 $(GLIB_GENMARSHAL) --prefix=byzanz_marshal $(srcdir)/byzanzmarshal.list --body) > byzanzmarshal.c
-
-
-schemasdir   = @GCONF_SCHEMA_FILE_DIR@
-schemas_in_files = byzanz.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
-endif
-
 applet_in_files = org.gnome.ByzanzApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
@@ -115,6 +96,26 @@ org.gnome.panel.applet.ByzanzAppletFacto
 
 uidir = $(datadir)/byzanz
 ui_DATA = byzanzapplet.xml
+endif
+
+byzanzmarshal.h: byzanzmarshal.list
+	$(GLIB_GENMARSHAL) --prefix=byzanz_marshal $(srcdir)/byzanzmarshal.list --header > byzanzmarshal.h
+
+byzanzmarshal.c: byzanzmarshal.list
+	(echo "#include \"byzanzmarshal.h\""; \
+	 $(GLIB_GENMARSHAL) --prefix=byzanz_marshal $(srcdir)/byzanzmarshal.list --body) > byzanzmarshal.c
+
+
+schemasdir   = @GCONF_SCHEMA_FILE_DIR@
+schemas_in_files = byzanz.schemas.in
+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+
+@INTLTOOL_SCHEMAS_RULE@
+
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
+endif
 
 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(schemas_DATA) $(BUILT_SOURCES)
 
@@ -125,4 +126,3 @@ EXTRA_DIST = \
 	$(ui_DATA) \
 	$(schemas_in_files)
 
-
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)