SHA256
1
0
forked from pool/pommed

Accepting request 72512 from home:namtrac:branches:Base:System

Version bump to 1.39, complete changelog in the changes file.

OBS-URL: https://build.opensuse.org/request/show/72512
OBS-URL: https://build.opensuse.org/package/show/Base:System/pommed?expand=0&rev=12
This commit is contained in:
Cristian Rodríguez 2011-06-03 01:49:01 +00:00 committed by Git OBS Bridge
parent 8420719267
commit a61568aaec
10 changed files with 200 additions and 171 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:12b43226fda1d74051d409f1fddfccecc6775772ca1fe1609979caffa18df63b
size 954025

36
pommed-1.38-cflags.patch Normal file
View File

@ -0,0 +1,36 @@
diff -ur pommed-1.38/gpomme/Makefile pommed-1.38-cflags/gpomme/Makefile
--- pommed-1.38/gpomme/Makefile 2011-03-19 12:29:10.000000000 +0100
+++ pommed-1.38-cflags/gpomme/Makefile 2011-05-07 13:32:38.161008653 +0200
@@ -14,7 +14,7 @@
INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS)
+CFLAGS = -g $(RPM_OPT_FLAGS) -Wall $(DBUS_CFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS)
LDLIBS = -lpthread -lX11 $(DBUS_LIBS) $(DBUSGLIB_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS)
SOURCES = gpomme.c theme.c conffile.c \
diff -ur pommed-1.38/pommed/Makefile pommed-1.38-cflags/pommed/Makefile
--- pommed-1.38/pommed/Makefile 2011-03-19 12:29:10.000000000 +0100
+++ pommed-1.38-cflags/pommed/Makefile 2011-05-07 13:32:15.185008654 +0200
@@ -18,7 +18,7 @@
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) $(TIMERFD_CFLAGS)
+CFLAGS = -g $(RPM_OPT_FLAGS) -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS) $(TIMERFD_CFLAGS)
LDLIBS = -pthread -lrt $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
diff -ur pommed-1.38/wmpomme/Makefile pommed-1.38-cflags/wmpomme/Makefile
--- pommed-1.38/wmpomme/Makefile 2011-03-19 12:29:10.000000000 +0100
+++ pommed-1.38-cflags/wmpomme/Makefile 2011-05-07 13:32:27.441008654 +0200
@@ -5,7 +5,7 @@
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 $(RPM_OPT_FLAGS) -Wall $(DBUS_CFLAGS) $(TIMERFD_CFLAGS)
LDLIBS = -lrt -lXpm -lXext -lX11 $(DBUS_LIBS)
SOURCES = wmgeneral.c wmpomme.c \

View File

@ -0,0 +1,12 @@
--- pommed-1.38/pommed/Makefile 2011-03-19 12:29:10.000000000 +0100
+++ pommed-1.38-pci/pommed/Makefile 2011-05-07 13:36:21.449008670 +0200
@@ -55,8 +55,7 @@
CFLAGS += $(LIBPCI_CFLAGS)
LDLIBS += $(LIBPCI_LIBS)
else
- LIB_OBJS += /usr/lib/libpci.a
- LDLIBS += -lz
+ LDLIBS += -lpci -ldbus-1 -lz
endif
LDLIBS += $(LIB_OBJS)

3
pommed-1.39.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b67b2d335a26c699a8b023aa662f8583eef8463cda73630f5a6ce11105e9a4e4
size 976585

View File

@ -1,19 +0,0 @@
Hi
Please don't forgett to load the applesmc kernel module during
start, if you want to enable your MacBook backlight keys.
Edit the file "/etc/sysconfig/kernel" and add "applesmc" to the
line MODULES_LOADED_ON_BOOT:
MODULES_LOADED_ON_BOOT="applesmc"
After a restart, your backlight keys should work.
You can also load this module manually as root with the command:
modprobe applesmc
to check if everything works as expected. (Have a look into the
logfile /var/log/messages for this.)
Have a lot of fun!

View File

