SPECS: irssi.spec - provide perl(Irssi) version - fix as-needed poisoning f...

[glen]

Author: glen                         Date: Sun Nov 16 17:31:54 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- provide perl(Irssi) version
- fix as-needed poisoning from perl; rel 8

---- Files affected:
SPECS:
   irssi.spec (1.153 -> 1.154) 

---- Diffs:

================================================================
Index: SPECS/irssi.spec
diff -u SPECS/irssi.spec:1.153 SPECS/irssi.spec:1.154
--- SPECS/irssi.spec:1.153	Sat Nov 15 00:15:22 2008
+++ SPECS/irssi.spec	Sun Nov 16 18:31:48 2008
@@ -5,15 +5,15 @@
 %bcond_without	ipv6	# without IPv6 support
 %bcond_without	ssl	# without SSL  support
 %bcond_without	dynamic	# without dynamic libraries
-#
-%{?with_perl:%include	/usr/lib/rpm/macros.perl}
 
+%define	irssi_perl_version 20071006
+%{?with_perl:%include	/usr/lib/rpm/macros.perl}
 Summary:	Irssi is a IRC client
 Summary(fr.UTF-8):	Irssi est un client IRC
 Summary(pl.UTF-8):	Irssi - wygodny w użyciu klient IRC
 Name:		irssi
 Version:	0.8.12
-Release:	7
+Release:	8
 License:	GPL
 Group:		Applications/Communications
 #Source0:	http://www.irssi.org/files/snapshots/%{name}-%{_snap}.tar.gz
@@ -35,6 +35,7 @@
 Patch6:		%{name}-dynamic.patch
 Patch7:		%{name}-invalid_free.patch
 Patch8:		%{name}-color_support_for_gui_entry.patch
+Patch9:		%{name}-libs-nopoison.patch
 URL:		http://www.irssi.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -52,6 +53,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.315
 BuildRequires:	sed >= 4.0
 Requires:	perl(DynaLoader) = %(%{__perl} -MDynaLoader -e 'print DynaLoader->VERSION')
+Provides:	perl(Irssi) = %{irssi_perl_version}
 Obsoletes:	irssi-speech
 Obsoletes:	irssi-sql
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -95,13 +97,22 @@
 %endif
 %patch7 -p1
 %patch8 -p0
+%patch9 -p1
 
 echo 'AC_DEFUN([AM_PATH_GLIB],[:])' > glib1.m4
 
+mv irssi-idea{-%{idea_ver},}
+
 # hack
-sed -i -e 's#\./libtool#%{_bindir}/libtool#g' configure.in
+%{__sed} -i -e 's#\./libtool#%{_bindir}/libtool#g' configure.in
 
 %build
+ver=$(awk '/IRSSI_VERSION_DATE/{print $3}' irssi-version.h)
+if [ "$ver" != "%{irssi_perl_version}" ]; then
+	: update irssi_perl_version to $ver
+	exit 1
+fi
+
 %{__libtoolize}
 %{__aclocal} -I .
 %{__autoconf}
@@ -124,20 +135,17 @@
 
 # to fool idea configure script
 touch irssi-config
-cd irssi-idea-%{idea_ver}
+cd irssi-idea
 %{__libtoolize}
 %{__aclocal} -I .
 %{__autoconf}
 %{__automake}
 %configure
-
 %{__make}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}}
-
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	docdir=%{_datadir}/%{name}-%{version}
@@ -145,7 +153,7 @@
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
-%{__make} -C irssi-idea-%{idea_ver} install \
+%{__make} -C irssi-idea install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -199,6 +207,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.154  2008/11/16 17:31:48  glen
+- provide perl(Irssi) version
+- fix as-needed poisoning from perl; rel 8
+
 Revision 1.153  2008/11/14 23:15:22  jezik
 - added color_support_for_gui_entry patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/irssi.spec?r1=1.153&r2=1.154&f=u