Hello community,
here is the log from the commit of package pommed
checked in at Fri Jan 18 00:25:00 CET 2008.
--------
--- arch/i386/pommed/pommed.changes 2007-09-17 12:54:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/pommed/pommed.changes 2008-01-17 18:17:01.000000000 +0100
@@ -1,0 +2,38 @@
+Thu Jan 17 18:15:36 CET 2008 - lrupp@suse.de
+
+- update to 1.14:
+ + fix error handling in the audio sample loading code to properly
+ report failure, preventing nasty segfaults later on in case the
+ sound file is not available.
+ + make goutte.wav the default beep sound, add click.wav and remove
+ the KDE beep sound.
+ + add an option to disable the beep on volume change
+ + add the videoSwitch DBus notification
+ + add support for LCD backlight control on the Intel 965GM
+ found in the MacBook3,1
+ + rework the inotify code to handle several events at once and to
+ handle events with long filenames (longer than
+ sizeof(struct inotify_event)); pommed could enter a busy-loop
+ when receiving an inotify event with
+ ie->len > sizeof(struct inotify_event)
+ + wpomme: added video switch support
+ + gpomme: added video switch support
+ + do not expect at least 3 evdevs at startup
+ + adds partial support for the new MacBook Santa Rosa (MacBook3)
+ + fixes bug with disappearing event devices after suspend
+ + external Apple USB keyboards are now supported
+ + beep on volume change per default
+ + rework the event management.
+ Use epoll() for event polling instead of poll().
+ + add secondary locations for the uinput device node.
+ + pommed: add a beeper feature as a substitute to the missing PC
+ Speaker. The feature is disabled by default, as not all
+ machines need it and not everybody wants it.
+- added gpomme.desktop and gpommerc to start gpomme via KDE
+- added %pre and %post scripts for pommed
+- use fdupes to save space
+- use /usr/bin/grandr for videoswitch option
+- added README.SuSE for applesmc kernel module
+- fix lang files so gpomme is tranlated
+
+-------------------------------------------------------------------
Old:
----
pommed-1.9.tar.bz2
pommed-build.diff
New:
----
gpomme.desktop
gpommerc
pommed-1.10-build.patch
pommed-1.14-dbus.patch
pommed-1.14.tar.bz2
pommed-README.SuSE
pommed-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pommed.spec ++++++
--- /var/tmp/diff_new_pack.Y32213/_old 2008-01-18 00:23:43.000000000 +0100
+++ /var/tmp/diff_new_pack.Y32213/_new 2008-01-18 00:23:43.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package pommed (Version 1.9)
+# spec file for package pommed (Version 1.14)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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.
#
@@ -11,19 +11,31 @@
# norootforbuild
Name: pommed
-Url: http://technologeek.org/projects/pommed/
-BuildRequires: alsa-devel audiofile-devel dbus-1-devel gtk2-devel libconfuse-devel libglade2-devel libsmbios-devel libsmbios-libs pciutils-devel update-desktop-files xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXpm-devel xorg-x11-util-devel
+Summary: Apple laptops hotkeys event handler
+License: GPL v2 only
Group: Hardware/Mobile
-Version: 1.9
+Version: 1.14
Release: 1
-License: GPL v2 only
-Summary: Apple laptops hotkeys event handler
-AutoReqProv: on
-Source0: pommed-1.9.tar.bz2
+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: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXpm-devel xorg-x11-util-devel
+BuildRequires: xorg-x11
+%if 0%{?suse_version} > 1020
+BuildRequires: fdupes
+%endif
+PreReq: %insserv_prereq %fillup_prereq
+Requires: eject xorg-x11
+Source0: %name-%version.tar.bz2
Source1: pommed.init
-Patch: pommed-build.diff
+Source2: gpomme.desktop
+Source3: gpommerc
+Source4: pommed-README.SuSE
+Source5: pommed-rpmlintrc
+Patch: pommed-1.10-build.patch
+Patch2: pommed-1.14-dbus.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: eject
+%define kdedir /opt/kde3
%description
pommed handles the hotkeys found on the Apple MacBook Pro, MacBook and
@@ -42,7 +54,7 @@
Julien BLACHE
%package -n gpomme
-Summary: graphical client for pommed
+Summary: Graphical client for pommed
Group: Hardware/Mobile
Requires: pommed
Requires: dbus-1
@@ -85,81 +97,137 @@
%prep
%setup
%patch
+%patch2 -p1
%build
-make
+## FIXME: make CFLAGS="$RPM_OPT_FLAGS" %{?jobs:-j%jobs}
+make %{?jobs:-j%jobs}
%install
-install -d $RPM_BUILD_ROOT/usr/bin
-install -d $RPM_BUILD_ROOT/usr/sbin
-install -d $RPM_BUILD_ROOT/etc/dbus-1/system.d
-install -d $RPM_BUILD_ROOT/etc/init.d
-install -d $RPM_BUILD_ROOT/usr/share/applications
-install -d $RPM_BUILD_ROOT/usr/share/icons
-install -d $RPM_BUILD_ROOT/usr/share/pixmaps
-install -d $RPM_BUILD_ROOT/usr/share/gpomme
-install -d $RPM_BUILD_ROOT/usr/share/locale
-install -d $RPM_BUILD_ROOT/usr/share/man/man1
-install -m 755 pommed/pommed $RPM_BUILD_ROOT/usr/sbin
+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}
+install -m 755 pommed/pommed %buildroot/%_sbindir
+install -m644 %{SOURCE4} README.SuSE
%ifarch ppc ppc64
-install -m 644 pommed.conf.pmac $RPM_BUILD_ROOT/etc/pommed.conf
+install -m 644 pommed.conf.pmac %buildroot/%_sysconfdir/pommed.conf
%else
-install -m 644 pommed.conf.mactel $RPM_BUILD_ROOT/etc/pommed.conf
+install -m 644 pommed.conf.mactel %buildroot/%_sysconfdir/pommed.conf
%endif
-install -m 644 dbus-policy.conf $RPM_BUILD_ROOT/etc/dbus-1/system.d/pommed.conf
-install -m 755 %{S:1} $RPM_BUILD_ROOT/etc/init.d/pommed
-ln -sf /etc/init.d/pommed $RPM_BUILD_ROOT/usr/sbin/rcpommed
-install -m 644 pommed.1 $RPM_BUILD_ROOT/usr/share/man/man1
+install -m 644 dbus-policy.conf %buildroot/%_sysconfdir/dbus-1/system.d/pommed.conf
+install -m 755 %{S:1} %buildroot/%_sysconfdir/init.d/pommed
+ln -sf %_sysconfdir/init.d/pommed %buildroot/%_sbindir/rcpommed
+install -m 644 pommed.1 %buildroot/%_mandir/man1
# gpomme
-install -m 755 gpomme/gpomme $RPM_BUILD_ROOT/usr/bin
-install -m 644 gpomme/gpomme.1 $RPM_BUILD_ROOT/usr/share/man/man1
-install -m 644 gpomme/*.desktop $RPM_BUILD_ROOT/usr/share/applications
-install -m 644 icons/gpomme* $RPM_BUILD_ROOT/usr/share/icons
-install -m 644 icons/gpomme_32x32.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/gpomme.xpm
-install -m 644 gpomme/gpomme.glade $RPM_BUILD_ROOT/usr/share/gpomme
-cp -a gpomme/themes $RPM_BUILD_ROOT/usr/share/gpomme
-rm -rfv $RPM_BUILD_ROOT/usr/share/gpomme/themes/src
+install -m 755 gpomme/gpomme %buildroot/%_bindir
+install -m 644 gpomme/gpomme.1 %buildroot/%_mandir/man1
+install -m 644 gpomme/*.desktop %buildroot/%_datadir/applications
+install -m 644 icons/gpomme* %buildroot/%_datadir/icons
+install -m 644 icons/gpomme_32x32.xpm %buildroot/%_datadir/pixmaps/gpomme.xpm
+install -m 644 gpomme/gpomme.glade %buildroot/%_datadir/gpomme
+cp -a gpomme/themes %buildroot/%_datadir/gpomme
+rm -rfv %buildroot/%_datadir/gpomme/themes/src
for mo in gpomme/po/*.mo ; do
lang=`basename $mo .mo`
- install -d $RPM_BUILD_ROOT/usr/share/locale/$lang/LC_MESSAGES
- install -m 644 $mo $RPM_BUILD_ROOT/usr/share/locale/$lang/LC_MESSAGES
+ filename="gpomme.mo"
+ 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
# wmpomme
-install -m 755 wmpomme/wmpomme $RPM_BUILD_ROOT/usr/bin
-install -m 644 wmpomme/wmpomme.1 $RPM_BUILD_ROOT/usr/share/man/man1
-install -m 644 icons/gpomme_32x32.xpm $RPM_BUILD_ROOT/usr/share/icons/wmpomme.xpm
-%suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/applications/gpomme-c.desktop
-%suse_update_desktop_file $RPM_BUILD_ROOT/usr/share/applications/gpomme.desktop
+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
+ln -s /usr/bin/grandr %buildroot/%_sysconfdir/pommed/videoswitch
+%if 0%{?suse_version} > 1020
+%fdupes -s %buildroot
+%endif
+%find_lang gpomme
+
+%post
+%{fillup_and_insserv -n %name %name}
+
+%preun
+%stop_on_removal %name
+
+%postun
+%restart_on_update %name
+%{insserv_cleanup}
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %buildroot
%files
%defattr(-,root,root)
-%doc AUTHORS README TODO
+%doc AUTHORS README TODO README.SuSE
%config(noreplace) /etc/pommed.conf
%config(noreplace) /etc/dbus-1/system.d/pommed.conf
-/etc/init.d/pommed
-/usr/sbin/pommed
-/usr/sbin/rcpommed
-/usr/share/man/man1/po*
+%_sysconfdir/init.d/pommed
+%dir %_sysconfdir/pommed
+%config(noreplace) %_sysconfdir/pommed/videoswitch
+%_sbindir/pommed
+%_sbindir/rcpommed
+%_mandir/man1/po*
-%files -n gpomme
+%files -n gpomme -f gpomme.lang
%defattr(-,root,root)
-/usr/bin/gpomme
-/usr/share/applications/*.desktop
-/usr/share/icons/gp*
-/usr/share/pixmaps/gp*
-/usr/share/gpomme
-/usr/share/locale/*/LC_MESSAGES/*
-/usr/share/man/man1/gpo*
+%_bindir/gpomme
+%_datadir/applications/*.desktop
+%_datadir/icons/gp*
+%_datadir/pixmaps/gp*
+%_datadir/gpomme
+%dir %{kdedir}
+%dir %{kdedir}/share
+%{kdedir}/share/autostart
+%{kdedir}/share/config
+%_mandir/man1/gpo*
%files -n wmpomme
%defattr(-,root,root)
-/usr/bin/wmpomme
-/usr/share/icons/wm*
-/usr/share/man/man1/wmpo*
+%_bindir/wmpomme
+%_datadir/icons/wm*
+%_mandir/man1/wmpo*
%changelog
-* Mon Sep 17 2007 - ro@suse.de
+* Thu Jan 17 2008 lrupp@suse.de
+- update to 1.14:
+ + fix error handling in the audio sample loading code to properly
+ report failure, preventing nasty segfaults later on in case the
+ sound file is not available.
+ + make goutte.wav the default beep sound, add click.wav and remove
+ the KDE beep sound.
+ + add an option to disable the beep on volume change
+ + add the videoSwitch DBus notification
+ + add support for LCD backlight control on the Intel 965GM
+ found in the MacBook3,1
+ + rework the inotify code to handle several events at once and to
+ handle events with long filenames (longer than
+ sizeof(struct inotify_event)); pommed could enter a busy-loop
+ when receiving an inotify event with
+ ie->len > sizeof(struct inotify_event)
+ + wpomme: added video switch support
+ + gpomme: added video switch support
+ + do not expect at least 3 evdevs at startup
+ + adds partial support for the new MacBook Santa Rosa (MacBook3)
+ + fixes bug with disappearing event devices after suspend
+ + external Apple USB keyboards are now supported
+ + beep on volume change per default
+ + rework the event management.
+ Use epoll() for event polling instead of poll().
+ + add secondary locations for the uinput device node.
+ + pommed: add a beeper feature as a substitute to the missing PC
+ Speaker. The feature is disabled by default, as not all
+ machines need it and not everybody wants it.
+- added gpomme.desktop and gpommerc to start gpomme via KDE
+- added %%pre and %%post scripts for pommed
+- use fdupes to save space
+- use /usr/bin/grandr for videoswitch option
+- added README.SuSE for applesmc kernel module
+- fix lang files so gpomme is tranlated
+* Mon Sep 17 2007 ro@suse.de
- created package from pommed (version 1.9)
++++++ pommed-1.10-build.patch ++++++
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)
++++++ pommed-1.14-dbus.patch ++++++
Index: pommed-1.14/pommed/Makefile
===================================================================
--- pommed-1.14.orig/pommed/Makefile
+++ pommed-1.14/pommed/Makefile
@@ -42,7 +42,7 @@ endif
else
-LDFLAGS = -lz -lsmbios $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
+LDFLAGS = -lz -lsmbios $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS) -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include
SOURCES = pommed.c cd_eject.c evdev.c conffile.c audio.c \
dbus.c power.c beep.c video.c \
++++++ pommed-1.9.tar.bz2 -> pommed-1.14.tar.bz2 ++++++
++++ 4665 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org