SPECS: squirrelmail.spec - removed two more plugins, renumbered so...

hawk hawk at pld-linux.org
Tue May 30 10:11:29 CEST 2006


Author: hawk                         Date: Tue May 30 08:11:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed two more plugins, renumbered sources and patches, cleanup

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

---- Diffs:

================================================================
Index: SPECS/squirrelmail.spec
diff -u SPECS/squirrelmail.spec:1.142 SPECS/squirrelmail.spec:1.143
--- SPECS/squirrelmail.spec:1.142	Mon May 29 15:58:25 2006
+++ SPECS/squirrelmail.spec	Tue May 30 10:11:24 2006
@@ -16,16 +16,10 @@
 %define		_compatibility_version	2.0.4
 Source2:	http://www.squirrelmail.org/plugins/compatibility-%{_compatibility_version}.tar.gz
 # Source2-md5:	cfc3279a613b917fcba8200c596dadb0
-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
-Source14:	%{name}.conf
+Source3:	%{name}.conf
 Patch0:		%{name}-config.patch
-Patch1:		%{name}-ri_once.patch
-Patch2:		%{name}-fortune.patch
-Patch4:		%{name}-squirrelspell.patch
-Patch5:		%{name}-retrieveuserdata-passwd.patch
+Patch1:		%{name}-fortune.patch
+Patch2:		%{name}-squirrelspell.patch
 URL:		http://www.squirrelmail.org/
 BuildRequires:	bind-devel
 BuildRequires:	gettext-devel
@@ -137,11 +131,7 @@
 
 %prep
 %setup -q -a1
-
-for f in %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE6} \
-	%{SOURCE8} %{SOURCE9} %{SOURCE10} %{SOURCE11} %{SOURCE12}; do
-	tar -xzf $f -C plugins
-done
+tar -xzf %{SOURCE2} -C plugins
 
 # 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
@@ -152,8 +142,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch4 -p1
-%patch5 -p1
 
 find locale -name '*.po' | xargs rm -f
 
@@ -172,15 +160,15 @@
 install plugins/filters/bulkquery/bulkquery $RPM_BUILD_ROOT%{_sbindir}
 rm -f plugins/filters/bulkquery/*.{in,out,c} plugins/filters/bulkquery/bulkquery
 
-install %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-install %{SOURCE14} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
 
 cp -aR * $RPM_BUILD_ROOT%{_squirreldir}
 
 find $RPM_BUILD_ROOT%{_squirreldir} -name '*.po' -o -name '*.pot' | xargs rm -f
 
 # junk:
-rm -f $RPM_BUILD_ROOT%{_squirreldir}/plugins/{username/options.php,gzip/setup.php~,make_archive.pl,README.plugins}
+rm -f $RPM_BUILD_ROOT%{_squirreldir}/plugins/{make_archive.pl,README.plugins}
 
 ln -s %{_sbindir}/bulkquery $RPM_BUILD_ROOT%{_squirreldir}/plugins/filters/bulkquery/bulkquery
 
@@ -364,11 +352,9 @@
 %{_squirreldir}/plugins/info
 %{_squirreldir}/plugins/listcommands
 %{_squirreldir}/plugins/message_details
-%{_squirreldir}/plugins/retrieveuserdata
 %{_squirreldir}/plugins/sent_subfolders
 %{_squirreldir}/plugins/spamcop
 %{_squirreldir}/plugins/translate
-%{_squirreldir}/plugins/username
 %{_squirreldir}/src
 %{_squirreldir}/themes
 %attr(710,root,http) %dir %{_squirreldata}
@@ -409,6 +395,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.143  2006/05/30 08:11:24  hawk
+- removed two more plugins, renumbered sources and patches, cleanup
+
 Revision 1.142  2006/05/29 13:58:25  hawk
 - started moving plugins into separate specs, NFY
 
================================================================

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



More information about the pld-cvs-commit mailing list