Hello community, here is the log from the commit of package gsynaptics checked in at Thu Nov 6 00:27:54 CET 2008. -------- --- GNOME/gsynaptics/gsynaptics.changes 2008-05-19 18:31:37.000000000 +0200 +++ /mounts/work_src_done/STABLE/gsynaptics/gsynaptics.changes 2008-11-03 03:51:59.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 3 03:21:28 CET 2008 - vuntz@novell.com + +- Add gsynaptics-icon.patch and preferences-system-touchpad.tar.bz2 + to install valid icons for the application. Fix bnc#405250. +- Spec cleanup. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gsynaptics-icon.patch preferences-system-touchpad.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gsynaptics.spec ++++++ --- /var/tmp/diff_new_pack.J27694/_old 2008-11-06 00:27:10.000000000 +0100 +++ /var/tmp/diff_new_pack.J27694/_new 2008-11-06 00:27:10.000000000 +0100 @@ -2,9 +2,16 @@ # spec file for package gsynaptics (Version 0.9.14) # # Copyright (c) 2008 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. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,19 +19,28 @@ Name: gsynaptics -BuildRequires: fdupes gnome-doc-utils-devel intltool libglade2-devel libgnomeui-devel libsynaptics perl-XML-Parser pkg-config update-desktop-files +BuildRequires: fdupes +BuildRequires: gconf2-devel +BuildRequires: gnome-doc-utils-devel +BuildRequires: intltool +BuildRequires: libglade2-devel +BuildRequires: libsynaptics +BuildRequires: pkg-config +BuildRequires: update-desktop-files License: GPL v2 or later Group: System/GUI/GNOME AutoReqProv: on Version: 0.9.14 -Release: 19 +Release: 68 Summary: A Graphical Front-End for TouchPad Configuration Url: http://sourceforge.jp/projects/gsynaptics/ Source: %{name}-%{version}.tar.bz2 +Source1: preferences-system-touchpad.tar.bz2 # PATCH-FIX-UPSTREAM gsynaptics-patch-missing-null.patch snorp@novell.com bnc388236 -- submitted to http://sourceforge.jp/tracker/index.php?func=detail&aid=12568&group_id=1720&atid=6435 Patch0: gsynaptics-patch-missing-null.patch +# PATCH-FIX-UPSTREAM gsynaptics-icon.patch vuntz@novell.com -- http://sourceforge.jp/tracker/index.php?func=detail&aid=12499&group_id=1720&atid=6433 +Patch1: gsynaptics-icon.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define prefix /usr Requires: x11-input-synaptics >= 0.14.4 Requires: %{name}-lang = %{version} @@ -41,16 +57,23 @@ %lang_package %prep -%setup +%setup -a 1 %patch0 -p0 +%patch1 -p1 %build -./configure --prefix=%prefix +autoreconf -f -i +%configure make %{?jobs:-j %jobs} %install -make DESTDIR=$RPM_BUILD_ROOT install -%suse_update_desktop_file %name X-SuSE-ControlCenter-Hardware +%makeinstall +install -D -m644 16x16/preferences-system-touchpad.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/gsynaptics.png +install -D -m644 22x22/preferences-system-touchpad.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/22x22/apps/gsynaptics.png +install -D -m644 24x24/preferences-system-touchpad.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/24x24/apps/gsynaptics.png +install -D -m644 32x32/preferences-system-touchpad.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/gsynaptics.png +install -D -m644 scalable/preferences-system-touchpad.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/gsynaptics.svg +%suse_update_desktop_file %{name} X-SuSE-ControlCenter-Hardware %find_lang %{name} %fdupes $RPM_BUILD_ROOT @@ -59,27 +82,30 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README TODO -%{prefix}/bin/gsynaptics* -%{prefix}/share/applications/gsynaptics.desktop -%{prefix}/share/gnome/autostart/gsynaptics-init.desktop -%dir %{prefix}/share/gnome -%dir %{prefix}/share/gnome/autostart -%dir %{prefix}/share/gsynaptics -%{prefix}/share/gsynaptics/* -%{prefix}/share/locale/*/LC_MESSAGES/gsynaptics.mo -%{prefix}/share/man/man1/gsynaptics* -%{prefix}/share/pixmaps/touchpad.png +%doc AUTHORS COPYING ChangeLog README TODO +%{_bindir}/gsynaptics* +%{_datadir}/applications/gsynaptics.desktop +%{_datadir}/gnome/autostart/gsynaptics-init.desktop +%{_datadir}/icons/hicolor/*/*/*.* +#%dir %{prefix}/share/gnome +#%dir %{prefix}/share/gnome/autostart +%dir %{_datadir}/gsynaptics +%{_datadir}/gsynaptics/* +%doc %{_mandir}/man?/gsynaptics* %files lang -f %{name}.lang %changelog +* Mon Nov 03 2008 vuntz@novell.com +- Add gsynaptics-icon.patch and preferences-system-touchpad.tar.bz2 + to install valid icons for the application. Fix bnc#405250. +- Spec cleanup. * Mon May 19 2008 maw@suse.de - Add gsynaptics-patch-missing-null.patch (bnc#388236). * Wed Apr 02 2008 maw@suse.de - Update to version 0.9.14: + Misc. bugfixes and feature enhancements. -* Wed Aug 08 2007 maw@suse.de +* Tue Aug 07 2007 maw@suse.de - Use %%fdupes - Split off a -lang subpackage. * Wed Jan 03 2007 jhargadon@suse.de ++++++ gsynaptics-icon.patch ++++++ Index: gsynaptics-0.9.14/data/Makefile.am =================================================================== --- gsynaptics-0.9.14.orig/data/Makefile.am +++ gsynaptics-0.9.14/data/Makefile.am @@ -1,8 +1,5 @@ @INTLTOOL_DESKTOP_RULE@ -appicondir = $(datadir)/pixmaps -appicon_DATA = touchpad.png - desktopdir = $(datadir)/applications Desktop_in_files = gsynaptics.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) Index: gsynaptics-0.9.14/data/gsynaptics-init.desktop =================================================================== --- gsynaptics-0.9.14.orig/data/gsynaptics-init.desktop +++ gsynaptics-0.9.14/data/gsynaptics-init.desktop @@ -20,7 +20,7 @@ Comment[pl]=Ustaw Twoje preferencje touc Comment[zh_CN]=设置触摸板首选项 Comment[zh_TW]=設定您的觸控板使用偏好 Exec=gsynaptics-init --sm-disable -Icon=touchpad +Icon=gsynaptics Terminal=false Type=Application Categories= Index: gsynaptics-0.9.14/data/gsynaptics.desktop =================================================================== --- gsynaptics-0.9.14.orig/data/gsynaptics.desktop +++ gsynaptics-0.9.14/data/gsynaptics.desktop @@ -20,7 +20,7 @@ Comment[pl]=Ustaw Twoje preferencje touc Comment[zh_CN]=设置触摸板首选项 Comment[zh_TW]=設定您的觸控板使用偏好 Exec=gsynaptics -Icon=touchpad +Icon=gsynaptics Terminal=false Type=Application StartupNotify=true Index: gsynaptics-0.9.14/src/main.c =================================================================== --- gsynaptics-0.9.14.orig/src/main.c +++ gsynaptics-0.9.14/src/main.c @@ -527,12 +527,10 @@ cb_max_speed_change (GtkRange *range, Gt static void setup_dialog (GladeXML *dialog) { - GdkPixbuf *icon_pixbuf = NULL; GtkWidget *widget, *button; GtkWidget *check, *scale; GSynaptics *synaptics; - gchar *path; gboolean value; gint num; @@ -690,15 +688,7 @@ setup_dialog (GladeXML *dialog) gtk_window_set_default_size (GTK_WINDOW (widget), 400, -1); - path = g_build_filename (DATADIR "/pixmaps", "touchpad.png", NULL); - if (path) - { - icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL); - gtk_window_set_icon (GTK_WINDOW (widget), icon_pixbuf); - g_free (path); - if (icon_pixbuf) - g_object_unref (icon_pixbuf); - } + gtk_window_set_icon_name (GTK_WINDOW (widget), "gsynaptics"); gtk_widget_show_all (widget); } Index: gsynaptics-0.9.14/data/gsynaptics-init.desktop.in.in =================================================================== --- gsynaptics-0.9.14.orig/data/gsynaptics-init.desktop.in.in +++ gsynaptics-0.9.14/data/gsynaptics-init.desktop.in.in @@ -3,7 +3,7 @@ Encoding=UTF-8 _Name=Touchpad _Comment=Set your touchpad preferences Exec=gsynaptics-init --sm-disable -Icon=touchpad +Icon=gsynaptics Terminal=false Type=Application Categories= Index: gsynaptics-0.9.14/data/gsynaptics.desktop.in.in =================================================================== --- gsynaptics-0.9.14.orig/data/gsynaptics.desktop.in.in +++ gsynaptics-0.9.14/data/gsynaptics.desktop.in.in @@ -3,7 +3,7 @@ Encoding=UTF-8 _Name=Touchpad _Comment=Set your touchpad preferences Exec=gsynaptics -Icon=touchpad +Icon=gsynaptics Terminal=false Type=Application StartupNotify=true ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org