SPECS: squirrelmail.spec - started moving plugins into separate sp...

hawk hawk at pld-linux.org
Mon May 29 15:58:30 CEST 2006 

Author: hawk                         Date: Mon May 29 13:58:30 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- started moving plugins into separate specs, NFY

---- Files affected:
SPECS:
   squirrelmail.spec (1.141 -> 1.142) 

---- Diffs:

================================================================
Index: SPECS/squirrelmail.spec
diff -u SPECS/squirrelmail.spec:1.141 SPECS/squirrelmail.spec:1.142
--- SPECS/squirrelmail.spec:1.141	Thu Mar 16 20:59:25 2006
+++ SPECS/squirrelmail.spec	Mon May 29 15:58:25 2006
@@ -1,14 +1,11 @@
 # $Revision$, $Date$
-# TODO:
-# - make separate packages with plugins
-# - move plugins into separate specs
 #
 Summary:	The SquirrelMail, a WebMail package
 Summary(pl):	Wiewiórcza Poczta, Poczta przez WWW
 Summary(pt_BR):	O SquirrelMail é um webmail
 Name:		squirrelmail
 Version:	1.4.6
-Release:	1
+Release:	1.1
 License:	GPL
 Group:		Applications/Mail
 Source0:	http://dl.sourceforge.net/squirrelmail/%{name}-%{version}.tar.bz2
@@ -19,36 +16,14 @@
 %define		_compatibility_version	2.0.4
 Source2:	http://www.squirrelmail.org/plugins/compatibility-%{_compatibility_version}.tar.gz
 # Source2-md5:	cfc3279a613b917fcba8200c596dadb0
-Source3:	http://www.squirrelmail.org/plugins/addgraphics-2.3-1.0.3.tar.gz
-# Source3-md5:	c9319e32149026372a0d515ddbc1d14b
-Source4:	http://www.squirrelmail.org/plugins/auto_cc-2.0-1.2.tar.gz
-# Source4-md5:	259a001d964c7257be11bbb2b764ba52
-Source5:	http://www.squirrelmail.org/plugins/change_pass-2.7-1.4.x.tar.gz
-# Source5-md5:	590e0b3e879bffdb4dea57d369618353
-Source6:	http://www.squirrelmail.org/plugins/gzip-2.02-1.1.1.tar.gz
-# Source6-md5:	2df7370e0dbdf3e48e888cef094ead8b
-Source7:	http://www.squirrelmail.org/plugins/mail_fwd.0.4.1-1.4.0.tar.gz
-# Source7-md5:	472bfb19e60d865b7aa363f3ea0293c2
-Source8:	http://www.squirrelmail.org/plugins/motd.1.2-1.0.3.tar.gz
-# Source8-md5:	d76f2f5282dfc4a4c90dc28326d92b4b
-Source9:	http://www.squirrelmail.org/plugins/password_forget.2.1-1.0.1.tar.gz
-# Source9-md5:	33ffd387d5190b690d53358cb3b4e691
-Source10:	http://www.squirrelmail.org/plugins/quicksave-2.3-1.1.0.tar.gz
-# Source10-md5:	c60c68aace4eb67ccba4282327b13fdc
 Source11:	http://www.squirrelmail.org/plugins/retrieveuserdata.0.9-1.4.0.tar.gz
 # Source11-md5:	dfe469f7ab473fd2292b30800e3141d5
 Source12:	http://www.squirrelmail.org/plugins/username-2.3-1.0.0.tar.gz
 # Source12-md5:	c81670f5607835dc1e226653cf5c53b1
-Source13:	http://www.squirrelmail.org/plugins/vacation_1.41_1.4.tar.gz
-# Source13-md5:	f1fbd5e3778bd8bcae41ca147fbc4333
 Source14:	%{name}.conf
-#%define		_change_passwd_version	4.0
-#SourceX:	http://www.squirrelmail.org/plugins/change_passwd-%{_change_passwd_version}-1.2.8.tar.gz
-## SourceX-md5:	22b5ee1698b2e59a88f2150a96ec17f3
 Patch0:		%{name}-config.patch
 Patch1:		%{name}-ri_once.patch
 Patch2:		%{name}-fortune.patch
-Patch3:		%{name}-mail_fwd-Makefile.patch
 Patch4:		%{name}-squirrelspell.patch
 Patch5:		%{name}-retrieveuserdata-passwd.patch
 URL:		http://www.squirrelmail.org/
@@ -101,164 +76,99 @@
 que vocę poderia desejar em um cliente de e-mail, incluindo um forte
 suporte a MIME, livros de endereços e manipulaçăo de pastas.
 
