rpms/xoo/F-7 xoo-neo1973.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.2, 1.3 xoo.spec, 1.3, 1.4

[Paul Wouters (pwouters)]

Author: pwouters

Update of /cvs/extras/rpms/xoo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1962

Modified Files:
	.cvsignore sources xoo.spec 
Added Files:
	xoo-neo1973.patch 
Log Message:
* Sat Jul 28 2007 Paul Wouters <paul at xelerance.com> 0.7-3
- Added neo1973 skins with permission of copyright holder
  Sean Moss-Pultz <sean at openmoko.com>


xoo-neo1973.patch:

--- NEW FILE xoo-neo1973.patch ---
diff -r -N xoo-0.7-orig/data/Makefile.am xoo-0.7/data/Makefile.am
1c1
< EXTRA_DIST = ipaq3800.xml ipaq3800.png dot.png Xoo.glade xoo.desktop xoo.png
---
> EXTRA_DIST = neo1973.xml neo1973.png ipaq3800.xml ipaq3800.png dot.png Xoo.glade xoo.desktop xoo.png
4c4
< device_DATA = ipaq3800.xml ipaq3800.png dot.png
---
> device_DATA = ipaq3800.xml ipaq3800.png dot.png  neo1973.xml neo1973.png
diff -r -N xoo-0.7-orig/data/Makefile.in xoo-0.7/data/Makefile.in
139c139
< EXTRA_DIST = ipaq3800.xml ipaq3800.png dot.png Xoo.glade xoo.desktop xoo.png
---
> EXTRA_DIST = neo1973.xml neo1973.png ipaq3800.xml ipaq3800.png dot.png Xoo.glade xoo.desktop xoo.png
141c141
< device_DATA = ipaq3800.xml ipaq3800.png dot.png
---
> device_DATA = neo1973.xml neo1973.png ipaq3800.xml ipaq3800.png dot.png
Binary files xoo-0.7-orig/data/neo1973.png and xoo-0.7/data/neo1973.png differ
diff -r -N xoo-0.7-orig/data/neo1973.xml xoo-0.7/data/neo1973.xml
0a1,34
> <neo1973>
> 
> <!--
> 	Date: Sun, 22 Jul 2007 20:24:31 +0800
> 	From: Sean Moss-Pultz <sean at openmoko.com>
> 	To: Paul Wouters <paul at xelerance.com>
> 	Subject: Re: OpenMoko Pictures
> 	Message-ID: <46A34C7F.9000203 at openmoko.com>
> 
> 	> On a related question. I would like to publish the openmoko skin
> 	> with the Fedora Xoo package. Since you are the copyright holder
> 	> (or can speak on its behalf), is it okay to bundle these with xoo,
> 	> and if so, what is the license I can attach to these skins?
> 
> 	Sure.
> 
> -->
> 
> <!--
> 	Example config 'device' file for an neo1973.  
> 	Hopefully the format is pretty self explanatory. 
> -->
> 
> <!-- 
>      first define the window size, image and display geometry for your 
>      'fake' device.
> -->
> 
> <device  width='660' height='1278' 
>          display_width='480' display_height='640' 
>          display_x='86' display_y='295' 
> 	 img='neo1973.png' />
> 
> </neo1973>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xoo/F-7/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Jul 2007 02:15:59 -0000	1.1
+++ .cvsignore	28 Jul 2007 23:35:38 -0000	1.2
@@ -0,0 +1 @@
+neo1973.png


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xoo/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jul 2007 04:29:11 -0000	1.2
+++ sources	28 Jul 2007 23:35:38 -0000	1.3
@@ -1 +1,2 @@
 9b1911cff0290be0f6eb1f8ba62dcbae  xoo-0.7.tar.gz
+ae2d6c8e0ce628082af3eed747caa72d  neo1973.png


Index: xoo.spec
===================================================================
RCS file: /cvs/extras/rpms/xoo/F-7/xoo.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xoo.spec	12 Jul 2007 04:51:20 -0000	1.3
+++ xoo.spec	28 Jul 2007 23:35:38 -0000	1.4
@@ -1,11 +1,13 @@
 Summary: Xoo is a graphical wrapper around xnest
 Name: xoo
 Version: 0.7
-Release: 2%{?dist}.2
+Release: 3%{?dist}
 License: GPL
 Url: http://projects.o-hand.com/%{name}
-Source: http://projects.o-hand.com/sources/%{name}/%{name}-%{version}.tar.gz
+Source0: http://projects.o-hand.com/sources/%{name}/%{name}-%{version}.tar.gz
+Source1: neo1973.png
 Patch0: xoo-0.7-xnest-location.patch
+Patch1: xoo-neo1973.patch
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libXtst-devel, gtk2-devel, libglade2-devel, expat-devel
@@ -20,6 +22,7 @@
 %prep
 %setup -q 
 %patch0 -b .xnest-location
+%patch1 -p1 -b .neo1973
 
 %configure --with-x
 %build
@@ -45,6 +48,10 @@
 #%{_mandir}/*/*
 
 %changelog
+* Sat Jul 28 2007 Paul Wouters <paul at xelerance.com> 0.7-3
+- Added neo1973 skins with permission of copyright holder
+  Sean Moss-Pultz <sean at openmoko.com>
+
 * Thu Jul 12 2007 Paul Wouters <paul at xelerance.com> 0.7-2.2
 - Bumped version again :(