- little cleanups

[packages/irssi.git] / irssi.spec

diff --git a/irssi.spec b/irssi.spec
index 6d8b6d77db5a37b098311cffa184452606865212..dd14c13c850095bd35dd99003f3ac9c2a7d08bed 100644 (file)
--- a/irssi.spec
+++ b/irssi.spec
@@ -1,6 +1,7 @@
+#
 # Conditional build:
-%bcond_without  perl   # without perl support
-%bcond_without  ipv6   # without IPv6 support
+%bcond_without perl    # without perl support
+%bcond_without ipv6    # without IPv6 support
 %bcond_without ssl     # without SSL  support
 #
 %define                _idea_ver       0.1.46
@@ -10,29 +11,30 @@ Summary(fr):        Irssi est un client IRC
 Summary(pl):   Irssi - wygodny w u¿yciu klient IRC
 Name:          irssi
 Version:       0.8.9
-Release:       1
+Release:       4
 License:       GPL
 Group:         Applications/Communications
 Source0:       http://real.irssi.org/files/%{name}-%{version}.tar.bz2
 # Source0-md5: 6610ee0e27922f447e40828cf7dee507
 Source1:       %{name}.desktop
 Source2:       %{name}.png
-Source3:        http://www.irssi.org/files/plugins/idea/%{name}-idea-%{_idea_ver}.tar.gz
+Source3:       http://www.irssi.org/files/plugins/idea/%{name}-idea-%{_idea_ver}.tar.gz
 # Source3-md5: c326efe317b8f67593a3cd46d5557280
 #Patch0:               %{name}-dcc-send-limit.patch
 Patch1:                %{name}-channel_auto_who.patch
 Patch2:                %{name}-tinfo.patch
 Patch3:                %{name}-home_etc.patch
+Patch4:                %{name}.conf.patch
 URL:           http://www.irssi.org/
-BuildRequires: automake
 BuildRequires: autoconf
-BuildRequires: libtool
+BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: glib-devel
 BuildRequires: glib2-devel >= 2.1.0
+BuildRequires: libtool
 BuildRequires: ncurses-devel >= 5.0
-%{?with_ssl:BuildRequires:     openssl-devel >= 0.9.7c}
-%{?with_perl:BuildRequires:    perl-devel >= 5.6.1}
+%{?with_ssl:BuildRequires:     openssl-devel >= 0.9.7d}
+%{?with_perl:BuildRequires:    perl-devel >= 1:5.8.4}
 BuildRequires: pkgconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     %{name}-speech
@@ -48,9 +50,9 @@ Irssi est client IRC.
 Irssi jest tekstowym klientem IRC ze wsparciem dla IPv6.
 
 %package plugin-idea
-Summary:        Irssi plugin IDEA crypt
-Summary(pl):    Wtyczka do irssi do szyfrowania IDEA
-Group:          Applications/Communications
+Summary:       Irssi plugin IDEA crypt
+Summary(pl):   Wtyczka do irssi do szyfrowania IDEA
+Group:         Applications/Communications
 Requires:      %{name} = %{version}
 
 %description plugin-idea
@@ -65,6 +67,7 @@ Ten pakiet zawiera wtyczk
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 rm -f missing
@@ -110,8 +113,7 @@ install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
-cd irssi-idea-%{_idea_ver}
-%{__make} install \
+%{__make} -C irssi-idea-%{_idea_ver} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 %clean