- version 1.2.4 (working correctly with php-4.1.1)

 - STBR for test

Changed files:
    squirrelmail.spec -> 1.17

diff --git a/squirrelmail.spec b/squirrelmail.spec
index b706cfb90a0f193a7c7aefd40b929472bdce6c86..46b7d7dcbb7ac86f87a5834f80951a1ec00fce43 100644 (file)
--- a/squirrelmail.spec
+++ b/squirrelmail.spec
@@ -1,18 +1,16 @@
-%define        ver     1.2.0
-%define rcver  rc2
 Summary:       The SquirrelMail, a WebMail package
 Summary(pl):   Wiewórcza Poczta, Poczta przez WWW
 Name:          squirrelmail
-Version:       %{ver}.%{rcver}
-Release:       5
+Version:       1.2.4
+Release:       2
 License:       GPL
 Group:         Applications/Mail
 Group(de):     Applikationen/Post
 Group(pl):     Aplikacje/Poczta
 Group(pt):     Aplicações/Correio Eletrônico
-Source0:       http://prdownloads.sf.net/squirrelmail/%{name}-%{ver}-%{rcver}.tar.bz2
+Source0:       http://prdownloads.sf.net/squirrelmail/%{name}-%{version}.tar.bz2
 Source1:       http://www.squirrelmail.org/plugins/%{name}_plugins-20010604.tar
-Patch0:                %{name}-setlocale.patch
+#Patch0:               %{name}-setlocale.patch
 URL:           http://www.squirrelmail.org/
 Requires:      webserver
 Requires:      php
@@ -31,8 +29,8 @@ Pakiet zawiera Wiewi
 przez dowoln±, obs³uguj±c± ciasteczka przegl±darkê WWW.
 
 %prep 
-%setup -a1 -q -n %{name}-%{ver}-%{rcver}
-%patch0 -p1
+%setup -a1 -q -n %{name}-%{version}
+#%patch0 -p1
 
 # List of usefull plugins (ONLY usefull one should be here)
 for i in change_pass*tar.gz username*tar.gz abook_take*tar.gz \
@@ -51,7 +49,7 @@ Group:          Applications/Mail
 Group(de):      Applikationen/Post
 Group(pl):      Aplikacje/Poczta
 Group(pt):      Aplicações/Correio Eletrônico
-#Source0:        http://prdownloads.sf.net/squirrelmail/%{name}-%{ver}-%{rcver}.tar.bz2
+#Source0:        http://prdownloads.sf.net/squirrelmail/%{name}-%{version}.tar.bz2
 #Source1:        http://www.squirrelmail.org/plugins/%{name}_plugins-20010604.tar
 #Patch0:         %{name}-setlocale.patch
 URL:            http://www.squirrelmail.org/
@@ -79,7 +77,7 @@ Group:          Applications/Mail
 Group(de):      Applikationen/Post
 Group(pl):      Aplikacje/Poczta
 Group(pt):      Aplicações/Correio Eletrônico
-#Source0:        http://prdownloads.sf.net/squirrelmail/%{name}-%{ver}-%{rcver}.tar.bz2
+#Source0:        http://prdownloads.sf.net/squirrelmail/%{name}-%{version}.tar.bz2
 #Source1:        http://www.squirrelmail.org/plugins/%{name}_plugins-20010604.tar
 #Patch0:         %{name}-setlocale.patch
 URL:            http://www.squirrelmail.org/
@@ -103,7 +101,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/home/httpd/html/squirrel/{config,data} \
        $RPM_BUILD_ROOT%{_datadir}/docs/squirrel/
 
