From 1214e3d226bd12154fdffd94e15d2fdf76cb40bb Mon Sep 17 00:00:00 2001
From: Rick L. Vinyard, Jr <rvinyard@fedoraproject.org>
Date: Sep 21 2007 18:08:21 +0000
Subject: *** empty log message ***


---

diff --git a/.cvsignore b/.cvsignore
index 8f6d3e0..429fcb3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xournal-0.3.3.tar.gz
+xournal-0.4.1.tar.gz
diff --git a/sources b/sources
index 27f8183..670a2f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c617d08d2c565eef0d8defb304925ade  xournal-0.3.3.tar.gz
+b3d352d08e71606383c31da5790b8d60  xournal-0.4.1.tar.gz
diff --git a/x-xoj.desktop b/x-xoj.desktop
index 6d7c813..c9c36e5 100644
--- a/x-xoj.desktop
+++ b/x-xoj.desktop
@@ -3,8 +3,9 @@ Encoding=UTF-8
 Type=MimeType
 MimeType=application/x-xoj
 Icon=application-x-xoj
-Patterns=*.xoj;*.XOJ;
-Comment=Xournal Notes
+Patterns=*.xoj;*.XOJ;*.Xoj;
+Comment=Xournal note file
+Comment[fr]=Fichier Xournal
 [Property::X-KDE-pdf]
 Type=bool
 Value=true
diff --git a/xournal.desktop b/xournal.desktop
index 2701df4..4db595e 100644
--- a/xournal.desktop
+++ b/xournal.desktop
@@ -1,12 +1,15 @@
 [Desktop Entry]
 Encoding=UTF-8
+Type=Application
+
 Name=Xournal
-GenericName=Xournal Notetaking
 Comment=Take notes, sketch and annotate PDFs
+Name[fr]=Xournal
+Comment[fr]=Prise de notes manuscrites
+
 Exec=xournal %f
-Icon=xournal
 Terminal=false
-Type=Application
 StartupNotify=true
 MimeType=application/x-xoj;application/pdf;application/x-pdf
+Icon=xournal
 Categories=GNOME;GTK;Office;Graphics;Utility;TextEditor;
diff --git a/xournal.spec b/xournal.spec
index 5a54e6b..9386238 100644
--- a/xournal.spec
+++ b/xournal.spec
@@ -1,12 +1,12 @@
 Name:		xournal
-Version:	0.3.3
-Release:	5%{?dist}
+Version:	0.4.1
+Release:	1%{?dist}
 Summary:	Xournal notetaking, sketching and PDF annotation
 
 Group:		Applications/Editors
-License:	GPL
+License:	GPLv2
 URL:		http://xournal.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/xournal/xournal-0.3.3.tar.gz
+Source0:	http://downloads.sourceforge.net/xournal/%{name}-%{version}.tar.gz
 Source1:	xournal.desktop
 Source2:	xournal.xml
 Source3:	x-xoj.desktop
@@ -99,6 +99,13 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %changelog
+* Wed Sep 20 2007 Rick L Vinyard Jr <rvinyard@cs.nmsu.edu> 0.4.1-1
+- New upstream release
+- Changed source to use name and version variables
+- Updated xournal.desktop to reflect upstream changes
+- Updated x-xoj.desktop to reflect upstream changes
+- Updated license to reflect specific GPL version
+
 * Mon Jun 11 2007 Rick L Vinyard Jr <rvinyard@cs.nmsu.edu> 0.3.3-5
 - Added Requires for poppler-utils (#243750)
 - Added Requires for ghostscript