- added using %%{__make} macro.

[packages/mutt.git] / mutt.spec

diff --git a/mutt.spec b/mutt.spec
index 9ab41e33deae019b5f5246b1302fa7b92b68c066..1298794015103792877b2197a2c1bc083e0a2f1a 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -5,7 +5,8 @@ Summary(pl):    Program pocztowy Mutt
 Summary(tr):   Mutt elektronik posta programý
 Name:          mutt
 Version:       1.2i
-Release:       1
+Release:       3
+Serial:                2
 License:       GPL
 Group:         Applications/Mail
 Group(pt):     Aplicações/Correio Eletrônico
@@ -16,7 +17,7 @@ Source2:      patches_sec.txt
 Source3:       patches_bj.txt
 Patch0:                mutt-mail.patch
 #Patch1:       mutt-confdir.patch
-Patch2:                http://www.spinnaker.de/mutt/patch-1.1.12.rr.compressed.1.gz
+Patch2:                http://www.spinnaker.de/mutt/patch-1.2.rr.compressed.1.gz
 # Part of that patches I changed by hand to fit them into newer version
 # (bonkey)
 Patch3:                patch-0.00.sec+bonk.patchlist.1
@@ -112,22 +113,22 @@ export CFLAGS LDFLAGS
        --with-charmaps \
        --with-docdir=%{_defaultdocdir}/%{name}-%{version}
 
-make keymap.h
-make 
+%{__make} keymap.h
+%{__make} 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_applnkdir}/Networking/Mail
+install -d $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Networking/Mail
-install %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT/%{_docdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Network/Mail
+install %{SOURCE2} %{SOURCE3} .
 
 gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man1/* \
        contrib/{*rc*,*cap*} \
        ChangeLog README TODO NEWS README.SECURITY README.SSL README.UPGRADE \
-       $RPM_BUILD_ROOT%{_docdir}/patches_{bj,sec}.txt
+       patches_{bj,sec}.txt
 
 %find_lang %{name}
 
@@ -139,10 +140,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc {ChangeLog,README,TODO,NEWS,README.SECURITY,README.SSL,README.UPGRADE}.gz
 %doc contrib/{*rc*,*cap*}
 %doc doc/manual*html
-%doc doc/patches_{bj,sec}.txt.gz
+%doc patches_{bj,sec}.txt.gz
 
 %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/Muttrc
-%{_applnkdir}/Networking/Mail/mutt.desktop
+%{_applnkdir}/Network/Mail/mutt.desktop
 
 %attr(755,root,root) %{_bindir}/*
 %{_mandir}/man*/*