[squirrelmail/el6] use original squirrelmail logo (#859311)

Michal Hlavinka mhlavink at fedoraproject.org
Fri Sep 21 09:35:55 UTC 2012


commit e7942d510c110f56e6ee8c3406ebdec9fbb48701
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Fri Sep 21 11:35:49 2012 +0200

    use original squirrelmail logo (#859311)

 squirrelmail-splash-fedora.png |  Bin 6404 -> 0 bytes
 squirrelmail-splash-rhel.png   |  Bin 6801 -> 0 bytes
 squirrelmail.spec              |   14 ++++----------
 3 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/squirrelmail.spec b/squirrelmail.spec
index 4b0407e..0e85cd5 100644
--- a/squirrelmail.spec
+++ b/squirrelmail.spec
@@ -6,14 +6,12 @@
 Summary: webmail client written in php
 Name: squirrelmail
 Version: 1.4.22
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-webmail-%{version}.tar.bz2
 Source1: squirrelmail.conf
-Source2: squirrelmail-splash-fedora.png
-Source3: squirrelmail-splash-rhel.png
 Source4: http://prdownloads.sourceforge.net/squirrelmail/all_locales-1.4.18-20090526.tar.bz2
 Source5: config_local.php
 
@@ -95,13 +93,6 @@ done
 %{__perl} -pi -e "s|^(\s*\\\$version\s*=\s*'[^']+)'|\1-%{release}'|g"\
     functions/strings.php
 
-# replace splash screen
-%if %{fedora_splash} == 1
-cp %{SOURCE2} images/sm_logo.png
-%else
-cp %{SOURCE3} images/sm_logo.png
-%endif
-
 # Convert all locales to utf-8. Not only is this probably the right thing
 # to do anyway, but SquirrelMail will corrupt charsets unless the charset
 # of the user's locale is a superset of the charset of any mail they reply to
@@ -268,6 +259,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Fri Sep 21 2012 Michal Hlavinka <mhlavink at redhat.com> - 1.4.22-3
+- use original squirrelmail logo (#859311)
+
 * Wed Jul 13 2011 Michal Hlavinka <mhlavink at redhat.com> - 1.4.22-2
 - fix possible php warning
 


More information about the scm-commits mailing list