hedayat pushed to starcal (f21). "Update to upstream version 2.4.1: bug fixes"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Mar 26 11:43:26 UTC 2015


>From 1174daaab0146a3a88d7b24495d0c9f83edd2a44 Mon Sep 17 00:00:00 2001
From: Hedayat Vatankhah <hedayat.fwd at gmail.com>
Date: Thu, 26 Mar 2015 02:52:17 +0430
Subject: Update to upstream version 2.4.1: bug fixes


diff --git a/.gitignore b/.gitignore
index f346dc2..e704d3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /starcal-2.3.3.tar.gz
 /starcal-2.3.4.tar.gz
 /starcal-2.4.0.tar.gz
+/starcal-2.4.1.tar.gz
diff --git a/sources b/sources
index 3b317ea..2bb17cf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d68c0b499697528f2d722db83b50aa07  starcal-2.4.0.tar.gz
+9e16f123506883142806dbe2fc469ac9  starcal-2.4.1.tar.gz
diff --git a/starcal-2.4.0-importfix.patch b/starcal-2.4.0-importfix.patch
deleted file mode 100644
index 2436203..0000000
--- a/starcal-2.4.0-importfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up starcal-2.4.0/natz/local.py.importfix starcal-2.4.0/natz/local.py
---- starcal-2.4.0/natz/local.py.importfix	2015-01-25 22:14:41.086166121 +0330
-+++ starcal-2.4.0/natz/local.py	2015-01-25 22:15:09.405573199 +0330
-@@ -35,6 +35,7 @@ def get_localzone(_root='/'):
-     beneath the _root directory. This is primarily used by the tests.
-     In normal usage you call the function without parameters."""
-     from .exceptions import UnknownTimeZoneError
-+    from .tzfile import build_tzinfo
- 
-     tzenv = os.environ.get('TZ')
-     if tzenv:
diff --git a/starcal.spec b/starcal.spec
index 983e7a4..47c3687 100644
--- a/starcal.spec
+++ b/starcal.spec
@@ -1,8 +1,8 @@
 %global pkg_name %{name}2
 
 Name:           starcal
-Version:        2.4.0
-Release:        2%{?dist}
+Version:        2.4.1
+Release:        1%{?dist}
 Summary:        A full-featured international calendar written in Python
 
 Group:          User Interface/Desktops
@@ -12,7 +12,6 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 # Following Sources are created by me. All of the following were sent upstream
 Source1:        %{pkg_name}.desktop
 Source2:        %{pkg_name}-qt.desktop
-Patch0:         %{name}-2.4.0-importfix.patch
 
 Requires:       pygtk2 python-httplib2 python-gflags pytz
 #Requires(post): chkconfig
@@ -31,13 +30,11 @@ English(Gregorian) calendar
 
 %prep
 %setup -q
-%patch0 -p1 -b .importfix
 sed -i.sudo "s/sudo//" locale.d/install
 
 find -type f -name "*.py*" -exec chmod a+x {} \;
 find -name "*.py" -exec sh -c 'if ! grep "^#\!" {} &> /dev/null;  then \
    sed -i -e "1i#!/usr/bin/python" {}; fi'  \;
-find google-api-python-client/ -name "*.py" -exec sed -i "s|#!/usr/bin/python2\..|#!/usr/bin/python|" {} \;
 
 
 %build
@@ -88,6 +85,9 @@ desktop-file-install     \
 #%{_initddir}/starcal2d
 
 %changelog
+* Wed Mar 25 2015 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 2.4.1-1
+- Update to upstream version 2.4.1: bug fixes
+
 * Tue Jan 27 2015 Hedayat Vatankhah <hedayat.fwd+rpmchlog at gmail.com> - 2.4.0-2
 - Drop gnome shell extension: doesn't work correctly with gnome shell 3.14, and
   replacements are available
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/starcal.git/commit/?h=f21&id=1174daaab0146a3a88d7b24495d0c9f83edd2a44


More information about the scm-commits mailing list