rpms/tryton/devel tryton-1.2-desktop.patch, NONE, 1.1 tryton.spec, 1.4, 1.5 tryton.desktop, 1.1, NONE

[Dan Horák]

Author: sharkcz

Update of /cvs/pkgs/rpms/tryton/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16764

Modified Files:
	tryton.spec 
Added Files:
	tryton-1.2-desktop.patch 
Removed Files:
	tryton.desktop 
Log Message:
* Sat May 23 2009 Dan Horák <dan[at]danny.cz> 1.2.0-1
- update to upstream version 1.2.0
- use upstream desktop file


tryton-1.2-desktop.patch:

--- NEW FILE tryton-1.2-desktop.patch ---
# HG changeset patch
# User dan at eagle.danny.cz
# Date 1243067466 -7200
# Node ID 80025db280ca9f45c6bd81adbbc12e974df719de
# Parent  e76b0d636cc8b442301c02b304bad09b48602b3a
fix desktop file

diff -r e76b0d636cc8 -r 80025db280ca tryton.desktop
--- a/tryton.desktop	Mon Apr 20 11:25:49 2009 +0200
+++ b/tryton.desktop	Sat May 23 10:31:06 2009 +0200
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Type=Application
 Name=Tryton
@@ -11,4 +10,3 @@
 Icon=tryton-icon
 Terminal=false
 Categories=Office;Finance;
-GenericName=Tryton Client


Index: tryton.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tryton/devel/tryton.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tryton.spec	6 Mar 2009 09:36:43 -0000	1.4
+++ tryton.spec	25 May 2009 10:58:05 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           tryton
-Version:        1.0.3
+Version:        1.2.0
 Release:        1%{?dist}
 Summary:        Client for the Tryton application framework
 
@@ -9,12 +9,12 @@ Group:          Applications/Productivit
 License:        GPLv3+
 URL:            http://www.tryton.org
 Source0:        http://downloads.tryton.org/1.0/%{name}-%{version}.tar.gz
-Source10:       %{name}.desktop
+Patch0:         %{name}-1.2-desktop.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel python-setuptools desktop-file-utils
-Requires:       pygtk2 mx pyOpenSSL pytz
+Requires:       pygtk2 librsvg2 mx pyOpenSSL pytz
 
 
 %description
@@ -24,6 +24,7 @@ in the trytond package.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -36,7 +37,7 @@ rm -rf $RPM_BUILD_ROOT
 
 desktop-file-install --vendor=fedora                            \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications           \
-        %{SOURCE10}
+        %{name}.desktop
 
 %find_lang %{name}
 
@@ -50,12 +51,16 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGELOG COPYRIGHT INSTALL LICENSE README TODO
 %{_bindir}/%{name}
 %{python_sitelib}/*
-%{_datadir}/pixmaps/%{name}-*.svg
+%{_datadir}/pixmaps/%{name}
 %{_datadir}/pixmaps/%{name}*.png
 %{_datadir}/applications/fedora-%{name}.desktop
 
 
 %changelog
+* Sat May 23 2009 Dan Horák <dan[at]danny.cz> 1.2.0-1
+- update to upstream version 1.2.0
+- use upstream desktop file
+
 * Fri Mar  6 2009 Dan Horák <dan[at]danny.cz> 1.0.3-1
 - update to upstream version 1.0.3
 


--- tryton.desktop DELETED ---