rpms/gnome-bluetooth
7
0
Fork 0
Code Issues Pull Requests Releases Activity

rebuild against new libnotify

Browse Source
This commit is contained in:
Matthias Clasen 2010-11-03 12:18:38 -04:00
parent a41e0a342d
commit fa10c2ae09
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gnome-bluetooth.spec
View File

@ -1,7 +1,7 @@
Name: gnome-bluetooth
Epoch: 1
Version: 2.90.0
Release: 9%{?dist}
Release: 10%{?dist}
Summary: Bluetooth graphical utilities
Group: Applications/Communications
@ -42,6 +42,7 @@ Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
Patch0: gtk-build-fixes.patch
Patch1: notify.patch
%description
The gnome-bluetooth package contains graphical utilities to setup,
@ -82,13 +83,13 @@ This package contains the Moblin user interface for gnome-bluetooth.
%prep
%setup -q
%patch0 -p1 -b .gtk-fixes
%patch1 -p1 -b .notify
%build
%configure --disable-desktop-update --disable-icon-update --enable-nautilus-sendto=yes --disable-schemas-compile
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT
@ -115,25 +116,6 @@ install -m0644 -D %{SOURCE1} $RPM_BUILD_ROOT/lib/udev/rules.d/61-gnome-bluetooth
%find_lang %{name} --with-gnome
cat %{name}.lang >> gnome-bluetooth2.lang
# save space by linking identical images in translated docs
helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
for f in $helpdir/C/figures/*.png; do
b="$(basename $f)"
for d in $helpdir/*; do
if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
g="$d/figures/$b"
if [ -f "$g" ]; then
if cmp -s $f $g; then
rm "$g"; ln -s "../../C/figures/$b" "$g"
fi
fi
fi
done
done
%clean
rm -rf $RPM_BUILD_ROOT
%post
update-desktop-database -q
@ -231,6 +213,9 @@ fi
%{_datadir}/mutter-moblin/panels/bluetooth-panel.desktop
%changelog
* Wed Nov 3 2010 Matthias Clasen <mclasen@redhat.com> 1:2.90.0-10
- Rebuild against libnotify 0.7.0
* Wed Sep 29 2010 jkeating - 1:2.90.0-9
- Rebuilt for gcc bug 634757

12
notify.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up gnome-bluetooth-2.90.0/applet/notify.c.notify gnome-bluetooth-2.90.0/applet/notify.c
--- gnome-bluetooth-2.90.0/applet/notify.c.notify 2010-11-03 12:18:00.481241996 -0400
+++ gnome-bluetooth-2.90.0/applet/notify.c 2010-11-03 12:17:25.248241997 -0400
@@ -75,7 +75,7 @@ void show_notification(const gchar *summ
notify_notification_close(notify, NULL);
}
- notify = notify_notification_new(summary, message, ACTIVE_ICON_NAME, NULL);
+ notify = notify_notification_new(summary, message, ACTIVE_ICON_NAME);
notify_notification_set_timeout(notify, timeout);