[eric] 4.5.25-2

[Rex Dieter]

commit 8963e33988b288ba0771ff81b51847d18f180a7c
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 29 09:55:11 2014 -0600

    4.5.25-2
    
    - disable update check (by default)
    - fix/improve icons

 .gitignore                      |    3 +++
 eric.spec                       |   22 ++++++++++++++++++----
 eric4-4.5.25-versioncheck.patch |   12 ++++++++++++
 sources                         |    3 +++
 4 files changed, 36 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8bb38ba..85cb2e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@
 /eric4-i18n-ru-4.5.25.tar.gz
 /eric4-i18n-tr-4.5.25.tar.gz
 /eric4-i18n-zh_CN.GB2312-4.5.25.tar.gz
+/eric-32.png
+/eric-48.png
+/eric-64.png
diff --git a/eric.spec b/eric.spec
index 76f3a50..e01fb48 100644
--- a/eric.spec
+++ b/eric.spec
@@ -8,7 +8,7 @@
 Name:    eric
 Summary: Python IDE
 Version: 4.5.25
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3+
 URL:     http://eric-ide.python-projects.org
@@ -25,6 +25,13 @@ Source8: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-tr-
 Source9: http://downloads.sourceforge.net/sourceforge/eric-ide/%{name}4-i18n-zh_CN.GB2312-%{version}.tar.gz 
 Source10: eric4.desktop
 
+Source20: eric-32.png
+Source21: eric-48.png
+Source22: eric-64.png
+
+# disable version check (by default)
+Patch1: eric4-4.5.25-versioncheck.patch
+
 Provides: eric4 = %{version}-%{release}
 
 BuildRequires: desktop-file-utils
@@ -53,6 +60,8 @@ eric4 is a full featured Python IDE.
 %prep
 %setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -n eric4-%{version}
 
+%patch1 -p1 -b .versioncheck
+
 # copy language files
 mv eric4-%{version}/%{name}/i18n/*.qm %{name}/i18n/
 rm -rf %{name}-%{version}
@@ -81,9 +90,10 @@ desktop-file-install \
   --vendor="" \
   %{SOURCE10}
 
-install -m644 -p -D \
-  %{buildroot}%{python_sitedir}/eric4/icons/default/eric.png \
-  %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/eric4.png
+# icons
+install -m644 -p -D %{SOURCE20} %{buildroot}%{_datadir}/icons/hicolor/32x32/apps/eric4.png
+install -m644 -p -D %{SOURCE21} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/eric4.png
+install -m644 -p -D %{SOURCE22} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/eric4.png
 
 ## generate api files
 mkdir -p %{buildroot}%{_datadir}/eric/
@@ -137,6 +147,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Mon Dec 29 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.5.25-2
+- disable update check (by default)
+- fix/improve icons
+
 * Mon Dec 29 2014 Rex Dieter <rdieter at fedoraproject.org> 4.5.25-1
 - eric4-4.5.25
 
diff --git a/eric4-4.5.25-versioncheck.patch b/eric4-4.5.25-versioncheck.patch
new file mode 100644
index 0000000..2f796c8
--- /dev/null
+++ b/eric4-4.5.25-versioncheck.patch
@@ -0,0 +1,12 @@
+diff -up eric4-4.5.25/eric/Preferences/__init__.py.updates eric4-4.5.25/eric/Preferences/__init__.py
+--- eric4-4.5.25/eric/Preferences/__init__.py.updates	2014-12-29 09:19:16.568371322 -0600
++++ eric4-4.5.25/eric/Preferences/__init__.py	2014-12-29 09:34:10.555683079 -0600
+@@ -157,7 +157,7 @@ class Prefs(object):
+         "UseKDEDialogs" : 0, 
+         "SingleCloseButton" : 0, 
+         
+-        "PerformVersionCheck" : 4,      # 0 = off
++        "PerformVersionCheck" : 0,      # 0 = off
+                                         # 1 = at startup
+                                         # 2 = daily
+                                         # 3 = weekly
diff --git a/sources b/sources
index f351040..cd9aa74 100644
--- a/sources
+++ b/sources
@@ -8,3 +8,6 @@ d2995d9157c3adbcc2673479155492e2  eric4-i18n-fr-4.5.25.tar.gz
 fc45341b525363af7f8abe6e731515d9  eric4-i18n-ru-4.5.25.tar.gz
 caf114f5c217125b6567fb71dbd9d7bf  eric4-i18n-tr-4.5.25.tar.gz
 4b6bc9dd37a002be1b8adf3ddb489bc3  eric4-i18n-zh_CN.GB2312-4.5.25.tar.gz
+3744d777d4956b323082e83c18ae4c3f  eric-32.png
+d4bcdd49baf9c56796ba9a1573ceb151  eric-48.png
+553bf30aa5c3c0978969ea0997c12089  eric-64.png