rpms/xoo/F-7 xoo-neo1973.patch,1.1,1.2 xoo.spec,1.4,1.5
Paul Wouters (pwouters)
fedora-extras-commits at redhat.com
Sat Jul 28 23:53:12 UTC 2007
Author: pwouters
Update of /cvs/extras/rpms/xoo/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2885
Modified Files:
xoo-neo1973.patch xoo.spec
Log Message:
* Sat Jul 28 2007 Paul Wouters <paul at xelerance.com> 0.7-4
- Fixed patch file
xoo-neo1973.patch:
Index: xoo-neo1973.patch
===================================================================
RCS file: /cvs/extras/rpms/xoo/F-7/xoo-neo1973.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xoo-neo1973.patch 28 Jul 2007 23:35:38 -0000 1.1
+++ xoo-neo1973.patch 28 Jul 2007 23:53:10 -0000 1.2
@@ -1,55 +1,85 @@
-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
+diff -r -c -N xoo-0.7-orig/data/Makefile.am xoo-0.7/data/Makefile.am
+*** xoo-0.7-orig/data/Makefile.am 2005-09-05 11:22:00.000000000 -0400
+--- xoo-0.7/data/Makefile.am 2007-07-28 19:07:21.000000000 -0400
+***************
+*** 1,7 ****
+! EXTRA_DIST = ipaq3800.xml ipaq3800.png dot.png Xoo.glade xoo.desktop xoo.png
+
+ devicedir = $(pkgdatadir)
+! device_DATA = ipaq3800.xml ipaq3800.png dot.png
+
+ uidir = $(pkgdatadir)
+ ui_DATA = Xoo.glade
+--- 1,7 ----
+! EXTRA_DIST = neo1973.xml neo1973.png ipaq3800.xml ipaq3800.png dot.png Xoo.glade xoo.desktop xoo.png
+
+ devicedir = $(pkgdatadir)
+! device_DATA = ipaq3800.xml ipaq3800.png dot.png neo1973.xml neo1973.png
+
+ uidir = $(pkgdatadir)
+ ui_DATA = Xoo.glade
+diff -r -c -N xoo-0.7-orig/data/Makefile.in xoo-0.7/data/Makefile.in
+*** xoo-0.7-orig/data/Makefile.in 2005-09-05 11:24:27.000000000 -0400
+--- xoo-0.7/data/Makefile.in 2007-07-28 19:07:49.000000000 -0400
+***************
+*** 136,144 ****
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+! EXTRA_DIST = ipaq3800.xml ipaq3800.png dot.png Xoo.glade xoo.desktop xoo.png
+ devicedir = $(pkgdatadir)
+! device_DATA = ipaq3800.xml ipaq3800.png dot.png
+ uidir = $(pkgdatadir)
+ ui_DATA = Xoo.glade
+ desktopdir = $(datadir)/applications
+--- 136,144 ----
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+! EXTRA_DIST = neo1973.xml neo1973.png ipaq3800.xml ipaq3800.png dot.png Xoo.glade xoo.desktop xoo.png
+ devicedir = $(pkgdatadir)
+! device_DATA = neo1973.xml neo1973.png ipaq3800.xml ipaq3800.png dot.png
+ uidir = $(pkgdatadir)
+ ui_DATA = Xoo.glade
+ desktopdir = $(datadir)/applications
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>
+diff -r -c -N xoo-0.7-orig/data/neo1973.xml xoo-0.7/data/neo1973.xml
+*** xoo-0.7-orig/data/neo1973.xml 1969-12-31 19:00:00.000000000 -0500
+--- xoo-0.7/data/neo1973.xml 2007-07-28 19:06:40.000000000 -0400
+***************
+*** 0 ****
+--- 1,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: xoo.spec
===================================================================
RCS file: /cvs/extras/rpms/xoo/F-7/xoo.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xoo.spec 28 Jul 2007 23:35:38 -0000 1.4
+++ xoo.spec 28 Jul 2007 23:53:10 -0000 1.5
@@ -1,7 +1,7 @@
Summary: Xoo is a graphical wrapper around xnest
Name: xoo
Version: 0.7
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL
Url: http://projects.o-hand.com/%{name}
Source0: http://projects.o-hand.com/sources/%{name}/%{name}-%{version}.tar.gz
@@ -48,6 +48,9 @@
#%{_mandir}/*/*
%changelog
+* Sat Jul 28 2007 Paul Wouters <paul at xelerance.com> 0.7-4
+- Fixed patch file
+
* 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>
More information about the fedora-extras-commits
mailing list