From 9fa68a9b31d65022c6989232a5e473b6259713acb58686a1e9dd1994cda04396 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 28 Jul 2007 14:10:23 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-bluetooth?expand=0&rev=7 --- dont-disable-deprecated.patch | 48 +++++++++++++++++++++++++++++++++++ gnome-bluetooth.changes | 5 ++++ gnome-bluetooth.spec | 12 ++++++--- 3 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 dont-disable-deprecated.patch diff --git a/dont-disable-deprecated.patch b/dont-disable-deprecated.patch new file mode 100644 index 0000000..312991f --- /dev/null +++ b/dont-disable-deprecated.patch @@ -0,0 +1,48 @@ +Index: gnome-bluetooth-0.8.0/libegg/libegg/Makefile.am +=================================================================== +--- gnome-bluetooth-0.8.0.orig/libegg/libegg/Makefile.am ++++ gnome-bluetooth-0.8.0/libegg/libegg/Makefile.am +@@ -3,10 +3,7 @@ SUBDIRS = util tray iconlist + + INCLUDES = \ + $(EGG_CFLAGS) \ +- -DEGG_COMPILATION \ +- -DGTK_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DG_DISABLE_DEPRECATED ++ -DEGG_COMPILATION + + ##noinst_LTLIBRARIES = libegg.la + +Index: gnome-bluetooth-0.8.0/libegg/libegg/iconlist/Makefile.am +=================================================================== +--- gnome-bluetooth-0.8.0.orig/libegg/libegg/iconlist/Makefile.am ++++ gnome-bluetooth-0.8.0/libegg/libegg/iconlist/Makefile.am +@@ -2,10 +2,7 @@ + INCLUDES = \ + $(EGG_CFLAGS) \ + -I$(top_srcdir)/libegg/util \ +- -DEGG_COMPILATION \ +- -DGTK_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DG_DISABLE_DEPRECATED ++ -DEGG_COMPILATION + + + noinst_LTLIBRARIES = libeggiconlist.la +Index: gnome-bluetooth-0.8.0/libegg/libegg/tray/Makefile.am +=================================================================== +--- gnome-bluetooth-0.8.0.orig/libegg/libegg/tray/Makefile.am ++++ gnome-bluetooth-0.8.0/libegg/libegg/tray/Makefile.am +@@ -2,10 +2,7 @@ + INCLUDES = \ + $(EGG_TRAY_CFLAGS) \ + -I$(top_srcdir)/libegg/util \ +- -DEGG_COMPILATION \ +- -DGTK_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DG_DISABLE_DEPRECATED ++ -DEGG_COMPILATION + + + noinst_LTLIBRARIES = libeggtray.la diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 3a75f4c..666e914 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 27 20:53:00 CEST 2007 - maw@suse.de + +- Add dont-disable-deprecated.patch. + ------------------------------------------------------------------- Wed May 23 14:23:03 CEST 2007 - prusnak@suse.cz diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 94942f5..e82cb19 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -12,19 +12,20 @@ Name: gnome-bluetooth BuildRequires: gob2 intltool libbtctl-devel libglade2-devel libgnomeui-devel libusb-devel perl-XML-Parser python-devel python-gtk-devel update-desktop-files -License: GNU General Public License (GPL) +License: GPL v2 or later Group: System/GUI/GNOME Requires: gnome-vfs2 python-gnome Version: 0.8.0 -Release: 71 +Release: 92 Summary: GNOME Bluetooth Support URL: http://usefulinc.com/software/gnome-bluetooth/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.8/%{name}-%{version}.tar.bz2 -Patch: %name-desktop.diff +Patch0: %name-desktop.diff Patch1: gnome-bluetooth-pixmapsdir.patch Patch2: gnome-bluetooth-transparent-trayicon.patch Patch3: gnome-bluetooth-fail-cleanly.patch +Patch4: dont-disable-deprecated.patch Autoreqprov: on %py_requires @@ -95,10 +96,11 @@ Authors: %prep %setup -q -%patch -p1 +%patch0 -p1 #%patch1 -p0 %patch2 -p0 #%patch3 -p0 +%patch4 -p1 rm -f libegg/aclocal.m4 aclocal.m4 %build @@ -156,6 +158,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Fri Jul 27 2007 - maw@suse.de +- Add dont-disable-deprecated.patch. * Wed May 23 2007 - prusnak@suse.cz - added libusb-devel to BuildRequires - added libopenssl-devel to Requires of devel subpackage