X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fetchmail.spec;h=0f9123f215097ea93f26d9db45e108073d1f457f;hb=fa0d56f57bdcc63560c56981694f4fff1a3a9fb9;hp=75a225ab7cddcfd7d4ab23d3210535aa6522e70e;hpb=35adbe061d3adf26d0b1f7487e3ffafd45d74af2;p=packages%2Ffetchmail.git

diff --git a/fetchmail.spec b/fetchmail.spec
index 75a225a..0f9123f 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -15,25 +15,25 @@ Summary(tr):	POP2, POP3, APOP, IMAP protokolleri ile uzaktan mektup alma yaz
 Summary(uk):	õÔÉ̦ÔÁ ÏÔÒÉÍÁÎÎÑ ÐÏÛÔÉ Ú ×¦ÄÄÁÌÅÎϧ ÍÁÛÉÎÉ ÐÏ ÐÒÏÔÏËÏÌÁÍ POP/IMAP
 Summary(zh_CN):	¹¦ÄÜÇ¿´óµÄ POP/IMAP µç×ÓÓʼþÊÕÈ¡ÊØ»¤½ø³Ì
 Name:		fetchmail
-Version:	6.2.5
-Release:	3
+Version:	6.3.6
+Release:	1
 License:	GPL
 Group:		Applications/Mail
-Source0:	http://catb.org/~esr/fetchmail/%{name}-%{version}.tar.gz
-# Source0-md5:	9956b30139edaa4f5f77c4d0dbd80225
+#Source0Download: http://developer.berlios.de/project/showfiles.php?group_id=1824
+Source0:	http://download2.berlios.de/fetchmail/%{name}-%{version}.tar.bz2
+# Source0-md5:	4fab7ca100ca36e41a2e8dbf5b32a3cf
 Source1:	%{name}conf.desktop
 Source2:	%{name}.sysconfig
 Source3:	%{name}.init
 Source4:	%{name}.logrotate
 Patch0:		%{name}-pl.po-update.patch
-Patch1:		%{name}-home_etc.patch
-Icon:		fetchmail.gif
-URL:		http://www.catb.org/~esr/fetchmail/
+URL:		http://fetchmail.berlios.de/
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	gettext-devel
-%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7c}
+%{?with_ssl:BuildRequires:	openssl-devel >= 0.9.7l}
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	setup >= 2.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -122,7 +122,7 @@ Summary(pt):	Um configurador gr
 Summary(ru):	çÒÁÆÉÞÅÓËÁÑ ÕÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ ÐÒÅÄÐÏÞÔÅÎÉÊ ÄÌÑ fetchmail
 Summary(uk):	çÒÁƦÞÎÁ ÕÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÁæ§ ×ÐÏÄÏÂÁÎØ ÄÌÑ fetchmail
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Requires:	python
 Requires:	python-tkinter
 
@@ -144,31 +144,34 @@ Um configurador gr
 para o fetchmail.
 
 %description -n fetchmailconf -l ru
-Fetchmailconf - ÜÔÏ ÐÒÏÇÒÁÍÍÁ ÎÁ TCL/TK ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ ×ÁÛÅÇÏ ÆÁÊÌÁ
+Fetchmailconf - ÜÔÏ ÐÒÏÇÒÁÍÍÁ ÎÁ Tcl/Tk ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ ×ÁÛÅÇÏ ÆÁÊÌÁ
 ÐÒÅÄÐÏÞÔÅÎÉÊ ~/.fetchmailrc.
 
 %description -n fetchmailconf -l uk
-Fetchmailconf - ÃÅ ÐÒÏÇÒÁÍÁ ÎÁ TCL/TK ÄÌÑ ËÏÎƦÇÕÒÁæ§ ×ÁÛÏÇÏ ÆÁÊÌÁ
+Fetchmailconf - ÃÅ ÐÒÏÇÒÁÍÁ ÎÁ Tcl/Tk ÄÌÑ ËÏÎƦÇÕÒÁæ§ ×ÁÛÏÇÏ ÆÁÊÌÁ
 ×ÐÏÄÏÂÁÎØ ~/.fetchmailrc.
 
 %package daemon
 Summary:	SysV init script for demonize fetchmail for sucking emails
 Summary(pl):	Skrypt startowy SysV do uruchamiania systemowego fetchmaila jako demona
 Group:		Applications/System
-Requires:	%{name} = %{version}
-PreReq:		rc-scripts >= 0.2.0
 Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name} = %{version}-%{release}
+Requires:	rc-scripts
 
 %description daemon
 SysV init script for demonize fetchmail for sucking emails.
 
 %description daemon -l pl
-Skrypt startowy SysV do uruchamiania systemowego fetchmaila jako demona.
+Skrypt startowy SysV do uruchamiania systemowego fetchmaila jako
+demona.
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+
+# to rebuild po/pl.gmo
+rm -f po/stamp-po
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -186,14 +189,14 @@ cp -f /usr/share/automake/config.* .
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_applnkdir}/Settings \
+install -d $RPM_BUILD_ROOT%{_desktopdir} \
 	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} \
 	$RPM_BUILD_ROOT/etc/logrotate.d
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Settings
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/fetchmail
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/fetchmail
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
@@ -205,22 +208,18 @@ echo ".so fetchmail.1" > $RPM_BUILD_ROOT%{_mandir}/man1/fetchmailconf.1
 
 %find_lang %{name}
 
+%py_postclean
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post daemon
 /sbin/chkconfig --add fetchmail
-if [ -f /var/lock/subsys/fetchmail ]; then
-	/etc/rc.d/init.d/fetchmail restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/fetchmail start\" to start fetchmail daemon."
-fi
+%service fetchmail restart "fetchmail daemon"
 
 %preun daemon
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/fetchmail ]; then
-		/etc/rc.d/init.d/fetchmail stop >&2
-	fi
+	%service fetchmail stop
 	/sbin/chkconfig --del fetchmail
 fi
 
@@ -233,12 +232,13 @@ fi
 %files -n fetchmailconf
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/fetchmailconf
-%{_applnkdir}/Settings/fetchmailconf.desktop
+%{_desktopdir}/fetchmailconf.desktop
 %{_mandir}/man1/fetchmailconf.1*
+%{py_sitescriptdir}/*.py[co]
 
 %files daemon
 %defattr(644,root,root,755)
-%attr(600,root,root) %config(noreplace,missingok) %{_sysconfdir}/fetchmailrc
+%attr(600,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/fetchmailrc
 %attr(754,root,root) /etc/rc.d/init.d/fetchmail
-%attr(640,root,root) %config(noreplace) /etc/sysconfig/fetchmail
-%attr(640,root,root) /etc/logrotate.d/fetchmail
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/fetchmail
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/fetchmail