rpms/gupnp-tools/F-9 gupnp-tools-0.6.1-gthreadinit.patch, NONE, 1.1 gupnp-tools.spec, NONE, 1.1 sources, 1.1, 1.2

[Peter Robinson]

Author: pbrobinson

Update of /cvs/pkgs/rpms/gupnp-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25722

Modified Files:
	sources 
Added Files:
	gupnp-tools-0.6.1-gthreadinit.patch gupnp-tools.spec 
Log Message:
- Initial F-9 build


gupnp-tools-0.6.1-gthreadinit.patch:

--- NEW FILE gupnp-tools-0.6.1-gthreadinit.patch ---
--- gupnp-tools-0.6.1/src/universal-cp/gui.c~	2008-02-22 22:37:07.000000000 +0100
+++ gupnp-tools-0.6.1/src/universal-cp/gui.c	2008-10-11 15:19:07.000000000 +0200
@@ -102,7 +102,7 @@
 
         gtk_init (argc, argv);
         glade_init ();
-        g_thread_init (NULL);
+        if (!g_thread_supported ()) g_thread_init (NULL);
 
         glade_xml = glade_xml_new (GLADE_FILE, NULL, NULL);
         if (glade_xml == NULL) {
--- gupnp-tools-0.6.1/src/av-cp/gui.c~	2008-01-29 16:37:45.000000000 +0100
+++ gupnp-tools-0.6.1/src/av-cp/gui.c	2008-10-11 15:19:23.000000000 +0200
@@ -83,7 +83,7 @@
 
         gtk_init (argc, argv);
         glade_init ();
-        g_thread_init (NULL);
+        if (!g_thread_supported ()) g_thread_init (NULL);
 
         glade_xml = glade_xml_new (GLADE_FILE, NULL, NULL);
         if (glade_xml == NULL) {
--- gupnp-tools-0.6.1/src/network-light/upnp.c~	2008-09-22 18:25:18.000000000 +0200
+++ gupnp-tools-0.6.1/src/network-light/upnp.c	2008-10-11 15:19:14.000000000 +0200
@@ -561,7 +561,7 @@
 {
         GError *error;
 
-        g_thread_init (NULL);
+        if (!g_thread_supported ()) g_thread_init (NULL);
 
         error = NULL;
         context = gupnp_context_new (NULL, NULL, 0, &error);


--- NEW FILE gupnp-tools.spec ---
Name:           gupnp-tools
Version:        0.6.1
Release:        2%{?dist}
Summary:        GUPnP-tools is a collection of dev tools utilising GUPnP and GTK+

Group:          System Environment/Libraries
License:        GPLv2+
URL:            http://www.gupnp.org/
Source0:        http://www.gupnp.org/sources/%{name}/%{name}-%{version}.tar.gz
Patch0:		gupnp-tools-0.6.1-gthreadinit.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gupnp-devel
BuildRequires: gupnp-av-devel
BuildRequires: gssdp-devel
BuildRequires: gtk2-devel
BuildRequires: libglade2-devel
BuildRequires: libsoup-devel
BuildRequires: e2fsprogs-devel
BuildRequires: gnome-icon-theme
BuildRequires: desktop-file-utils

%description
GUPnP is an object-oriented open source framework for creating UPnP 
devices and control points, written in C using GObject and libsoup. 
The GUPnP API is intended to be easy to use, efficient and flexible. 

GUPnP-tools is a collection of developer tools utilising GUPnP and GTK+. 
It features a universal control point application as well as a sample 
DimmableLight v1.0 implementation. 

%prep
%setup -q
%patch0 -p1 -b .gthreadinit

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor=gupnp \
--delete-original --dir=%{buildroot}%{_datadir}/applications \
%{buildroot}/%{_datadir}/applications/gupnp-av-cp.desktop

desktop-file-install --vendor=gupnp \
--delete-original --dir=%{buildroot}%{_datadir}/applications \
%{buildroot}/%{_datadir}/applications/gupnp-network-light.desktop

desktop-file-install --vendor=gupnp \
--delete-original --dir=%{buildroot}%{_datadir}/applications \
%{buildroot}/%{_datadir}/applications/gupnp-universal-cp.desktop

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%dir %{_datadir}/gupnp-tools/
%dir %{_datadir}/gupnp-tools/pixmaps/
%dir %{_datadir}/gupnp-tools/xml/
%{_bindir}/gupnp-network-light
%{_bindir}/gupnp-universal-cp
%{_bindir}/gupnp-av-cp
%{_datadir}/applications/gupnp-av-cp.desktop
%{_datadir}/applications/gupnp-network-light.desktop
%{_datadir}/applications/gupnp-universal-cp.desktop
%{_datadir}/gupnp-tools/*.glade
%{_datadir}/gupnp-tools/pixmaps/*.png
%{_datadir}/gupnp-tools/xml/*.xml

%changelog
* Fri Oct 24 2008 Peter Robinson <pbrobinson at gmail.com> 0.6.1-2
- Add patch to fix gthread issue

* Mon Sep 29 2008 Peter Robinson <pbrobinson at gmail.com> 0.6.1-1
- New upstream release

* Sat Aug 30 2008 Peter Robinson <pbrobinson at gmail.com> 0.6-2
- spec file review updates

* Tue Jun 17 2008 Peter Robinson <pbrobinson at gmail.com> 0.6-1
- Initial release


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gupnp-tools/F-9/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Oct 2008 20:06:03 -0000	1.1
+++ sources	25 Oct 2008 11:54:54 -0000	1.2
@@ -0,0 +1 @@
+27d3a55eae2243661f49a7cf40e1e195  gupnp-tools-0.6.1.tar.gz