-%package change_pass
-Summary:	A squirrel interface to change passwords
-Summary(pl):	Wiewiórczy interfejs do zmiany haseł
-Group:		Applications/Mail
-Requires:	%{name} = %{version}-%{release}
-Requires:	poppassd
-Requires:	squirrelmail-compatibility-%{_compatibility_version}
-
-%description change_pass
-This package contains an interface to change passwords.
-
-%description change_pass -l pl
-Ten pakiet zawiera interfejs do zmiany haseł.
-
-%package filters
+%package -n %{name}-plugin-filters
 Summary:	A squirrel interface for various filters
 Summary(pl):	Wiewiórczy interfejs do różnych filterów
 Group:		Applications/Mail
 Requires:	%{name} = %{version}-%{release}
 Provides:	webmail-filters
+Obsoletes:	squirremail-filters
 
-%description filters
+%description -n %{name}-plugin-filters
 This package contains an interface for various filters.
 
-%description filters -l pl
+%description -n %{name}-plugin-filters -l pl
 Ten pakiet zawiera interfejs do różnych filtrów.
 
-%package ispell
+%package -n %{name}-plugin-ispell
 Summary:	A squirrel interface to ispell
 Summary(pl):	Wiewiórczy interfejs do ispella
 Group:		Applications/Mail
 Requires:	%{name} = %{version}-%{release}
 Requires:	ispell
 Provides:	webmail-spellcheck
+Obsoletes:	squirrelmail-ispell
 
-%description ispell
+%description -n %{name}-plugin-ispell
 This package contains an interface to ispell and it allows you to
 check mail against typos and common mistakes.
 
-%description ispell -l pl
+%description -n %{name}-plugin-ispell -l pl
 Pakiet zawiera interfejs do ispella pozwalający sprawdzić pocztę pod
 kątem źle wpisanych słów i ortografii.
 
-%package mail_fwd
-Summary:	A squirrel email forwarding plug-in
-Summary(pl):	Wtyczka umożliwiająca przekierowanie poczty
-Group:		Applications/Mail
-Requires:	%{name} = %{version}-%{release}
-
-%description mail_fwd
-This plug-in allows to set email forwarding.
-Note: binary file included in this package must be suid.
-
-%description mail_fwd -l pl
-Ta wtyczka pozwala na ustawienie przekierowania poczty.
-Uwaga: plik binarny zawarty w tym pakiecie musi mieć ustawiony bit
-suid.
-
-%package mailfetch
+%package -n %{name}-plugin-mailfetch
 Summary:	A squirrel pop3 plug-in
 Summary(pl):	Wiewiórcza wtyczka pop3
 Group:		Applications/Mail
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	squirrelmail-mailfetch
 
-%description mailfetch
+%description -n %{name}-plugin-mailfetch
 This package contains a interface to pop3 serwers, it allows you to
 fetch mail from this kind of serwers.
 
-%description mailfetch -l pl
+%description -n %{name}-plugin-mailfetch -l pl
 Pakiet zawiera interfejs do serwerów pop3, pozwala ściągać z nich
 pocztę za pomocą usługi pop3.
 
-%package newmail
+%package -n %{name}-plugin-newmail
 Summary:	A new mail notify plug-in
 Summary(pl):	Wtyczka informująca o nowej poczcie
 Group:		Applications/Mail
 Requires:	%{name} = %{version}-%{release}
-Requires:	%{name}-ispell = %{version}-%{release}
+Requires:	%{name}-plugin-ispell = %{version}-%{release}
 
-%description newmail
+%description -n %{name}-plugin-newmail
 A Squirrel new mail notify plug-in.
 
-%description newmail -l pl
+%description -n %{name}-plugin-newmail -l pl
 Wiewiórcza wtyczka informująca o nowej poczcie.
 
-%package vacation
-Summary:	A vacation plugin
-Summary(pl):	Wtyczka vacation
-Group:		Applications/Mail
-Requires:	%{name} = %{version}-%{release}
-Requires:	php-ftp
-
-%description vacation
-A Squirrel vacation plug-in.
-
-%description vacation -l pl
-Wtyczka vacation dla Squirrelmaila.
-
 %prep
 %setup -q -a1
 
