upgrading package: squirrelmail 1.4.21 -> 1.4.22

squirrelmail/squirrelmail.spec

@@ -22,7 +22,7 @@
 ##
 
 #   package version
-%define       V_squirrelmail        1.4.21
+%define       V_squirrelmail        1.4.22
 %define       V_locale              1.4.18-20090526
 %define       V_plugin_compat       2.0.14-1.0
 %define       V_plugin_logger       1.4.0-1.0.6
@@ -50,13 +50,13 @@ Class:        EVAL
 Group:        Mail
 License:      GPL
 Version:      %{V_squirrelmail}
-Release:      20100723
+Release:      20160306
 
 #   package options
 %option       with_plugins  no
 
 #   list of sources
-Source0:      http://download.sourceforge.net/squirrelmail/squirrelmail-%{V_squirrelmail}.tar.bz2
+Source0:      http://download.sourceforge.net/squirrelmail/squirrelmail-webmail-%{V_squirrelmail}.tar.bz2
 Source1:      http://download.sourceforge.net/squirrelmail/all_locales-%{V_locale}.tar.bz2
 Source2:      http://www.squirrelmail.org/plugins/compatibility-%{V_plugin_compat}.tar.gz
 Source3:      http://www.squeaksoft.com/products/SquirrelLogger/squirrel_logger.%{V_plugin_logger}.tar.gz
@@ -100,7 +100,7 @@ PreReq:       MTA, apache, apache-php, apache-php::with_xml = yes
     prog squirrelmail = {
         version   = %{V_squirrelmail}
         url       = http://sourceforge.net/projects/squirrelmail/files/
-        regex     = squirrelmail-(\d+\.[02468]\.\d+[a-z]?)\.tar\.bz2
+        regex     = squirrelmail-webmail-(\d+\.[02468]\.\d+[a-z]?)\.tar\.bz2
     }
     prog squirrelmail:locales = {
         version   = %{V_locale}
@@ -209,8 +209,8 @@ PreReq:       MTA, apache, apache-php, apache-php::with_xml = yes
     %setup -q -D -T -a 1 -c -n squirrelmail/all_locales-%{V_locale}
     %setup -q -D -T -a 2 -n squirrelmail
     %setup -q -D -T -a 3 -n squirrelmail
-    mv compatibility squirrelmail-%{V_squirrelmail}/plugins
-    mv squirrel_logger squirrelmail-%{V_squirrelmail}/plugins
+    mv compatibility squirrelmail-webmail-%{V_squirrelmail}/plugins
+    mv squirrel_logger squirrelmail-webmail-%{V_squirrelmail}/plugins
 %if "%{with_plugins}" == "yes"
     %setup -q -D -T -a 4 -n squirrelmail
     %setup -q -D -T -a 5 -n squirrelmail
@@ -229,17 +229,17 @@ PreReq:       MTA, apache, apache-php, apache-php::with_xml = yes
     for plug in addgraphics avelsieve check_quota chg_sasl_passwd \
                 folder_sizes gpg ldifimport pupdate show_user_and_ip \
                 smallcal vkeyboard username; do
-        mv $plug squirrelmail-%{V_squirrelmail}/plugins
+        mv $plug squirrelmail-webmail-%{V_squirrelmail}/plugins
     done
 %endif
 
     #   clean up login screen of distractions
-    ( cd squirrelmail-%{V_squirrelmail}
+    ( cd squirrelmail-webmail-%{V_squirrelmail}
       %patch -p0
     ) || exit $?
 
     #   rearrange documentation and remove archive script
-    ( cd squirrelmail-%{V_squirrelmail}
+    ( cd squirrelmail-webmail-%{V_squirrelmail}
       mv AUTHORS ChangeLog COPYING INSTALL README UPGRADE doc/
       mv ReleaseNotes doc/ReleaseNotes.txt
       mv themes/README.themes doc/
@@ -285,7 +285,7 @@ PreReq:       MTA, apache, apache-php, apache-php::with_xml = yes
     ) || exit $?
 
     #   install program
-    ( cd squirrelmail-%{V_squirrelmail}
+    ( cd squirrelmail-webmail-%{V_squirrelmail}
 
       #   install default_pref
       %{l_shtool} install -c -m 644 \
@@ -393,7 +393,6 @@ PreReq:       MTA, apache, apache-php, apache-php::with_xml = yes
         -e 's;require_once(SM_PATH \. \(.*\)%{l_prefix};require_once(\1%{l_prefix};g' \
         $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/functions/*.php \
         $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/include/*.php \
-        $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/abook_take/*.php \
         $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/administrator/*.php \
         $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/plugins/calendar/*.php \
         $RPM_BUILD_ROOT%{l_prefix}/share/squirrelmail/src/*.php