rpms/cwiid/F-12 0001-Fix-missing-library-from-wmdemo.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.2, 1.3 cwiid.spec, 1.9, 1.10 sources, 1.2, 1.3 cwiid-0.6.00-bluez-api.patch, 1.1, NONE

Victor Bogado da Silva Lins bogado at fedoraproject.org
Thu May 6 23:36:11 UTC 2010


Author: bogado

Update of /cvs/pkgs/rpms/cwiid/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18430/F-12

Modified Files:
	.cvsignore cwiid.spec sources 
Added Files:
	0001-Fix-missing-library-from-wmdemo.patch import.log 
Removed Files:
	cwiid-0.6.00-bluez-api.patch 
Log Message:
Importing latest src-rpm into the F-12 branch


0001-Fix-missing-library-from-wmdemo.patch:
 Makefile.in |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Fix-missing-library-from-wmdemo.patch ---
>From 3e9dc39b9315bc86a007d0c43d1c14f7e67f41e6 Mon Sep 17 00:00:00 2001
From: Victor Bogado <victor at bogado.net>
Date: Wed, 5 May 2010 20:08:59 -0300
Subject: [PATCH] Fix missing library from wmdemo

---
 wmdemo/Makefile.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/wmdemo/Makefile.in b/wmdemo/Makefile.in
index 56aed58..1eccc02 100644
--- a/wmdemo/Makefile.in
+++ b/wmdemo/Makefile.in
@@ -8,7 +8,7 @@ SOURCES = wmdemo.c
 
 CFLAGS += -I at top_builddir@/libcwiid
 LDFLAGS += -L at top_builddir@/libcwiid
-LDLIBS += -lcwiid
+LDLIBS += -lcwiid -lbluetooth
 INST_DIR = @bindir@
 
 include $(COMMON)/include/app.mak
-- 
1.6.6.1



--- NEW FILE import.log ---
cwiid-0_6_00-14_20100505gitfadf11e_bog_F12:F-12:cwiid-0.6.00-14.20100505gitfadf11e.bog_F12.src.rpm:1273188913


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cwiid/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	28 Apr 2008 23:40:30 -0000	1.2
+++ .cvsignore	6 May 2010 23:36:10 -0000	1.3
@@ -1 +1 @@
-cwiid-0.6.00.tgz
+abstrakraft-cwiid-fadf11e.tar.gz


Index: cwiid.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cwiid/F-12/cwiid.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- cwiid.spec	24 Jul 2009 19:52:49 -0000	1.9
+++ cwiid.spec	6 May 2010 23:36:10 -0000	1.10
@@ -1,16 +1,23 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
+# The git_commit define will have the complement given by git-hub to the source downloaded
+%define git_commit fadf11e
 Name:           cwiid
 Version:        0.6.00
-Release:        12%{?dist}
+Release:        14.20100505git%{git_commit}%{?dist}
 Summary:        Wiimote interface library
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://abstrakraft.org/cwiid/
-Source0:        http://abstrakraft.org/cwiid/downloads/cwiid-%{version}.tgz
+
+# source URL : http://github.com/abstrakraft/cwiid/tarball/%{git_commit} 
+Source0:        abstrakraft-cwiid-%{git_commit}.tar.gz
 Source1:        wmgui.desktop
-Patch0:         cwiid-0.6.00-bluez-api.patch
+
+# this patch is in my git-hub fork git://github.com/bogado/cwiid.git
+# there is an upstream bug filed by me at http://abstrakraft.org/cwiid/ticket/105
+Patch0:         0001-Fix-missing-library-from-wmdemo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bluez-libs-devel, gawk, bison, flex, gtk2-devel, python-devel >= 2.4, desktop-file-utils
@@ -40,8 +47,8 @@ Python2 binding for %{name}
 Summary:        Wiimote connection test application
 Group:          Applications/System
 Requires:       %{name} = %{version}-%{release}
-Provides:	%{name}-wmgui = %{version}-%{release}
-Obsoletes:	%{name}-wmgui < 0.6.00-7
+Provides:       %{name}-wmgui = %{version}-%{release}
+Obsoletes:      %{name}-wmgui < 0.6.00-7
 
 %description    utils
 Applications to test the wiimote connection
@@ -60,10 +67,12 @@ This program allows the user to use the 
 input sources like the mouse and keyboard.
 
 %prep
-%setup -q
-%patch0 -p1 -b .api
+%setup -q -n abstrakraft-cwiid-%{git_commit}
+%patch0 -p1
 
 %build
+aclocal
+autoconf
 %configure CC="gcc %{optflags}" --disable-static
 make %{?_smp_mflags}
 
@@ -94,11 +103,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(0644,root,root,-)
 %{_includedir}/*
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/*
 
 %files python2
-%{python_sitelib}/*
+%defattr(-,root,root,-)
+%{python_sitearch}/*
 
 %files wminput
+%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/cwiid/
 %{_bindir}/wminput
 %{_mandir}/man1/wminput*
@@ -106,12 +118,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_defaultdocdir}/cwiid
 
 %files utils
+%defattr(-,root,root,-)
 %{_bindir}/lswm
 %{_bindir}/wmgui
 %{_mandir}/man1/wmgui*
 %{_datadir}/applications/fedora-wmgui.desktop
 
 %changelog
+* Thu May 06 2010 Victor Bogado <victor at bogado.net> 0.6.00-14.20100505gitfadf11e
+- updated to latest git version, that adds suport for the wii balance board and the wii motion plus
+- Fixed DSO linking issues
+
+* Wed Jan 27 2010 Victor Bogado <victor at bogado.net> 0.6.00-13
+- atempt to fix bug #555449
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.00-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cwiid/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	28 Apr 2008 23:40:30 -0000	1.2
+++ sources	6 May 2010 23:36:10 -0000	1.3
@@ -1 +1 @@
-8d574afdeedc5e5309c87a72d744316a  cwiid-0.6.00.tgz
+858272bc5c23313e63b0c7f518b4b8da  abstrakraft-cwiid-fadf11e.tar.gz


--- cwiid-0.6.00-bluez-api.patch DELETED ---



More information about the scm-commits mailing list