rpms/libbtctl/devel libbtctl-0.8.0-crash.patch, NONE, 1.1 libbtctl.spec, 1.45, 1.46 libbtctl-0.6.0-crash.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/libbtctl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28833

Modified Files:
	libbtctl.spec 
Added Files:
	libbtctl-0.8.0-crash.patch 
Removed Files:
	libbtctl-0.6.0-crash.patch 
Log Message:
- specfile review
- portet crash patch to 0.8.2


libbtctl-0.8.0-crash.patch:
 btctl.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libbtctl-0.8.0-crash.patch ---
--- libbtctl-0.8.2/src/btctl.c.crash	2007-02-28 14:25:52.000000000 +0100
+++ libbtctl-0.8.2/src/btctl.c	2007-02-28 14:25:55.000000000 +0100
@@ -55,7 +55,9 @@
 
 static gint btctl_controller_signals[LAST_SIGNAL] = { 0 } ;
 
+#define g_intern_static_string(s) s
 G_DEFINE_TYPE(BtctlController, btctl_controller, G_TYPE_OBJECT)
+#undef g_intern_static_string
 
 static void btctl_set_property(GObject      *object,
 			       guint         prop_id,
@@ -163,7 +165,7 @@
 {
   static GQuark quark = 0;
   if (quark == 0)
-    quark = g_quark_from_static_string ("btctl-error-quark");
+    quark = g_quark_from_string ("btctl-error-quark");
   return quark;
 }
 


Index: libbtctl.spec
===================================================================
RCS file: /cvs/dist/rpms/libbtctl/devel/libbtctl.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- libbtctl.spec	7 Dec 2006 19:04:21 -0000	1.45
+++ libbtctl.spec	28 Feb 2007 13:36:10 -0000	1.46
@@ -8,13 +8,13 @@
 Summary: Library for the GNOME Bluetooth Subsystem
 Name: libbtctl
 Version: 0.8.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Libraries
-URL: http://usefulinc.com/software/gnome-bluetooth 
-Source: http://usefulinc.com/software/gnome-bluetooth/releases/%{name}-%{version}.tar.bz2
+URL: http://live.gnome.org/GnomeBluetooth 
+Source: http://ftp.gnome.org/pub/gnome/sources/libbtctl/0.8/%{name}-%{version}.tar.bz2
 
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf >= 0:2.57, bluez-libs-devel, glib2-devel, gtk-doc
 BuildRequires: openobex-devel >= 0:1.1, pygtk2-devel, gtk2-devel
 BuildRequires: python, python-devel, gettext, automake, libtool, intltool
@@ -25,14 +25,14 @@
 
 Patch1: libbtctl-0.6.0-libdir.patch
 Patch2: libbtctl-0.4.1-pydir.patch
-Patch3: libbtctl-0.6.0-crash.patch
+Patch3: libbtctl-0.8.0-crash.patch
 Patch4: libbtctl-0.6.0-print.patch
 
 %description
 Library for the GNOME Bluetooth Subsystem
 
 %package devel
-Summary: Development files for libbtctl.
+Summary: Development files for libbtctl
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: glib2-devel
@@ -43,12 +43,10 @@
 
 
 %prep
-rm -rf $RPM_BUILD_ROOT
-
 %setup -q
 %patch1 -p1 -b .libdir
 %patch2 -p1 -b .pydir
-#%patch3 -p1 -b .crash
+%patch3 -p1 -b .crash
 %patch4 -p1 -b .print
 aclocal
 automake -a
@@ -62,11 +60,14 @@
 %else
 	--disable-mono
 %endif
-make
+
+# %%{?_smp_mflags} does not work
+make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
+
 # we do not want .la files
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/python?.?/site-packages/*.a
@@ -95,6 +96,7 @@
 
 %files devel
 %defattr(-, root, root)
+%doc COPYING
 %{_libdir}/lib*.so
 %{_libdir}/lib*.a
 %{_libdir}/pkgconfig/libbtctl.pc
@@ -105,10 +107,14 @@
 %endif
 
 %changelog
-* Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 0.8.2-2
+* Wed Feb 28 2007 Harald Hoyer <harald at redhat.com> - 0.8.2-3%{?dist}
+- specfile review
+- portet crash patch to 0.8.2
+
+* Thu Dec  7 2006 Jeremy Katz <katzj at redhat.com> - 0.8.2-2%{?dist}
 - rebuild for python 2.5
 
-* Mon Nov 13 2006 Harald Hoyer <harald at redhat.com> - 0.8.2-1%{dist}
+* Mon Nov 13 2006 Harald Hoyer <harald at redhat.com> - 0.8.2-1%{?dist}
 - version 0.8.2
 - Resolves: rhbz#215230
 


--- libbtctl-0.6.0-crash.patch DELETED ---