From 80b1bbe589fc48531b8006ae09c558bd2a113e8a3b3168786a062259b20aa9b1 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 24 May 2009 22:56:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pommed?expand=0&rev=10 --- pommed-1.22.tar.bz2 | 3 --- pommed-1.26.tar.bz2 | 3 +++ pommed-optflags.patch | 32 +++++++++++++---------------- pommed.changes | 30 +++++++++++++++++++++++++++ pommed.spec | 48 +++++++++++++++++++++++++++++++------------ 5 files changed, 82 insertions(+), 34 deletions(-) delete mode 100644 pommed-1.22.tar.bz2 create mode 100644 pommed-1.26.tar.bz2 diff --git a/pommed-1.22.tar.bz2 b/pommed-1.22.tar.bz2 deleted file mode 100644 index e004937..0000000 --- a/pommed-1.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49b06d4eb36e7d57c1cbda05a16209c557aa69daf6a1adfe477587a32f02b629 -size 994225 diff --git a/pommed-1.26.tar.bz2 b/pommed-1.26.tar.bz2 new file mode 100644 index 0000000..72a22f4 --- /dev/null +++ b/pommed-1.26.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74d52c2e86f230c57a6fa9492c865ad750da22726dd47d11a459a4fe4c0aff0d +size 953141 diff --git a/pommed-optflags.patch b/pommed-optflags.patch index aa13ed9..e6357fd 100644 --- a/pommed-optflags.patch +++ b/pommed-optflags.patch @@ -1,8 +1,8 @@ Index: gpomme/Makefile -=================================================================== ---- gpomme/Makefile.orig +================================================================================ +--- gpomme/Makefile +++ gpomme/Makefile -@@ -17,7 +17,7 @@ CONFUSE_LIBS = $(shell pkg-config libcon +@@ -17,7 +17,7 @@ INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H) @@ -11,29 +11,25 @@ Index: gpomme/Makefile LDFLAGS = -lpthread $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS) SOURCES = gpomme.c theme.c conffile.c \ -Index: pommed/Makefile -=================================================================== ---- pommed/Makefile.orig +--- pommed/Makefile +++ pommed/Makefile -@@ -16,7 +16,7 @@ CONFUSE_LIBS = $(shell pkg-config libcon +@@ -18,7 +18,7 @@ - INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H) + TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H) --CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) -+CFLAGS = -g -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) +-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS) ++CFLAGS = -g -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS) LDFLAGS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS) -Index: wmpomme/Makefile -=================================================================== ---- wmpomme/Makefile.orig +--- wmpomme/Makefile +++ wmpomme/Makefile -@@ -3,7 +3,7 @@ CC = gcc - DBUS_CFLAGS = $(shell pkg-config dbus-1 --cflags) -DDBUS_API_SUBJECT_TO_CHANGE - DBUS_LIBS = $(shell pkg-config dbus-1 --libs) +@@ -5,7 +5,7 @@ --CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) -+CFLAGS = -g -Wall $(DBUS_CFLAGS) + TIMERFD_CFLAGS = $(shell test -e /usr/include/sys/timerfd.h || echo -DNO_SYS_TIMERFD_H) + +-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS) ++CFLAGS = -g -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS) LDFLAGS = -lrt -lXpm -lXext -lX11 $(DBUS_LIBS) SOURCES = wmgeneral.c wmpomme.c \ diff --git a/pommed.changes b/pommed.changes index 651f548..1775706 100644 --- a/pommed.changes +++ b/pommed.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Mon May 25 00:15:03 CEST 2009 - ro@suse.de + +- update to 1.26 + - pommed: only keystrokes on the built-in keyboard should reset + the keyboard idle timer. + - pommed: add USB IDs for the Apple external aluminium mini + keyboard. + - pommed: switch to sysfs resource files for PCI memory access + instead of mmaping /dev/mem. + +- update to 1.25 + - pommed: check current hardware backlight level before setting AC + or battery level. Do not act if the backlight is off. + - pommed: do not reject the Apple Bluetooth keyboard because of + advertised EV_ABS events. + - pommed: fix DBus configuration snippet for newer, stricter + version of DBus (allow clients to send messages). + +- update to 1.24 + - pommed: add new path for fnmode setting for 2.6.28. + +- update to 1.23 + - pommed: add backlight support for late 2008 laptops. + - pommed: default to sysfs backlight driver for nVidia machines, + with the mbp_nvidia_bl kernel driver; fall back to native + nv8600mgt if not supported. + - pommed: try to reconnect to DBus if DBus is not available at + startup. Previously we would just drop it and live without DBus. + ------------------------------------------------------------------- Tue Jan 27 17:24:09 CET 2009 - ro@suse.de diff --git a/pommed.spec b/pommed.spec index 2dd6c9e..858384a 100644 --- a/pommed.spec +++ b/pommed.spec @@ -1,5 +1,5 @@ # -# spec file for package pommed (Version 1.22) +# spec file for package pommed (Version 1.26) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ Name: pommed Summary: Apple laptops hotkeys event handler License: GPL v2 only Group: Hardware/Mobile -Version: 1.22 -Release: 2 +Version: 1.26 +Release: 1 Url: http://technologeek.org/projects/pommed/ %if 0 # BuildRequires some package containing /usr/include/ofapi/of_api.h @@ -49,7 +49,6 @@ Patch2: pommed-hardcoded_libpci.patch Patch3: pommed-optflags.patch Patch4: pommed-dbus_policy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define kdedir /opt/kde3 %description pommed handles the hotkeys found on the Apple MacBook Pro, MacBook and @@ -123,8 +122,8 @@ make %{?jobs:-j%jobs} %install mkdir -p %buildroot/%_bindir %buildroot/%_sbindir %buildroot/%_sysconfdir/{init.d,dbus-1/system.d} -mkdir -p %buildroot/%_datadir/{applications,icons,pixmaps,gpomme,locale} -mkdir -p %buildroot/%_mandir/man1 %buildroot/%{kdedir}/share/{autostart,config} +mkdir -p %buildroot/%_datadir/{applications,autostart,icons,pixmaps,gpomme,locale} +mkdir -p %buildroot/%_mandir/man1 %buildroot/%_datadir/kde4/config install -m 755 pommed/pommed %buildroot/%_sbindir install -m644 %{SOURCE4} README.SuSE %ifarch ppc ppc64 @@ -151,8 +150,8 @@ for mo in gpomme/po/*.mo ; do install -d %buildroot/%_datadir/locale/$lang/LC_MESSAGES install -m 644 $mo %buildroot/%_datadir/locale/$lang/LC_MESSAGES/$filename done -install -m 644 %{S:2} %buildroot/%{kdedir}/share/autostart -install -m 644 %{S:3} %buildroot/%{kdedir}/share/config +install -m 644 %{S:2} %buildroot/%_datadir/autostart +install -m 644 %{S:3} %buildroot/%_datadir/kde4/config # wmpomme install -m 755 wmpomme/wmpomme %buildroot/%_bindir install -m 644 wmpomme/wmpomme.1 %buildroot/%_mandir/man1 @@ -197,10 +196,9 @@ rm -rf %buildroot %_datadir/icons/gp* %_datadir/pixmaps/gp* %_datadir/gpomme -%dir %{kdedir} -%dir %{kdedir}/share -%{kdedir}/share/autostart -%{kdedir}/share/config +%_datadir/autostart +%dir %_datadir/kde4 +%_datadir/kde4/config %_mandir/man1/gpo* %files -n wmpomme @@ -210,6 +208,30 @@ rm -rf %buildroot %_mandir/man1/wmpo* %changelog +* Mon May 25 2009 ro@suse.de +- update to 1.26 + - pommed: only keystrokes on the built-in keyboard should reset + the keyboard idle timer. + - pommed: add USB IDs for the Apple external aluminium mini + keyboard. + - pommed: switch to sysfs resource files for PCI memory access + instead of mmaping /dev/mem. +- update to 1.25 + - pommed: check current hardware backlight level before setting AC + or battery level. Do not act if the backlight is off. + - pommed: do not reject the Apple Bluetooth keyboard because of + advertised EV_ABS events. + - pommed: fix DBus configuration snippet for newer, stricter + version of DBus (allow clients to send messages). +- update to 1.24 + - pommed: add new path for fnmode setting for 2.6.28. +- update to 1.23 + - pommed: add backlight support for late 2008 laptops. + - pommed: default to sysfs backlight driver for nVidia machines, + with the mbp_nvidia_bl kernel driver; fall back to native + nv8600mgt if not supported. + - pommed: try to reconnect to DBus if DBus is not available at + startup. Previously we would just drop it and live without DBus. * Tue Jan 27 2009 ro@suse.de - dbus-policy: add send_destination rule (bnc#469771) * Tue Nov 11 2008 lrupp@suse.de @@ -233,7 +255,7 @@ rm -rf %buildroot - removed dbus-1-devel BuildReq (included in dbus-1-glib-devel) * Fri Oct 17 2008 olh@suse.de - add ExclusiveArch x86 x86_64 -* Thu Sep 04 2008 ro@suse.de +* Fri Sep 05 2008 ro@suse.de - add Required-Stop to init script * Mon Jul 21 2008 lrupp@suse.de - update to 1.21: