rpms/gpointing-device-settings/F-11 gpds-1.3.1-fix_typos_bug_596015.patch, NONE, 1.1 gpds-1.3.1-pkgconfig.patch, NONE, 1.1 gpointing-device-settings.desktop, NONE, 1.1 gpointing-device-settings.spec, NONE, 1.1 touchpad.png, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Wed Sep 30 14:32:14 UTC 2009

Author: giallu

Update of /cvs/extras/rpms/gpointing-device-settings/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27192

Modified Files:
	.cvsignore sources 
Added Files:
	gpds-1.3.1-fix_typos_bug_596015.patch 
	gpds-1.3.1-pkgconfig.patch gpointing-device-settings.desktop 
	gpointing-device-settings.spec touchpad.png 
Log Message:
Initial import


gpds-1.3.1-fix_typos_bug_596015.patch:
 gpds-mouse-definitions.h |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE gpds-1.3.1-fix_typos_bug_596015.patch ---
>From d39cf65fceb7abb4c5db241bb261f4e0f9eeb8a8 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Sun, 27 Sep 2009 01:40:37 +0000
Subject: Fix typos. Fixes for bug 596015.

---

diff --git a/modules/common/gpds-mouse-definitions.h b/modules/common/gpds-mouse-definitions.h
index a78771d..1b2039d 100644
--- a/modules/common/gpds-mouse-definitions.h
+++ b/modules/common/gpds-mouse-definitions.h
@@ -22,9 +22,9 @@
 
 #define GPDS_MOUSE_GCONF_DIR                   "/desktop/gnome/peripherals"
 #define GPDS_MOUSE_MIDDLE_BUTTON_EMULATION_KEY "middle_button_emulation"
-#define GPDS_MOUSE_MIDDLE_BUTTON_TIMEOUT_KEY   "middle_button_timeoue"
+#define GPDS_MOUSE_MIDDLE_BUTTON_TIMEOUT_KEY   "middle_button_timeout"
 #define GPDS_MOUSE_WHEEL_EMULATION_KEY         "wheel_emulation"
-#define GPDS_MOUSE_WHEEL_EMULATION_INERTIA_KEY "wheel_emulation_inetia"
+#define GPDS_MOUSE_WHEEL_EMULATION_INERTIA_KEY "wheel_emulation_inertia"
 #define GPDS_MOUSE_WHEEL_EMULATION_X_AXIS_KEY  "wheel_emulation_x_axis"
 #define GPDS_MOUSE_WHEEL_EMULATION_Y_AXIS_KEY  "wheel_emulation_y_axis"
 #define GPDS_MOUSE_WHEEL_EMULATION_TIMEOUT_KEY "wheel_emulation_timeout"
--
cgit v0.8.2


gpds-1.3.1-pkgconfig.patch:
 libgpointing-device-settings.pc.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE gpds-1.3.1-pkgconfig.patch ---
diff --git a/libgpointing-device-settings.pc.in b/libgpointing-device-settings.pc.in
index 8fda90e..900beaa 100644
--- a/libgpointing-device-settings.pc.in
+++ b/libgpointing-device-settings.pc.in
@@ -12,5 +12,5 @@ Name: LibGPointingDeviceSettings
 Description: Library to create dynamic module of UI for pointing device settings
 Version: @VERSION@
 Requires: gtk+-2.0 >= @GTK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@
-Libs: -L${libdir} -lgpointing-device-settings
+Libs: -L${libdir} -lgpds
 Cflags: -I${includedir}/gpointing-device-settings


--- NEW FILE gpointing-device-settings.desktop ---
[Desktop Entry]
Name=Pointing Devices
Comment=Set your pointing device preferences
Exec=gpointing-device-settings
Icon=touchpad
Terminal=false
Type=Application
StartupNotify=true
Categories=GNOME;Settings;
OnlyShowIn=GNOME;


--- NEW FILE gpointing-device-settings.spec ---
Name:           gpointing-device-settings
Version:        1.3.1
Release:        5%{?dist}
Summary:        Configuration tool for pointing devices

