rpms/gnome-applet-jalali-calendar/devel Calverter.py, NONE, 1.1 jalali-calendar-1.6.8-algfix.patch, NONE, 1.1 gnome-applet-jalali-calendar.spec, 1.7, 1.8
Hedayat Vatankhah
hedayat at fedoraproject.org
Thu Jan 7 17:50:46 UTC 2010
Author: hedayat
Update of /cvs/pkgs/rpms/gnome-applet-jalali-calendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15640
Modified Files:
gnome-applet-jalali-calendar.spec
Added Files:
Calverter.py jalali-calendar-1.6.8-algfix.patch
Log Message:
Fixed computation of jalali dates after 2010
***** Error reading new file: [Errno 2] No such file or directory: 'Calverter.py'
jalali-calendar-1.6.8-algfix.patch:
jcalendar.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- NEW FILE jalali-calendar-1.6.8-algfix.patch ---
diff -up jalali-calendar-1.6.8/src/jcalendar.py.algfix jalali-calendar-1.6.8/src/jcalendar.py
--- jalali-calendar-1.6.8/src/jcalendar.py.algfix 2009-04-21 09:11:07.000000000 +0430
+++ jalali-calendar-1.6.8/src/jcalendar.py 2010-01-07 20:25:46.737985229 +0330
@@ -31,6 +31,7 @@ import gnome.ui
import gnomeapplet
import utility
import time
+import Calverter
import datetime
import gconf
import pynotify
@@ -41,6 +42,7 @@ import prefrences
PIXDIR = "/usr/share/jalali-calendar/date/"
mon_name = ["فروردین","اردیبهشت","خرداد","تیر","مرداد","شهریور","مهر","آبان","آذر","دی","بهمن","اسفند"]
+calverter = Calverter.Calverter()
def convert_to_str(num):
s = str(num)
@@ -53,7 +55,8 @@ def convert_to_str(num):
class Jcalendar:
timeout_interval = 1000
def timeout_callback(self,obj=None,Time=None):
- jdate=utility.convert_to_jalali(time.time())
+ #jdate=utility.convert_to_jalali(time.time())
+ jdate=calverter.jd_to_jalali(calverter.gregorian_to_jd(datetime.date.today().year, datetime.date.today().month, datetime.date.today().day))
self.year=jdate[0]
self.month=jdate[1]
self.day=jdate[2]
@@ -207,7 +210,8 @@ class Jcalendar:
self.show_sec=self.conf_client.get_bool("/apps/jcalendar/show_sec")
self.cal_size=self.conf_client.get_int("/apps/jcalendar/cal_size")
- jdate=utility.convert_to_jalali(time.time())
+ #jdate=utility.convert_to_jalali(time.time())
+ jdate=calverter.jd_to_jalali(calverter.gregorian_to_jd(datetime.date.today().year, datetime.date.today().month, datetime.date.today().day))
self.year=jdate[0]
self.month=jdate[1]
Index: gnome-applet-jalali-calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applet-jalali-calendar/devel/gnome-applet-jalali-calendar.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gnome-applet-jalali-calendar.spec 28 Aug 2009 07:26:15 -0000 1.7
+++ gnome-applet-jalali-calendar.spec 7 Jan 2010 17:50:46 -0000 1.8
@@ -1,13 +1,16 @@
Name: gnome-applet-jalali-calendar
Version: 1.6.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Jalali calendar panel applet for GNOME
Group: User Interface/Desktops
License: GPLv2+
URL: http://home.gna.org/jalali-calendar
Source0: http://download.gna.org/jalali-calendar/jalali-calendar-%{version}.tar.bz2
+# This source is grabbed from starcal project: http://ospdev.net/projects/starcal/
+Source1: Calverter.py
Patch0: jalali-calendar-1.6.8-emptyfix.patch
+Patch1: jalali-calendar-1.6.8-algfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: gnome-python2-applet gnome-python2-gconf
@@ -27,12 +30,14 @@ Features:
%prep
%setup -n jalali-calendar-%{version} -q
%patch0 -p1 -b .emptyfix
+%patch1 -p1 -b .algfix
%build
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} LIBDIR="%{_prefix}/lib/"
+cp -a %{SOURCE1} %{buildroot}/%{_datadir}/jalali-calendar/
%clean
rm -rf %{buildroot}
@@ -44,6 +49,10 @@ rm -rf %{buildroot}
%{_datadir}/jalali-calendar
%changelog
+* Thu Jan 07 2010 Hedayat Vatankhah <hedayat at grad.com> - 1.6.8-3
+- Added a patch to use Calverter algorithm to calculate jalali dates
+ (patch contributed by Adrin Jalali)
+
* Fri Aug 28 2009 Hedayat Vatankhah <hedayat at grad.com> - 1.6.8-2
- Added a patch to prevent trying to iterate over an empty list
More information about the fedora-extras-commits
mailing list