X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=fetchpop.spec;h=67d0c078219c8e0896f0ca577c31c24c95e4aa21;hb=b2dfc9deb07dd4ed11b2999606f48a41f1834fc8;hp=c911f72d199f23bac77b859b3b6aa963b7b0debe;hpb=26917608e308e12515bff8f755f17342fe2d8a52;p=packages%2Ffetchpop.git

diff --git a/fetchpop.spec b/fetchpop.spec
index c911f72..67d0c07 100644
--- a/fetchpop.spec
+++ b/fetchpop.spec
@@ -2,16 +2,14 @@ Summary:	POP3 mail client
 Summary(pl):	Klient POP3
 Name:		fetchpop
 Version:	1.9
-Release:	4
+Release:	8
 License:	GPL
 Group:		Applications/Mail
-Group(pt):	Aplicações/Correio Eletrônico
-Group(pl):	Aplikacje/Poczta
-Source0 ftp:	//tsx-11.mit.edu/pub/linux/sources/usr.bin/%{name}%{version}.tar.gz
-Source1:	fetchpop.wmconfig
-Patch0:		fetchpop-make.patch
-Patch1:		fetchpop-fetch.patch
-Patch2:		fetchpop-pop.patch
+Source0:	ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/%{name}%{version}.tar.gz
+# Source0-md5:	0c9b186791ea1e3da1b28f4f6094ca01
+Source1:	%{name}.desktop
+Patch1:		ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/%{name}%{version}.patch1
+Patch2:		ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/%{name}%{version}.patch2
 Requires:	smtpdaemon
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,34 +27,29 @@ zachowanie.
 
 %prep
 %setup -q -n %{name}%{version}
-%patch0 -p1 
 %patch1 -p1
 %patch2 -p1
 
 %build
-make all CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=-s 
+%{__make} all CFLAGS="%{rpmcflags}" LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_sysconfdir}/X11/wmconfig}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_desktopdir}}
 
-make install install.truncate \
-	INSTALL_DIR=$RPM_BUILD_ROOT \
+%{__make} install install.truncate \
+	BINDIR=$RPM_BUILD_ROOT%{_bindir} \
 	MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/wmconfig/fetchpop
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
-strip $RPM_BUILD_ROOT%{_bindir}/{fetchpop,truncate}
-
-gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
-	README RFC1225 TODO FAQ.fetchpop
-
-%clean 
+%clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc {README,RFC1225,TODO,FAQ.fetchpop}.gz
+%doc README RFC1225 TODO FAQ.fetchpop
 
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man1/*
+%{_desktopdir}/*