Group:          Applications/System
License:        LGPLv3+
URL:            http://live.gnome.org/GPointingDeviceSettings
Source0:        http://dl.sourceforge.jp/gsynaptics/38468/gpointing-device-settings-1.3.1.tar.gz
Source1:        gpointing-device-settings.desktop
Source2:        touchpad.png

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gettext, intltool
BuildRequires:  GConf2-devel
BuildRequires:  libXi-devel
BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils

Requires:       gnome-settings-daemon
Requires(pre):  GConf2
Requires(post): GConf2
Requires(preun):GConf2

# Obsoletes gsynaptics, to be removed in F14
Obsoletes:      gsynaptics < 0.9.17
Provides:       gsynaptics = %{version}-%{release}

# Reported upstream https://bugzilla.gnome.org/show_bug.cgi?id=596835
Patch0:         gpds-1.3.1-pkgconfig.patch
# Fixed upstream https://bugzilla.gnome.org/show_bug.cgi?id=596015
Patch1:         gpds-1.3.1-fix_typos_bug_596015.patch


%description
GUI tool for setting pointing device such as TrackPoint or Touchpad. It
allows configuring of various drivers parameters on the fly.
It is a successor of GSynaptics.


%package devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       gtk2-devel, GConf2-devel, libXi-devel
Requires:       pkgconfig

%description devel
Development headers and libraries for %{name}.


%prep
%setup -q
%patch0 -p1 -b .pkgconfig
%patch1 -p1 -b .typos

%build
%configure \
        --disable-static \
        --disable-schemas-install \
        --disable-dependency-tracking

# https://fedoraproject.org/wiki/Packaging:Guidelines#Removing_Rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

%find_lang %{name}

# Remove useless files
find %{buildroot} -name '*.la' -delete

desktop-file-install                                    \
--dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
%{SOURCE1}

install -D %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/touchpad.png


%clean
rm -rf $RPM_BUILD_ROOT


%post devel -p /sbin/ldconfig

%postun devel -p /sbin/ldconfig


%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
        %{_sysconfdir}/gconf/schemas/gpointing-device-settings_gnome_settings_daemon.schemas >/dev/null || :
fi

%post 
/sbin/ldconfig
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-install-rule \
    %{_sysconfdir}/gconf/schemas/gpointing-device-settings_gnome_settings_daemon.schemas >/dev/null || :

%postun -p /sbin/ldconfig

%preun 
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
        %{_sysconfdir}/gconf/schemas/gpointing-device-settings_gnome_settings_daemon.schemas >/dev/null || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc NEWS TODO MAINTAINERS COPYING
%{_sysconfdir}/gconf/schemas/*
%{_bindir}/gpointing-device-settings
%{_libdir}/gnome-settings-daemon-2.0/*
%{_libdir}/gpointing-device-settings/
%{_datadir}/gpointing-device-settings/
%{_datadir}/applications/*
%{_datadir}/pixmaps/touchpad.png
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%{_libdir}/*.so


%changelog
* Mon Sep 28 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-5
- Add patch from upstream

* Wed Sep 23 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-4
- fix .desktop validation issues
- add missing icon from gsynaptics

* Sun Sep 20 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-3
- Don't split libgdps until translations are split as well
- Fix .pc library name
- Fix GConf scriptlets according to guidelines snippets
- Fix obsoletes
- Add .desktop file

* Tue Jul 21 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-2
- Require gnome-settings-daemon
- Fix Source0 URL
- Obsoletes gsynaptics

* Wed Jul  1 2009 Gianluca Sforna <giallu gmail com> - 1.3.1-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpointing-device-settings/F-11/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	29 Sep 2009 20:03:05 -0000	1.1
+++ .cvsignore	30 Sep 2009 14:32:14 -0000	1.2
@@ -0,0 +1 @@
+gpointing-device-settings-1.3.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpointing-device-settings/F-11/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	29 Sep 2009 20:03:05 -0000	1.1
+++ sources	30 Sep 2009 14:32:14 -0000	1.2
@@ -0,0 +1 @@
+2b0a567739fb565364cdca8dfc72545c  gpointing-device-settings-1.3.1.tar.gz


