rpms/lucidlife/devel lucidlife-add-.desktop-encoding.patch, NONE, 1.1 lucidlife-make-docs-use-proper-dir.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 lucidlife.spec, 1.13, 1.14 sources, 1.2, 1.3 make-docs-use-proper-dir.patch, 1.1, NONE

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24677

Modified Files:
	.cvsignore lucidlife.spec sources 
Added Files:
	lucidlife-add-.desktop-encoding.patch 
	lucidlife-make-docs-use-proper-dir.patch 
Removed Files:
	make-docs-use-proper-dir.patch 
Log Message:
New upstream release (0.9.1)

lucidlife-add-.desktop-encoding.patch:

--- NEW FILE lucidlife-add-.desktop-encoding.patch ---
--- lucidlife.desktop.in.old	2006-10-28 11:02:18.000000000 -0700
+++ lucidlife.desktop.in	2006-10-28 11:10:43.000000000 -0700
@@ -6,3 +6,4 @@
 Terminal=false
 Type=Application
 Categories=GNOME;Application;Game;
+Encoding=UTF-8

lucidlife-make-docs-use-proper-dir.patch:

--- NEW FILE lucidlife-make-docs-use-proper-dir.patch ---
--- doc/Makefile.am.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.am	2006-03-28 20:22:32.000000000 -0800
@@ -1,4 +1,4 @@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 
 EXTRA_DIST = *.png *.gif *.html *.css
--- doc/Makefile.in.old	2006-03-28 20:22:27.000000000 -0800
+++ doc/Makefile.in	2006-03-28 20:24:32.000000000 -0800
@@ -188,7 +188,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-docdir = $(datadir)/doc/lucidlife
+docdir = $(datadir)/doc/lucidlife-0.9.1
 doc_DATA = *.png *.gif *.html *.css
 EXTRA_DIST = *.png *.gif *.html *.css
 all: all-am


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Feb 2006 21:10:04 -0000	1.2
+++ .cvsignore	29 Oct 2006 03:22:18 -0000	1.3
@@ -1 +1 @@
-lucidlife-0.9.tar.gz
+lucidlife-0.9.1.tar.gz


Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- lucidlife.spec	27 Aug 2006 22:51:56 -0000	1.13
+++ lucidlife.spec	29 Oct 2006 03:22:18 -0000	1.14
@@ -1,13 +1,14 @@
 Name:           lucidlife
-Version:        0.9
-Release:        11%{?dist}
+Version:        0.9.1
+Release:        1%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://icculus.org/~jcspray/LucidLife/
 Source0:        http://icculus.org/~jcspray/LucidLife/%{name}-%{version}.tar.gz
-Patch0:			make-docs-use-proper-dir.patch
+Patch0:		%{name}-make-docs-use-proper-dir.patch
+Patch1:		%{name}-add-.desktop-encoding.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6.0
@@ -29,6 +30,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .old
+%patch1 -p0 -b .old
 
 
 %build
@@ -42,8 +44,8 @@
 %find_lang %{name}
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
-	--add-category X-Fedora	\
 	--delete-original	\
+	--remove-category=Application	\
 	%{buildroot}%{_datadir}/applications/lucidlife.desktop
  
 
@@ -62,6 +64,14 @@
 
 
 %changelog
+* Sat Oct 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9.1-1
+- Update to new upstream release (0.9.1)
+- Drop X-Fedora and Application categories in installed .desktop file
+- Add patch (sent upstream) to add Encoding=UTF-8 in installed .desktop file:
+  + add-.desktop-encoding.patch
+- Add %%name prefix to old make-docs-use-proper-dir patch filename
+  to keep it all in the same logical namespace.
+
 * Sun Aug 27 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-11
 - Mass FC6 rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Feb 2006 21:10:04 -0000	1.2
+++ sources	29 Oct 2006 03:22:18 -0000	1.3
@@ -1 +1 @@
-25bcde0ddbe4f7db4a7ea92fcc36b7bc  lucidlife-0.9.tar.gz
+68e9cfe091fa18380984609af9c56467  lucidlife-0.9.1.tar.gz


--- make-docs-use-proper-dir.patch DELETED ---