@ -1,13 +0,0 @@
Index: pommed/Makefile
===================================================================
--- pommed/Makefile.orig
+++ pommed/Makefile
@@ -53,7 +53,7 @@ ifeq ($(LIBPCI_SHARED), true)
CFLAGS += $(LIBPCI_CFLAGS)
LDFLAGS += $(LIBPCI_LIBS)
else
- LIBS = /usr/lib/libpci.a
+ LIBS = -lpci -ldbus-1
LDFLAGS += -lz
endif

View File

@ -1,35 +0,0 @@
Index: gpomme/Makefile
================================================================================
--- gpomme/Makefile
+++ 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) $(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 \
--- pommed/Makefile
+++ pommed/Makefile
@@ -18,7 +18,7 @@
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) $(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)
--- wmpomme/Makefile
+++ wmpomme/Makefile
@@ -5,7 +5,7 @@
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 \

View File

@ -1,3 +1,61 @@
-------------------------------------------------------------------
Thu Jun 2 11:48:57 UTC 2011 - idonmez@novell.com
- Update to version 1.39 to fix kernel 2.6.39 compatibility
-------------------------------------------------------------------
Sat May 7 11:22:07 UTC 2011 - idoenmez@novell.com
- pommed.init: Remove 4 from default start per rpmlint warning
- Re-enable as-needed support now that it works
- Update to version 1.38
- Changes:
version 1.38:
- pommed: add support for the Early 2011 MacBook Pro:
MacBookPro8,1 (13"), MacBookPro8,2 (15"), MacBookPro8,3 (17").
- pommed: add acpi_video0 as a possible sysfs backlight driver.
- pommed: allow disabling audio support entirely.
version 1.37:
- pommed: fix oversight in applesmc probing change.
- pommed: prefer nvidia_bl over Nouveau.
- pommed: add new option to fade keyboard backlight instead of
switching off when idle. From Alex Launi <alex.launi@canonical.com>.
version 1.36:
- pommed: probe for applesmc through /sys/class/hwmon.
- pommed: add support for the MacBook7,1 (April 2010).
- all: use LDLIBS instead of adding libraries to LDFLAGS.
- pommed: fix keyboard backlight fading on pmac.
- pommed: lock/unlock auto kbd backlight using up/down keys.
- pommed: add ADB product IDs for ANSI and JIS keyboard variants.
version 1.35:
- pommed: fix crash if no fnmode sysfs node found.
- pommed: add support for the MacBookAir3,1 & 3,2 (October 2010).
version 1.34:
- pommed: be more careful when invoking eject (Alioth #312213).
- pommed: add the nouveau sysfs backlight driver.
version 1.33:
- pommed: added support for the MacBook6,1 (October 2009).
- pommed: added support for the MacBookPro6,1 & 6,2 (Core i5/i7,
April 2010).
- pommed: kill PCI device check in nv8600mgt.
- pommed: added support for the MacBookPro7,1 (13", Core2 Duo,
April 2010). Requires a patched nvidia-bl module for backlight
support at the moment.
- gpomme: replaced Glade with hardcoded GTK+ code.
version 1.32:
- pommed: add the rivabl sysfs backlight driver for older 12"
PowerBook G4 laptops. Reported by Nic Boet.
version 1.31:
- pommed: add IDs for newer wireless keyboard.
- pommed: add the MacBookPro5,4 (15" June 2009).
-------------------------------------------------------------------
Sun Oct 31 12:37:02 UTC 2010 - jengelh@medozas.de

View File

@ -4,7 +4,7 @@
# Provides: pommed
# Required-Start: $remote_fs
# Required-Stop: $remote_fs
# Default-Start: 2 3 4 5
# Default-Start: 2 3 5
# Default-Stop: 0 1 6
# Short-Description: pommed daemon providing macbook backlight control
# Description: Start pommed to allow control over backlight on macbook

View File

@ -1,7 +1,7 @@
#
# spec file for package pommed (Version 1.30)
# spec file for package pommed
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,39 +15,53 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: pommed
Version: 1.39
Release: 0
License: GPLv2
Summary: Apple laptops hotkeys event handler
License: GPL v2 only
Group: Hardware/Mobile
Version: 1.30
Release: 2
Url: http://technologeek.org/projects/pommed/
Group: Hardware/Mobile
%if 0
# BuildRequires some package containing /usr/include/ofapi/of_api.h
ExclusiveArch: ppc
ExclusiveArch: ppc
%endif
BuildRequires: alsa-devel
BuildRequires: audiofile-devel
BuildRequires: libconfuse-devel
BuildRequires: pciutils-devel
BuildRequires: update-desktop-files
BuildRequires: xorg-x11
BuildRequires: xorg-x11-libX11-devel
BuildRequires: xorg-x11-libXext-devel
BuildRequires: xorg-x11-libXpm-devel
BuildRequires: xorg-x11-util-devel
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(libglade-2.0)
ExclusiveArch: %ix86 x86_64
BuildRequires: alsa-devel audiofile-devel gtk2-devel libglade2-devel pciutils-devel update-desktop-files
BuildRequires: xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXpm-devel xorg-x11-util-devel
BuildRequires: dbus-1-glib-devel libconfuse-devel xorg-x11
%if 0%{?suse_version} > 1020
BuildRequires: fdupes
%endif
PreReq: %insserv_prereq %fillup_prereq
Requires: eject xorg-x11
Source0: %name-%version.tar.bz2
Source0: %{name}-%{version}.tar.bz2
Source1: pommed.init
Source2: gpomme.desktop
Source3: gpommerc
Source4: pommed-README.SuSE
Source5: pommed-rpmlintrc
Source4: pommed-rpmlintrc
# PATCH-FIX-UPSTREAM pommed-desktop.patch idoenmez@suse.de -- Update desktop categories
Patch1: pommed-desktop.patch
Patch2: pommed-hardcoded_libpci.patch
Patch3: pommed-optflags.patch
# PATCH-FIX-OPENSUSE pommed-1.38-cflags.patch idoenmez@suse.de -- Respect our cflags
Patch2: pommed-1.38-cflags.patch
# PATCH-FIX-OPENSUSE pommed-1.38-hardcoded-libpci.patch idoenmez@suse.de -- Remove hardcoded static pci library
Patch3: pommed-1.38-hardcoded-libpci.patch
# PATCH-FIX-UPSTREAM pommed-dbus_policy.patch ro@novell.com -- bnc#469771
Patch4: pommed-dbus_policy.patch
PreReq: %fillup_prereq
PreReq: %insserv_prereq
Requires: eject
Requires: xorg-x11
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -60,18 +74,12 @@ up the keyboard backlight on the MacBook Pro and PowerBook.
Optional support for the Apple Remote control is available.
Authors:
--------
Julien BLACHE <jb@jblache.org>
%package -n gpomme
License: GPL v2 only
License: GPLv2
Summary: Graphical client for pommed
Group: Hardware/Mobile
Requires: pommed
Requires: dbus-1
Requires: pommed
%description -n gpomme
pommed handles the hotkeys found on the Apple MacBook Pro, MacBook and
@ -82,18 +90,12 @@ gpomme is a graphical client for pommed. It listens for signals sent by
pommed on DBus and displays the action taken by pommed along with the
current state associated to this action.
Authors:
--------
Julien BLACHE <jb@jblache.org>
%package -n wmpomme
License: GPL v2 only
License: GPLv2
Summary: WindowMaker dockapp client for pommed
Group: Hardware/Mobile
Requires: pommed
Requires: dbus-1
Requires: pommed
%description -n wmpomme
pommed handles the hotkeys found on the Apple MacBook Pro, MacBook and
@ -103,111 +105,99 @@ backlight or ejects the CD-ROM drive accordingly.
wmpomme is a dockapp client for pommed. It displays the current level
of each item controlled by pommed.
Authors:
--------
Julien BLACHE <jb@jblache.org>
%prep
%setup -q
%patch1
%patch2
%patch3
%patch2 -p1
%patch3 -p1
%patch4
%build
# This package failed when testing with -Wl,-as-needed being default.
# So we disable it here, if you want to retest, just delete this comment and the line below.
export SUSE_ASNEEDED=0
export CFLAGS="$RPM_OPT_FLAGS"
make %{?_smp_mflags}
%install
mkdir -p %buildroot/%_bindir %buildroot/%_sbindir %buildroot/%_sysconfdir/{init.d,dbus-1/system.d}
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
mkdir -p %{buildroot}/%{_bindir} %{buildroot}/%{_sbindir} %{buildroot}/%{_sysconfdir}/{init.d,dbus-1/system.d}
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}
%ifarch ppc ppc64
install -m 644 pommed.conf.pmac %buildroot/%_sysconfdir/pommed.conf
install -m 644 pommed.conf.pmac %{buildroot}/%{_sysconfdir}/pommed.conf
%else
install -m 644 pommed.conf.mactel %buildroot/%_sysconfdir/pommed.conf
install -m 644 pommed.conf.mactel %{buildroot}/%{_sysconfdir}/pommed.conf
%endif
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
install -m 644 dbus-policy.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/pommed.conf
install -m 755 %{SOURCE1} %{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 %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
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
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`
filename="gpomme.mo"
install -d %buildroot/%_datadir/locale/$lang/LC_MESSAGES
install -m 644 $mo %buildroot/%_datadir/locale/$lang/LC_MESSAGES/$filename
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/%_datadir/autostart
install -m 644 %{S:3} %buildroot/%_datadir/kde4/config
install -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/autostart
install -m 644 %{SOURCE3} %{buildroot}/%{_datadir}/kde4/config
# wmpomme
install -m 755 wmpomme/wmpomme %buildroot/%_bindir
install -m 644 wmpomme/wmpomme.1 %buildroot/%_mandir/man1
%suse_update_desktop_file %buildroot/%_datadir/applications/gpomme-c.desktop
%suse_update_desktop_file %buildroot/%_datadir/applications/gpomme.desktop
install -m 755 wmpomme/wmpomme %{buildroot}/%{_bindir}
install -m 644 wmpomme/wmpomme.1 %{buildroot}/%{_mandir}/man1
%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
mkdir -p %{buildroot}/%{_sysconfdir}/pommed
%if 0%{?suse_version} > 1020
%fdupes -s %buildroot
%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
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
%{fillup_and_insserv -n %name %name}
%{fillup_and_insserv -n %{name} %{name}}
%preun
%stop_on_removal %name
%stop_on_removal %{name}
%postun
%restart_on_update %name
%restart_on_update %{name}
%{insserv_cleanup}
%clean
rm -rf %buildroot
rm -rf %{buildroot}
%files
%defattr(-,root,root)
%doc AUTHORS README TODO README.SuSE
%config(noreplace) /etc/pommed.conf
%config(noreplace) /etc/dbus-1/system.d/pommed.conf
%_sysconfdir/init.d/pommed
%_sbindir/pommed
%_sbindir/rcpommed
%_mandir/man1/po*
%doc AUTHORS README TODO
%config(noreplace) %{_sysconfdir}/pommed.conf
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/pommed.conf
%{_sysconfdir}/init.d/pommed
%{_sbindir}/pommed
%{_sbindir}/rcpommed
%{_mandir}/man1/po*
%files -n gpomme -f gpomme.lang
%defattr(-,root,root)
%_bindir/gpomme
%_datadir/applications/*.desktop
%_datadir/icons/gp*
%_datadir/pixmaps/gp*
%_datadir/gpomme
%_datadir/autostart
%dir %_datadir/kde4
%_datadir/kde4/config
%_mandir/man1/gpo*
%{_bindir}/gpomme
%{_datadir}/applications/*.desktop
%{_datadir}/icons/gp*
%{_datadir}/pixmaps/gp*
%{_datadir}/gpomme
%{_datadir}/autostart
%dir %{_datadir}/kde4
%{_datadir}/kde4/config
%{_mandir}/man1/gpo*
%files -n wmpomme
%defattr(-,root,root)
%_bindir/wmpomme
%_datadir/icons/wm*
%_mandir/man1/wmpo*
%{_bindir}/wmpomme
%{_datadir}/icons/wm*
%{_mandir}/man1/wmpo*
%changelog