rpms/gnome-bluetooth/devel .cvsignore, 1.10, 1.11 gnome-bluetooth.spec, 1.61, 1.62 sources, 1.11, 1.12

Bastien Nocera hadess at fedoraproject.org
Wed Mar 4 23:11:50 UTC 2009 

Author: hadess

Update of /cvs/pkgs/rpms/gnome-bluetooth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21031

Modified Files:
	.cvsignore gnome-bluetooth.spec sources 
Log Message:
* Wed Mar 04 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.1-2
- Update to 2.27.1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	19 Feb 2009 17:10:52 -0000	1.10
+++ .cvsignore	4 Mar 2009 23:11:19 -0000	1.11
@@ -1 +1 @@
-gnome-bluetooth-0.12.0.tar.bz2
+gnome-bluetooth-2.27.1.tar.bz2


Index: gnome-bluetooth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/gnome-bluetooth.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- gnome-bluetooth.spec	24 Feb 2009 22:44:45 -0000	1.61
+++ gnome-bluetooth.spec	4 Mar 2009 23:11:19 -0000	1.62
@@ -1,79 +1,98 @@
-Summary: GNOME Bluetooth Subsystem
-Name: gnome-bluetooth
-Version: 0.12.0
-Release: 2%{?dist}
-License: GPLv2 and LGPLv2+
-Group: System Environment/Libraries
-URL: http://live.gnome.org/GnomeBluetooth
-Source: http://download.gnome.org/sources/gnome-bluetooth/0.11/%{name}-%{version}.tar.bz2
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf >= 2.57 bluez-libs-devel >= 2.8 bluez-utils 
-BuildRequires: libgnomeui-devel >= 2.2 libbonobo-devel >= 2.0
-BuildRequires: GConf2-devel >= 2.0 librsvg2-devel
-BuildRequires: libbtctl-devel >= 0.9.0
-BuildRequires: gob2 openobex-devel >= 1.0.1
-BuildRequires: pygtk2-devel python-devel
-BuildRequires: intltool automake libtool gettext
-Requires: %{name}-libs = %{version}-%{release}
-Requires(pre): GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
-Requires: bluez-utils
-ExcludeArch: s390 s390x
+Name:		gnome-bluetooth
+Version:	2.27.1
+Release:	1%{?dist}
+Summary:	Bluetooth graphical utilities
+
+Group:		Applications/Communications
+License:	GPLv2+
+URL:		http://live.gnome.org/GnomeBluetooth
+Source0:	http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+BuildRequires:	gtk2-devel
+BuildRequires:	GConf2-devel
+BuildRequires:	dbus-glib-devel
+BuildRequires:	hal-devel
+BuildRequires:	unique-devel
+BuildRequires:	libnotify-devel
+
+BuildRequires:	perl-XML-Parser intltool desktop-file-utils gettext gtk-doc
+
+Obsoletes:	bluez-pin
+Provides:	dbus-bluez-pin-helper
+Conflicts:	bluez-gnome
+Obsoletes:	bluez-gnome
+
+Requires:	gvfs-obexftp
+Requires:	bluez
+Requires:	obexd
+Requires:	notification-daemon
+
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
 %description
-This package contains a library with widgets for Bluetooth applications.
+The gnome-bluetooth package contains graphical utilities to setup,
+monitor and use Bluetooth devices.
 
 %package libs
-Summary: Libraries for applications, which use gnome-bluetooth
-Group: Development/Libraries
+Summary:	GTK+ Bluetooth device selection widgets
+Group:		System Environment/Libraries
+License:	LGPLv2+
+Requires:	%{name} = %{version}-%{release}
 
 %description libs
-This package contains the libraries for applications, 
-which use gnome-bluetooth.
+This package contains libraries needed for applications that
+want to display a Bluetooth device selection widget.
 
-%package devel
-Summary: Files for the development of applications, which use gnome-bluetooth
-Group: Development/Libraries
-Requires: %{name}-libs = %{version}-%{release}
-Requires: glib2-devel
-Requires: libbtctl-devel
-
-%description devel
-This package contains the files for the development of applications,
-which will use gnome-bluetooth.
+%package libs-devel
+Summary:	Development files for %{name}-libs
+Group:		Development/Libraries
+License:	LGPLv2+
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	gtk-doc
+
+%description libs-devel
+This package contains the libraries amd header files that are needed
+for writing applications that require a Bluetooth device selection widget.
 
 %prep
