diff --git a/gpomme.desktop b/gpomme.desktop index fd2b97e..07e5002 100644 --- a/gpomme.desktop +++ b/gpomme.desktop @@ -4,7 +4,7 @@ Encoding=UTF-8 Name=pommed GTK client Type=Application Exec=gpomme -Icon=gpomme.xpm +Icon=gpomme Terminal=false X-KDE-StartupNotify=false diff --git a/pommed-1.10-build.patch b/pommed-1.10-build.patch deleted file mode 100644 index 8a70693..0000000 --- a/pommed-1.10-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: gpomme/gpomme-c.desktop -=================================================================== ---- gpomme/gpomme-c.desktop -+++ gpomme/gpomme-c.desktop -@@ -7,4 +7,4 @@ Icon=gpomme - Exec=gpomme -c - StartupNotify=true - Type=Application --Categories=Utility -+Categories=System;Settings;HardwareSettings; -Index: gpomme/gpomme.desktop -=================================================================== ---- gpomme/gpomme.desktop -+++ gpomme/gpomme.desktop -@@ -7,4 +7,4 @@ Icon=gpomme - Exec=gpomme - StartupNotify=true - Type=Application --Categories=Utility -+Categories=System;Settings;HardwareSettings; -Index: pommed/Makefile -=================================================================== ---- pommed/Makefile -+++ pommed/Makefile -@@ -45,8 +45,7 @@ SOURCES = pommed.c cd_eject.c evdev.c co - mactel/x1600_backlight.c mactel/gma950_backlight.c \ - mactel/nv8600mgt_backlight.c \ - mactel/kbd_backlight.c mactel/ambient.c mactel/acpi.c -- --LIBS = /usr/lib/libpci.a -+LIBS = -lpci -ldbus-1 - endif - - OBJS = $(SOURCES:%.c=%.o) diff --git a/pommed-1.15.tar.bz2 b/pommed-1.15.tar.bz2 deleted file mode 100644 index 169d3e6..0000000 --- a/pommed-1.15.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ee455c22cbfce9e0ff3ba67e6b6332a96f3c514bf57b61524d7cea09b2a840d -size 987235 diff --git a/pommed-1.21.tar.bz2 b/pommed-1.21.tar.bz2 new file mode 100644 index 0000000..06785c7 --- /dev/null +++ b/pommed-1.21.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5301eba2635a98f1b338f2887e4c8f5f82e4276fdb0e2bcc72f392b06e619ad8 +size 991502 diff --git a/pommed-desktop.patch b/pommed-desktop.patch new file mode 100644 index 0000000..5271efd --- /dev/null +++ b/pommed-desktop.patch @@ -0,0 +1,20 @@ +Index: gpomme/gpomme-c.desktop +=================================================================== +--- gpomme/gpomme-c.desktop.orig ++++ gpomme/gpomme-c.desktop +@@ -7,4 +7,4 @@ + Exec=gpomme -c + StartupNotify=true + Type=Application +-Categories=Utility ++Categories=System;Settings;HardwareSettings; +Index: gpomme/gpomme.desktop +=================================================================== +--- gpomme/gpomme.desktop.orig ++++ gpomme/gpomme.desktop +@@ -7,4 +7,4 @@ + Exec=gpomme + StartupNotify=true + Type=Application +-Categories=Utility ++Categories==System;Settings;HardwareSettings; diff --git a/pommed-hardcoded_libpci.patch b/pommed-hardcoded_libpci.patch new file mode 100644 index 0000000..43025e6 --- /dev/null +++ b/pommed-hardcoded_libpci.patch @@ -0,0 +1,13 @@ +Index: pommed/Makefile +=================================================================== +--- pommed/Makefile.orig ++++ pommed/Makefile +@@ -51,7 +51,7 @@ + CFLAGS += $(LIBPCI_CFLAGS) + LDFLAGS += $(LIBPCI_LIBS) + else +- LIBS = /usr/lib/libpci.a ++ LIBS = -lpci -ldbus-1 + LDFLAGS += -lz + endif + diff --git a/pommed-1.15-optflags.patch b/pommed-optflags.patch similarity index 53% rename from pommed-1.15-optflags.patch rename to pommed-optflags.patch index e5deef3..8a29007 100644 --- a/pommed-1.15-optflags.patch +++ b/pommed-optflags.patch @@ -1,34 +1,34 @@ Index: gpomme/Makefile =================================================================== ---- gpomme/Makefile.orig 2007-12-01 12:51:32.000000000 +0100 -+++ gpomme/Makefile 2008-02-24 21:49:43.000000000 +0100 -@@ -14,7 +14,7 @@ CONFUSE_LIBS = $(shell pkg-config libcon +--- gpomme/Makefile.orig ++++ gpomme/Makefile +@@ -17,7 +17,7 @@ INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H) --CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS) -+CFLAGS += -g -Wall $(DBUS_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS) - LDFLAGS = -lpthread $(DBUS_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS) +-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS) ++CFLAGS += -g -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS) + 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 2007-12-19 22:35:58.000000000 +0100 -+++ pommed/Makefile 2008-02-24 21:49:22.000000000 +0100 -@@ -16,7 +16,7 @@ CONFUSE_LIBS = $(shell pkg-config libcon +--- pommed/Makefile.orig ++++ pommed/Makefile +@@ -16,7 +16,7 @@ INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_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) - LDFLAGS = -pthread $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS) + LDFLAGS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS) Index: wmpomme/Makefile =================================================================== ---- wmpomme/Makefile.orig 2007-11-27 17:38:21.000000000 +0100 -+++ wmpomme/Makefile 2008-02-24 21:48:32.000000000 +0100 -@@ -3,7 +3,7 @@ CC = gcc +--- wmpomme/Makefile.orig ++++ wmpomme/Makefile +@@ -3,7 +3,7 @@ DBUS_CFLAGS = $(shell pkg-config dbus-1 --cflags) -DDBUS_API_SUBJECT_TO_CHANGE DBUS_LIBS = $(shell pkg-config dbus-1 --libs) diff --git a/pommed.changes b/pommed.changes index 4b10331..84d768b 100644 --- a/pommed.changes +++ b/pommed.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Jul 21 16:31:24 CEST 2008 - lrupp@suse.de + +- update to 1.21: + + Note that this version of pommed REQUIRES Linux 2.6.25 or + later and WILL NOT WORK PROPERLY on earlier kernels + + pommed: add support for the MacBookPro4,1. + + pommed: add support for the MacBook4,1. + + pommed: add support for the WellSpring keyboard+trackpad + assembly ("MultiTouch"), found in the MacBookAir1,1 and + MacBookPro4,1 + + fix array boundary check in check_machine_dmi(). + + use BUS_BLUETOOTH for the Apple wireless keyboard + + gpomme: won't cause 10 wakeups/sec anymore + + gpomme: use compositing if available, patch by Soeren Sonnenburg +- create the desktop icons after fdupes (otherwise they will + be stale symlinks) +- remove libsmbios build dependency +- split the patch into it's pieces + ------------------------------------------------------------------- Sun Feb 24 21:57:42 CET 2008 - crrodriguez@suse.de diff --git a/pommed.spec b/pommed.spec index acf8e65..c8db9c3 100644 --- a/pommed.spec +++ b/pommed.spec @@ -1,5 +1,5 @@ # -# spec file for package pommed (Version 1.15) +# spec file for package pommed (Version 1.21) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,13 +15,13 @@ Name: pommed Summary: Apple laptops hotkeys event handler License: GPL v2 only Group: Hardware/Mobile -Version: 1.15 -Release: 6 +Version: 1.21 +Release: 1 Url: http://technologeek.org/projects/pommed/ BuildRequires: alsa-devel audiofile-devel gtk2-devel libglade2-devel pciutils-devel update-desktop-files -BuildRequires: dbus-1-devel libconfuse-devel libsmbios-devel libsmbios-libs +BuildRequires: dbus-1-devel libconfuse-devel BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXpm-devel xorg-x11-util-devel -BuildRequires: xorg-x11 +BuildRequires: dbus-1-glib-devel xorg-x11 %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif @@ -33,9 +33,10 @@ Source2: gpomme.desktop Source3: gpommerc Source4: pommed-README.SuSE Source5: pommed-rpmlintrc -Patch: pommed-1.10-build.patch +Patch1: pommed-desktop.patch +Patch2: pommed-hardcoded_libpci.patch +Patch3: pommed-optflags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Patch1: pommed-1.15-optflags.patch %define kdedir /opt/kde3 %description @@ -55,6 +56,7 @@ Authors: Julien BLACHE %package -n gpomme +License: GPL v2 only Summary: Graphical client for pommed Group: Hardware/Mobile Requires: pommed @@ -76,6 +78,7 @@ Authors: Julien BLACHE %package -n wmpomme +License: GPL v2 only Summary: WindowMaker dockapp client for pommed Group: Hardware/Mobile Requires: pommed @@ -97,8 +100,9 @@ Authors: %prep %setup -q -%patch %patch1 +%patch2 +%patch3 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -139,13 +143,15 @@ install -m 644 %{S:3} %buildroot/%{kdedir}/share/config # wmpomme install -m 755 wmpomme/wmpomme %buildroot/%_bindir install -m 644 wmpomme/wmpomme.1 %buildroot/%_mandir/man1 -install -m 644 icons/gpomme_32x32.xpm %buildroot/%_datadir/icons/wmpomme.xpm %suse_update_desktop_file %buildroot/%_datadir/applications/gpomme-c.desktop %suse_update_desktop_file %buildroot/%_datadir/applications/gpomme.desktop # enable videoswitch +mkdir -p %buildroot/%_sysconfdir/pommed %if 0%{?suse_version} > 1020 %fdupes -s %buildroot %endif +install -m 644 icons/gpomme_32x32.xpm %buildroot/%_datadir/icons/wmpomme.xpm +install -m 644 icons/gpomme_32x32.xpm %buildroot/%_datadir/pixmaps/gpomme.xpm %find_lang gpomme %post @@ -191,6 +197,23 @@ rm -rf %buildroot %_mandir/man1/wmpo* %changelog +* Mon Jul 21 2008 lrupp@suse.de +- update to 1.21: + + Note that this version of pommed REQUIRES Linux 2.6.25 or + later and WILL NOT WORK PROPERLY on earlier kernels + + pommed: add support for the MacBookPro4,1. + + pommed: add support for the MacBook4,1. + + pommed: add support for the WellSpring keyboard+trackpad + assembly ("MultiTouch"), found in the MacBookAir1,1 and + MacBookPro4,1 + + fix array boundary check in check_machine_dmi(). + + use BUS_BLUETOOTH for the Apple wireless keyboard + + gpomme: won't cause 10 wakeups/sec anymore + + gpomme: use compositing if available, patch by Soeren Sonnenburg +- create the desktop icons after fdupes (otherwise they will + be stale symlinks) +- remove libsmbios build dependency +- split the patch into it's pieces * Sun Feb 24 2008 crrodriguez@suse.de - use RPM_OPT_FLAGS * Tue Feb 12 2008 ro@suse.de