Hello community, here is the log from the commit of package obconf checked in at Wed Jul 4 23:38:30 CEST 2007. -------- --- obconf/obconf.changes 2006-09-13 17:53:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/obconf/obconf.changes 2007-07-04 15:36:34.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 4 15:35:34 CEST 2007 - hvogel@suse.de + +- Update to version 2.0.1 which matches the recent changes in + openbox + +------------------------------------------------------------------- Old: ---- obconf-1.6.tar.bz2 obconf.diff New: ---- obconf-2.0.1.tar.bz2 obconf-cleanup.patch obconf-mimelnk.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obconf.spec ++++++ --- /var/tmp/diff_new_pack.Ep5596/_old 2007-07-04 23:38:03.000000000 +0200 +++ /var/tmp/diff_new_pack.Ep5596/_new 2007-07-04 23:38:03.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package obconf (Version 1.6) +# spec file for package obconf (Version 2.0.1) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,16 +12,17 @@ Name: obconf BuildRequires: gcc-c++ libglade2-devel openbox-devel startup-notification-devel update-desktop-files xorg-x11 -License: GPL +License: GPL v2 or later Group: System/GUI/Other Requires: openbox Autoreqprov: on -Version: 1.6 -Release: 6 +Version: 2.0.1 +Release: 1 Summary: Openbox Configuration Tool URL: http://icculus.org/openbox/obconf/ Source: %name-%version.tar.bz2 -Patch: %name.diff +Patch0: obconf-mimelnk.patch +Patch1: obconf-cleanup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -38,6 +39,8 @@ %prep %setup -q +%patch0 +%patch1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" LDFLAGS="-export-dynamic" @@ -49,18 +52,24 @@ rm -rf $RPM_BUILD_ROOT; make "DESTDIR=$RPM_BUILD_ROOT" install %suse_update_desktop_file %name Utility Settings DesktopSettings +%find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS COPYING README %_bindir/%name %_datadir/%name +%_datadir/mime/packages/obconf.xml %_datadir/applications/%name.desktop +/opt/kde3 -%changelog -n obconf +%changelog +* Wed Jul 04 2007 - hvogel@suse.de +- Update to version 2.0.1 which matches the recent changes in + openbox * Wed Sep 13 2006 - hvogel@suse.de - move out of /usr/X11R6 * Mon Sep 11 2006 - ro@suse.de ++++++ obconf-1.6.tar.bz2 -> obconf-2.0.1.tar.bz2 ++++++ ++++ 30245 lines of diff (skipped) ++++++ obconf-cleanup.patch ++++++ --- src/theme.c +++ src/theme.c @@ -62,7 +62,7 @@ /* pixbuf column, for theme previews */ render = gtk_cell_renderer_pixbuf_new(); - g_object_set(render, "xalign", 1.0); + g_object_set(render, "xalign", 1.0, NULL); column = gtk_tree_view_column_new_with_attributes ("Preview", render, "pixbuf", 1, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(w), column); ++++++ obconf-mimelnk.patch ++++++ --- Makefile.am +++ Makefile.am @@ -7,7 +7,7 @@ desktopdir = $(datadir)/applications mimedir = $(datadir)/mime mimepkgdir = $(datadir)/mime/packages -kdemimedir = $(datadir)/mimelnk/application +kdemimedir = /opt/kde3/share/mimelnk/application AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = -I m4 --- Makefile.in +++ Makefile.in @@ -239,7 +239,7 @@ desktopdir = $(datadir)/applications mimedir = $(datadir)/mime mimepkgdir = $(datadir)/mime/packages -kdemimedir = $(datadir)/mimelnk/application +kdemimedir = /opt/kde3/share/mimelnk/application AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = -I m4 src_obconf_CPPFLAGS = \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org