-%setup -q
+%setup -q -n gnome-bluetooth-%{version}
+
 
 %build
-%configure
+%configure --disable-desktop-update --disable-icon-update
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-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}/python2.5/site-packages/gnomebt/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-vfs-2.0/modules/libbluetooth.*a
-
-# rename the icon file
-mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/blueradio-48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/blueradio.png
-
-# Python's .m4 sucks
-if [ $RPM_BUILD_ROOT/usr/lib/ != $RPM_BUILD_ROOT%{_libdir}/ ] ; then
-	mv $RPM_BUILD_ROOT/usr/lib/* $RPM_BUILD_ROOT%{_libdir}/
-	rmdir $RPM_BUILD_ROOT/usr/lib
-fi
+make install DESTDIR=$RPM_BUILD_ROOT
 
-%find_lang %{name}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgnome-bluetooth.la
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+desktop-file-install --vendor=""				\
+	--delete-original					\
+	--dir=$RPM_BUILD_ROOT%{_datadir}/applications		\
+	$RPM_BUILD_ROOT%{_datadir}/applications/bluetooth-properties.desktop
+
+desktop-file-install --vendor=""				\
+	--delete-original					\
+	--dir=$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/	\
+	$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
+
+%find_lang gnome-bluetooth2
+
+%post
+update-desktop-database -q
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule					\
+        %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas		\
+	>& /dev/null || :
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -82,12 +101,13 @@
       gconftool-2 --makefile-uninstall-rule \
         %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas >/dev/null || :
     fi
+    if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then
+      gconftool-2 --makefile-uninstall-rule 				\
+        %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas		\
+	>& /dev/null || :
+    fi
 fi
 
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -95,33 +115,50 @@
       gconftool-2 --makefile-uninstall-rule \
         %{_sysconfdir}/gconf/schemas/gnome-obex-server.schemas > /dev/null || :
     fi
+    if [ -f %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas ] ; then
+      gconftool-2 --makefile-uninstall-rule 				\
+        %{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas		\
+	>& /dev/null || :
+    fi
+fi
+
+%postun
+update-desktop-database -q
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
-%files -f %{name}.lang
-%defattr(-, root, root)
-#GPLv2
-%doc AUTHORS COPYING ChangeLog NEWS README 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%files -f gnome-bluetooth2.lang
+%defattr(-,root,root,-)
+%doc README NEWS COPYING
+%{_sysconfdir}/gconf/schemas/bluetooth-manager.schemas
+%{_sysconfdir}/xdg/autostart/bluetooth-applet.desktop
+%{_bindir}/bluetooth-*
+%{_datadir}/applications/*.desktop
 %{_datadir}/gnome-bluetooth/
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/*/apps/*
+%{_mandir}/man1/*
 
 %files libs
-%defattr(-, root, root)
-#GPLv2
-%doc AUTHORS COPYING ChangeLog NEWS README 
-%{_libdir}/python*.*/site-packages/gnomebt/
-#LGPLv2+
-%{_libdir}/libgnomebt.so.*
-
-%files devel
-%defattr(-, root, root)
-#GPLv2
-%doc COPYING
-%{_libdir}/pkgconfig/gnome-bluetooth.pc
-%{_includedir}/gnome-bluetooth/
-#LGPLv2+
-%{_libdir}/libgnomebt.so
+%defattr(-,root,root,-)
+%doc COPYING.LIB
+%{_libdir}/libgnome-bluetooth.so.*
+
+%files libs-devel
+%defattr(-,root,root,-)
+%{_includedir}/gnome-bluetooth/*.h
+%{_libdir}/libgnome-bluetooth.so
+%{_libdir}/pkgconfig/gnome-bluetooth-1.0.pc
+%{_datadir}/gtk-doc/html/gnome-bluetooth/
 
 %changelog
+* Wed Mar 04 2009 - Bastien Nocera <bnocera at redhat.com> - 2.27.1-2
+- Update to 2.27.1
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-bluetooth/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	19 Feb 2009 17:10:52 -0000	1.11
+++ sources	4 Mar 2009 23:11:19 -0000	1.12
@@ -1 +1 @@
-881a01ce964b8c02b5d40be8b5aedcaf  gnome-bluetooth-0.12.0.tar.bz2
+4a7c977086af47fe43ea08b29ab93503  gnome-bluetooth-2.27.1.tar.bz2

More information about the fedora-extras-commits mailing list