rpms/matchbox-window-manager/devel matchbox-window-manager-1.2-keysyms.patch, NONE, 1.1 matchbox-window-manager.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Marco Pesenti Gritti (mpg) fedora-extras-commits at redhat.com
Sun Mar 9 12:00:50 UTC 2008


Author: mpg

Update of /cvs/pkgs/rpms/matchbox-window-manager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10015/devel

Modified Files:
	.cvsignore sources 
Added Files:
	matchbox-window-manager-1.2-keysyms.patch 
	matchbox-window-manager.spec 
Log Message:
Import from OLPC-2 branch


matchbox-window-manager-1.2-keysyms.patch:

--- NEW FILE matchbox-window-manager-1.2-keysyms.patch ---
--- trunk/matchbox-window-manager/src/keys.c	2006/07/19 16:55:26	1361
+++ trunk/matchbox-window-manager/src/keys.c	2007/11/01 12:43:20	1761
@@ -35,10 +35,12 @@
 
   for (keycode = min_kc; keycode <= max_kc; keycode++) {
     for (col = 0; (k = XKeycodeToKeysym (w->dpy, keycode, col))
-           != NoSymbol; col++)
-      if (k == keysym && col == 1) {
+           != NoSymbol; col++) {
+      if (k == keysym && col == 1)
         return True;
-      }
+      if (k == keysym)
+	break;
+    }
   }  
   return False;
 }


--- NEW FILE matchbox-window-manager.spec ---
%define libmatchbox_devel_ver 1.9-2
%define alphatag 20070628svn

Summary:       Window manager for the Matchbox Desktop
Name:          matchbox-window-manager
Version:       1.2
Release:       3.%{alphatag}
Url:           http://projects.o-hand.com/matchbox/
# svn checkout http://svn.o-hand.com/repos/matchbox/trunk/matchbox-window-manager
License:       GPL
Group:         User Interface/Desktops
Source0:       %{name}-%{version}-%{alphatag}.tar.gz

Patch1: matchbox-window-manager-1.2-keysyms.patch

Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  pkgconfig 
BuildRequires:  expat-devel
BuildRequires:  libmatchbox-devel >= %{libmatchbox_devel_ver}
BuildRequires:  startup-notification-devel
BuildRequires:  libpng-devel
BuildRequires:  libjpeg-devel
BuildRequires:  pango-devel
BuildRequires:  libXcomposite-devel
BuildRequires:  libXfixes-devel
BuildRequires:  libXdamage-devel
BuildRequires:  libXrender-devel
BuildRequires:  libXcursor-devel
Requires:       filesystem

%description
Matchbox is a base environment for the X Window System running on non-desktop
embedded platforms such as handhelds, set-top boxes, kiosks and anything else
for which screen space, input mechanisms or system resources are limited.

This package contains the window manager from Matchbox.

%prep
%setup -q

%patch1 -p2 -b .keysyms

%build
%configure
make %{?_smp_mflags}

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

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc AUTHORS README ChangeLog COPYING
%{_bindir}/*
%dir %{_sysconfdir}/matchbox
%config(noreplace) %{_sysconfdir}/matchbox/kbdconfig
%dir %{_datadir}/matchbox
%{_datadir}/matchbox/*
%{_datadir}/themes/*

%changelog
* Fri Nov  9 2007 Marco Pesenti Gritti <marco at localhost.localdomain> - 1.2-3.20070628svn
- Add patch to fix some keybindings

* Thu Jun 28 2007 Marco Pesenti Gritti <mpg at redhat.com> - 1.2-2.20070628svn
- New snapshot

* Tue Jun 19 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.2-1
- Update source to 1.2

* Tue Jun 19 2007 John (J5) Palmieri <johnp at redhat.com> 1.9-3
- Fix buildroot
- Add COPYING license file to docs
- Added {} braces around % macros
- Own {_sysconfdir}/matchbox directory
- Own {_datadir}/matchbox

* Sat Feb 24 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.1-6.cvs20072402.6
- Update to cvs20072402

* Wed Jan 31 2007 Marco Pesenti Gritti <mpg at redhat.com> 1.1-5.cvs20073101.6
- Update to cvs20073101

* Wed Dec 20 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.1-5.cvs20061219.5
- Build with Xcursor support

* Tue Dec 19 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.1-5.cvs20061219.4
- Update to cvs20061219

* Tue Oct 17 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.1-5.cvs20060911.3
- Temporarily drop composite

* Thu Oct  5 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.1-5.cvs20060911.2
- Enable composite
- Add some composite dependencies

* Mon Sep 11 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.1-5.cvs20060911.1
- Remove some gconf leftovers

* Mon Sep 11 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.1-5.cvs20060911.0
- Rebuild

* Mon Sep 11 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.1-cvs20060911-1
- Update

* Mon Aug 21 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.1-3
- Rebuild
- Depend on libmatchbox 1.9-2
- Do not package gconf schemas

* Mon Aug 21 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.1-3
- Build with the default options

* Mon Aug 21 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.1-2
- Missing build reqs

* Mon Aug 21 2006 Marco Pesenti Gritti <mpg at redhat.com> 1.1-1
- Update to 1.1

* Thu Aug 25 2005 Austin Acton <austin at mandriva.org> 0.9.5-1mdk
- New release 0.9.5

* Thu May 12 2005 Austin Acton <austin at mandriva.org> 0.9.4-1mdk
- 0.9.4
- new URLs

* Mon Jan 24 2005 Austin Acton <austin at mandrake.org> 0.9.2-1mdk
- 0.9.2

* Mon Jan 10 2005 Austin Acton <austin at mandrake.org> 0.9-1mdk
- 0.9

* Wed Sep 29 2004 Austin Acton <austin at mandrake.org> 0.8.4-1mdk
- 0.8.4

* Mon Aug 23 2004 Austin Acton <austin at mandrake.org> 0.8.3-2mdk
- fix schemas

* Mon Aug 23 2004 Austin Acton <austin at mandrake.org> 0.8.3-1mdk
- 0.8.3

* Tue Aug 10 2004 Austin Acton <austin at mandrake.org> 0.8.2-3mdk
- buildrequires xsettings

* Tue Jul 27 2004 Austin Acton <austin at mandrake.org> 0.8.2-1mdk
- enable startup-notification

* Mon Jul 20 2004 Austin Acton <austin at mandrake.org> 0.8.2-1mdk
- 0.8.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/matchbox-window-manager/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Jun 2007 16:33:24 -0000	1.1
+++ .cvsignore	9 Mar 2008 12:00:13 -0000	1.2
@@ -0,0 +1 @@
+matchbox-window-manager-1.2-20070628svn.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/matchbox-window-manager/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Jun 2007 16:33:24 -0000	1.1
+++ sources	9 Mar 2008 12:00:13 -0000	1.2
@@ -0,0 +1 @@
+c6f51019f59e9b9d8a3bedcaaebbfefc  matchbox-window-manager-1.2-20070628svn.tar.gz




More information about the fedora-extras-commits mailing list