-for f in %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} \
-	%{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13}; do
+for f in %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE6} \
+	%{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12}; do
 	tar -xzf $f -C plugins
 done
 
 # locales for not present plugins
 rm -f locale/*/LC_MESSAGES/{abook_group,address_add,admin_add,amavisnewsql,archive_mail,askuserinfo,attachment_doc,autocomplete,avelsieve,block_attach,block_sender,bounce,change_ldappass,change_merakpass,change_mysqlpass,change_passwd,check_quota,chg_sasl_passwd,contactclean,cookie_warning,courier_vacation,custom_from,disk_quota,empty_folders,enews,extract,file_manager,folder_sizes,gpg,got_hotmail,image_buttons,japanese_input,junkfolder,ldap_abook,ldapquery,left_css,login_alias,mark_read,naguser,notes,online_users,preview_pane,qmailadmin_login,quota_usage,restrict_senders,rewrap,sasql,select_range,sent_confirmation,serversidefilter,show_headers,show_user_and_ip,smallcal,smime,startup_folder,tmda,tmdatools,taglines,templates,timeout_user,twc_weather,unsafe_image_rules,useracl,user_special_mailboxes,vadmin,view_as_html,virus_scan,vkeyboard,vpopmail,windows,yelp}.mo
 
-# move to proper place (set by bindtextdomain in plugin)
-for f in `find locale -name change_pass.mo`; do
-	if [ ! -f plugins/change_pass/$f ]; then
-		install -D $f plugins/change_pass/$f
-	fi
-	rm -f $f
-done
-for f in `find locale -name gzip.mo`; do
-	if [ ! -f plugins/gzip/$f ]; then
-		install -D $f plugins/gzip/$f
-	fi
-	rm -f $f
-done
-
 # missing (bind)textdomain calls?
-# auto_cc, compatibility, quicksave, username, vacation
-
-#rm -f plugins/change_passwd/chpasswd
-rm -f plugins/mail_fwd/fwdfile/wfwd.o
+# compatibility
 
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 
 find locale -name '*.po' | xargs rm -f
 
 %build
-%{__make} -C plugins/mail_fwd/fwdfile \
-	CFLAGS="%{rpmcflags}" \
-	LFLAGS="%{rpmldflags}"
-
 %{__make} -C plugins/filters/bulkquery \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags} " \
 	LDFLAGS="%{rpmldflags} -lpthread -llwres" \
 
-#%{__cc} %{rpmldflags} %{rpmcflags} -Wall -o plugins/change_passwd/chpasswd \
-#	plugins/change_passwd/chpasswd.c -lcrypt
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_squirreldir}/{config,data},%{_sbindir}} \
 	$RPM_BUILD_ROOT{%{_datadir}/docs/squirrel,%{_squirreldata}/{prefs,data}} \
 	$RPM_BUILD_ROOT%{_sysconfdir}
 
-install plugins/mail_fwd/fwdfile/wfwd $RPM_BUILD_ROOT%{_sbindir}
 install plugins/filters/bulkquery/bulkquery $RPM_BUILD_ROOT%{_sbindir}
 rm -f plugins/filters/bulkquery/*.{in,out,c} plugins/filters/bulkquery/bulkquery
 
@@ -279,9 +189,6 @@
 ln -sf %{_sysconfdir}/config.php $RPM_BUILD_ROOT%{_squirreldir}/config/config.php
 
 ##---{ move plugins configuration to etc: }---##
-# vacation:
-mv $RPM_BUILD_ROOT%{_squirreldir}/plugins/vacation/config.php $RPM_BUILD_ROOT%{_sysconfdir}/vacation_config.php
-ln -s %{_sysconfdir}/vacation_config.php $RPM_BUILD_ROOT%{_squirreldir}/plugins/vacation/config.php
 # filters:
 mv $RPM_BUILD_ROOT%{_squirreldir}/plugins/filters/setup.php $RPM_BUILD_ROOT%{_sysconfdir}/filters_setup.php
 ln -s %{_sysconfdir}/filters_setup.php $RPM_BUILD_ROOT%{_squirreldir}/plugins/filters/setup.php
@@ -347,13 +254,6 @@
 	%service -q httpd reload
 fi
 
-%triggerpostun vacation -- squirrelmail-vacation < 1.4.5-4.1
-if [ -f /etc/squirrelmail/vacation_config.php.rpmsave ]; then
-	echo "Moving old config file to %{_sysconfdir}/vacation_config.php"
-	mv -f %{_sysconfdir}/vacation_config.php{,.rpmnew}
-	mv -f /etc/squirrelmail/vacation_config.php.rpmsave %{_sysconfdir}/vacation_config.php
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog ChangeLog.locales README ReleaseNotes ReleaseNotes.locales UPGRADE doc/*.txt doc/*.html
@@ -454,25 +354,16 @@
 %lang(zh_TW) %{_squirreldir}/locale/zh_TW
 %dir %{_squirreldir}/plugins
 %{_squirreldir}/plugins/abook_take
-%{_squirreldir}/plugins/addgraphics
 %{_squirreldir}/plugins/administrator
-%{_squirreldir}/plugins/auto_cc
 %{_squirreldir}/plugins/bug_report
 %{_squirreldir}/plugins/calendar
 %{_squirreldir}/plugins/compatibility
 %{_squirreldir}/plugins/delete_move_next
 %{_squirreldir}/plugins/fortune
-%dir %{_squirreldir}/plugins/gzip
-%{_squirreldir}/plugins/gzip/*.php
-%dir %{_squirreldir}/plugins/gzip/locale
-%lang(el) %{_squirreldir}/plugins/gzip/locale/el_GR
 %{_squirreldir}/plugins/index.php
 %{_squirreldir}/plugins/info
 %{_squirreldir}/plugins/listcommands
 %{_squirreldir}/plugins/message_details
-%{_squirreldir}/plugins/motd
-%{_squirreldir}/plugins/password_forget
-%{_squirreldir}/plugins/quicksave
 %{_squirreldir}/plugins/retrieveuserdata
 %{_squirreldir}/plugins/sent_subfolders
 %{_squirreldir}/plugins/spamcop
@@ -486,23 +377,7 @@
 # To be removed. Just for compatibility with existing configurations:
 %attr(730,root,http) %dir %{_squirreldir}/data
 
-%files change_pass
-%defattr(644,root,root,755)
-%doc plugins/change_pass/README
-%dir %{_squirreldir}/plugins/change_pass
-%dir %{_squirreldir}/plugins/change_pass/locale
-%{_squirreldir}/plugins/change_pass/*.php
-%lang(bg) %{_squirreldir}/plugins/change_pass/locale/bg_BG
-%lang(de) %{_squirreldir}/plugins/change_pass/locale/de_DE
-%lang(es) %{_squirreldir}/plugins/change_pass/locale/es_ES
-%lang(fr) %{_squirreldir}/plugins/change_pass/locale/fr_FR
-%lang(ja) %{_squirreldir}/plugins/change_pass/locale/ja_JP
-%lang(lt) %{_squirreldir}/plugins/change_pass/locale/lt_LT
-%lang(pl) %{_squirreldir}/plugins/change_pass/locale/pl_PL
-%lang(pt_BR) %{_squirreldir}/plugins/change_pass/locale/pt_BR
-%lang(pt) %{_squirreldir}/plugins/change_pass/locale/pt_PT
-
-%files filters
+%files -n %{name}-plugin-filters
 %defattr(644,root,root,755)
 %doc plugins/filters/{README*,CHANGES}
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/filters_setup.php
@@ -511,43 +386,32 @@
 %dir %{_squirreldir}/plugins/filters/bulkquery
 %{_squirreldir}/plugins/filters/*.php
 
-%files ispell
+%files -n %{name}-plugin-ispell
 %defattr(644,root,root,755)
 %{_squirreldir}/plugins/squirrelspell
 
-%files mail_fwd
-%defattr(644,root,root,755)
-%doc plugins/mail_fwd/README
-%attr(755,root,root) %{_sbindir}/wfwd
-%dir %{_squirreldir}/plugins/mail_fwd
-%{_squirreldir}/plugins/mail_fwd/[!f]*.php
-
-%files mailfetch
+%files -n %{name}-plugin-mailfetch
 %defattr(644,root,root,755)
 %doc plugins/mail_fetch/README
 %dir %{_squirreldir}/plugins/mail_fetch
 %{_squirreldir}/plugins/mail_fetch/*.php
 
-%files newmail
+%files -n %{name}-plugin-newmail
 %defattr(644,root,root,755)
 %doc plugins/newmail/{HISTORY,README}
 %dir %{_squirreldir}/plugins/newmail
 %{_squirreldir}/plugins/newmail/*.php
 %{_squirreldir}/plugins/newmail/sounds
 
-%files vacation
-%defattr(644,root,root,755)
-%doc plugins/vacation/README
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vacation_config.php
-%dir %{_squirreldir}/plugins/vacation
-%{_squirreldir}/plugins/vacation/*.php
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.142  2006/05/29 13:58:25  hawk
+- started moving plugins into separate specs, NFY
+
 Revision 1.141  2006/03/16 19:59:25  glen
 - use %service to reload httpd
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/squirrelmail.spec?r1=1.141&r2=1.142&f=u

More information about the pld-cvs-commit mailing list