-gzip -9nf AUTHORS ChangeLog INSTALL README UPGRADE doc/*
+gzip -9nf AUTHORS ChangeLog INSTALL README UPGRADE doc/*.txt doc/*.html \
+  doc/README* doc/ReleaseNotes/1.2/*
 
 cp -avR * $RPM_BUILD_ROOT/home/httpd/html/squirrel
 cd plugins/squirrelspell
@@ -122,16 +121,16 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /home/httpd/html/squirrel/config/*
 /home/httpd/html/squirrel/functions/*
 /home/httpd/html/squirrel/help/index.php
-%lang(ca) /home/httpd/html/squirrel/help/ca
-%lang(cs) /home/httpd/html/squirrel/help/cs
-%lang(en) /home/httpd/html/squirrel/help/en
-%lang(fi) /home/httpd/html/squirrel/help/fi
-%lang(fr) /home/httpd/html/squirrel/help/fr
-%lang(it) /home/httpd/html/squirrel/help/it
-%lang(ko) /home/httpd/html/squirrel/help/ko
-%lang(pl) /home/httpd/html/squirrel/help/pl
-%lang(ru) /home/httpd/html/squirrel/help/ru
-%lang(sv) /home/httpd/html/squirrel/help/sv
+%lang(ca) /home/httpd/html/squirrel/help/ca_ES
+%lang(cs) /home/httpd/html/squirrel/help/cs_CZ
+%lang(en) /home/httpd/html/squirrel/help/en_US
+%lang(fi) /home/httpd/html/squirrel/help/fi_FI
+%lang(fr) /home/httpd/html/squirrel/help/fr_FR
+%lang(it) /home/httpd/html/squirrel/help/it_IT
+%lang(ko) /home/httpd/html/squirrel/help/ko_KR
+%lang(pl) /home/httpd/html/squirrel/help/pl_PL
+%lang(ru) /home/httpd/html/squirrel/help/ru_RU
+%lang(sv) /home/httpd/html/squirrel/help/sv_SE
 /home/httpd/html/squirrel/images
 /home/httpd/html/squirrel/plugins/README.plugins
 /home/httpd/html/squirrel/plugins/abook_take
@@ -158,25 +157,24 @@ rm -rf $RPM_BUILD_ROOT
 /home/httpd/html/squirrel/locale/index.php
 %dir /home/httpd/html/squirrel/locale
 %dir /home/httpd/html/squirrel/locale/[^i]*
-%lang(is) %dir /home/httpd/html/squirrel/locale/is/LC_MESSAGES
-%lang(it) %dir /home/httpd/html/squirrel/locale/it/LC_MESSAGES
-%lang(ca) /home/httpd/html/squirrel/locale/ca/LC_MESSAGES/squirrelmail.mo
-%lang(da) /home/httpd/html/squirrel/locale/da/LC_MESSAGES/squirrelmail.mo
-%lang(de) /home/httpd/html/squirrel/locale/de/LC_MESSAGES/squirrelmail.mo
-%lang(cs) /home/httpd/html/squirrel/locale/cs/LC_MESSAGES/squirrelmail.mo
-%lang(es) /home/httpd/html/squirrel/locale/es/LC_MESSAGES/squirrelmail.mo
-%lang(fi) /home/httpd/html/squirrel/locale/fi/LC_MESSAGES/squirrelmail.mo
-%lang(fr) /home/httpd/html/squirrel/locale/fr/LC_MESSAGES/squirrelmail.mo
-%lang(hr) /home/httpd/html/squirrel/locale/hr/LC_MESSAGES/squirrelmail.mo
-%lang(hu) /home/httpd/html/squirrel/locale/hu/LC_MESSAGES/squirrelmail.mo
-%lang(is) /home/httpd/html/squirrel/locale/is/LC_MESSAGES/squirrelmail.mo
-%lang(it) /home/httpd/html/squirrel/locale/it/LC_MESSAGES/squirrelmail.mo
-%lang(ko) /home/httpd/html/squirrel/locale/ko/LC_MESSAGES/squirrelmail.mo
-%lang(nl) /home/httpd/html/squirrel/locale/nl/LC_MESSAGES/squirrelmail.mo
+%lang(is) %dir /home/httpd/html/squirrel/locale/is_IS/LC_MESSAGES
+%lang(it) %dir /home/httpd/html/squirrel/locale/it_IT/LC_MESSAGES
+%lang(ca) /home/httpd/html/squirrel/locale/ca_ES/LC_MESSAGES/squirrelmail.mo
+%lang(da) /home/httpd/html/squirrel/locale/da_DK/LC_MESSAGES/squirrelmail.mo
+%lang(de) /home/httpd/html/squirrel/locale/de_DE/LC_MESSAGES/squirrelmail.mo
+%lang(cs) /home/httpd/html/squirrel/locale/cs_CZ/LC_MESSAGES/squirrelmail.mo
+%lang(es) /home/httpd/html/squirrel/locale/es_ES/LC_MESSAGES/squirrelmail.mo
+%lang(fi) /home/httpd/html/squirrel/locale/fi_FI/LC_MESSAGES/squirrelmail.mo
+%lang(fr) /home/httpd/html/squirrel/locale/fr_FR/LC_MESSAGES/squirrelmail.mo
+%lang(hr) /home/httpd/html/squirrel/locale/hr_HR/LC_MESSAGES/squirrelmail.mo
+%lang(hu) /home/httpd/html/squirrel/locale/hu_HU/LC_MESSAGES/squirrelmail.mo
+%lang(is) /home/httpd/html/squirrel/locale/is_IS/LC_MESSAGES/squirrelmail.mo
+%lang(it) /home/httpd/html/squirrel/locale/it_IT/LC_MESSAGES/squirrelmail.mo
+%lang(ko) /home/httpd/html/squirrel/locale/ko_KR/LC_MESSAGES/squirrelmail.mo
+%lang(nl) /home/httpd/html/squirrel/locale/nl_NL/LC_MESSAGES/squirrelmail.mo
 %lang(no) /home/httpd/html/squirrel/locale/no*/LC_MESSAGES/squirrelmail.mo
-%lang(pl) /home/httpd/html/squirrel/locale/pl/LC_MESSAGES/squirrelmail.mo
+%lang(pl) /home/httpd/html/squirrel/locale/pl_PL/LC_MESSAGES/squirrelmail.mo
 %lang(pt) /home/httpd/html/squirrel/locale/pt*/LC_MESSAGES/squirrelmail.mo
-%lang(ru) /home/httpd/html/squirrel/locale/ru/LC_MESSAGES/squirrelmail.mo
-%lang(sr) /home/httpd/html/squirrel/locale/sr/LC_MESSAGES/squirrelmail.mo
-%lang(sv) /home/httpd/html/squirrel/locale/sv/LC_MESSAGES/squirrelmail.mo
-%lang(tw) /home/httpd/html/squirrel/locale/tw/LC_MESSAGES/squirrelmail.mo
+%lang(ru) /home/httpd/html/squirrel/locale/ru_RU/LC_MESSAGES/squirrelmail.mo
+%lang(sr) /home/httpd/html/squirrel/locale/sr_YU/LC_MESSAGES/squirrelmail.mo
+%lang(sv) /home/httpd/html/squirrel/locale/sv_SE/LC_MESSAGES/squirrelmail.mo