- updated to 0.7.97.2

- GNOME hell is back - conditionally (yes I know what I'm doin' ;)

Changed files:
    irssi.spec -> 1.34

diff --git a/irssi.spec b/irssi.spec
index 328c6e939ffac9b8bfb6520ce6202b2ce800c894..073ee16ee1c767bd8a60a68a08171b0de79ab046 100644 (file)
--- a/irssi.spec
+++ b/irssi.spec
@@ -1,21 +1,26 @@
-%define        ver     0.7.96
+%define        ver     0.7.97

 %define        plev    2
 %define        plev    2

-%include       /usr/lib/rpm/macros.perl
+%{?bcond_off_perl:%include     /usr/lib/rpm/macros.perl}

 Summary:       Irssi is a IRC client
 Summary(fr):   Irssi est un client IRC
 Summary(pl):   Irssi - klient IRC
 Name:          irssi
 Summary:       Irssi is a IRC client
 Summary(fr):   Irssi est un client IRC
 Summary(pl):   Irssi - klient IRC
 Name:          irssi

-Version:       %{ver}p%{plev}
+Version:       %{ver}.%{plev}

 Release:       1
 Vendor:                Timo Sirainen <cras@irccrew.org>
 License:       GPL
 Group:         Applications/Communications
 Group(pl):     Aplikacje/Komunikacja
 Release:       1
 Vendor:                Timo Sirainen <cras@irccrew.org>
 License:       GPL
 Group:         Applications/Communications
 Group(pl):     Aplikacje/Komunikacja

-Source0:       http://www.irssi.org/files/irssi-%{ver}-%{plev}.tar.bz2
+Source0:       http://www.irssi.org/files/irssi-%{ver}.%{plev}.tar.bz2
+Source1:       http://xlife.dhs.org/irssi/%{name}-icon.png

 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: gettext-devel
 BuildRequires: glib-devel >= 1.2.0
 BuildRequires: ncurses-devel >= 5.0
 BuildRequires: gettext-devel
 BuildRequires: glib-devel >= 1.2.0

-BuildRequires: perl
+%{?!bcond_off_perl:BuildRequires:      perl}
+%{?bcond_on_gnome:BuildRequires:       libPropList-devel >= 0.9.1-2}
+%{?bcond_on_gnome:BuildRequires:       imlib-devel}
+%{?bcond_on_gnome:BuildRequires:       gtk+-devel}
+%{?bcond_on_gnome:BuildRequires:       gnome-libs-devel}

 Obsoletes:     %{name}-speech
 Obsoletes:     %{name}-sql
 URL:           http://www.irssi.org/
 Obsoletes:     %{name}-speech
 Obsoletes:     %{name}-sql
 URL:           http://www.irssi.org/


@@ -30,6 +35,23 @@ Irssi est client IRC.
 %description -l pl
 Irssi jest tekstowym klientem IRC ze wsparciem dla IPv6.
 
 %description -l pl
 Irssi jest tekstowym klientem IRC ze wsparciem dla IPv6.
 

+%package GNOME
+Summary:       GNOME version of irssi IRC client
+Summary(pl):   Wersja dla ¶rodowiska GNOME klienta IRC irssi
+Group:         X11/Applications/Networking
+Group(de):     X11/Applikationen/Netzwerkwesen
+Group(pl):     X11/Aplikacje/Sieciowe
+Requires:      %{name} = %{version}
+
+%description GNOME
+Irssi is a GTK based (with GNOME) GUI IRC client with IPv6 support by
+Timo Sirainen <cras@irccrew.org>.
+
+%description -l pl GNOME
+Irssi jest graficznym klientem IRC ze wsparciem dla IPv6 pracuj±cym w
+¶rodowisku GNOME. Napisany zosta³ przez Timo Sirainen
+<cras@irccrew.org>.
+

 %prep
 %setup -q -n %{name}-%{ver}
 
 %prep
 %setup -q -n %{name}-%{ver}
 


@@ -41,7 +63,10 @@ NOCONFIGURE=1 ./autogen.sh
        --with-bot \
        --with-proxy \
        --with-modules \
        --with-bot \
        --with-proxy \
        --with-modules \

-       --enable-perl=yes \
+       %{?bcond_on_gnome:--with-gnome} \
+       %{?bcond_on_gnome:--with-gnome-panel} \
+       %{?!bcond_off_perl:--enable-perl=yes} \
+       %{?bcond_off_perl:--enable-perl=no} \

        --enable-curses-windows \
        --enable-ipv6 \
        --enable-nls
        --enable-curses-windows \
        --enable-ipv6 \
        --enable-nls


@@ -50,32 +75,35 @@ NOCONFIGURE=1 ./autogen.sh
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

-install -d $RPM_BUILD_ROOT%{perl_sitearch}/
+install -d $RPM_BUILD_ROOT{%{perl_sitearch},/usr/X11R6/share/pixmaps}

 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \

-       docdir=%{_datadir}/%{name}-%{version}
+       docdir=%{_datadir}/%{name}-%{version} \
+       desktopdir=%{_applnkdir}/Network/IRC
+
+%{?!bcond_on_gnome:#}install %{SOURCE1} $RPM_BUILD_ROOT/usr/X11R6/share/pixmaps/irssi-icon.png

 
 

-mv $RPM_BUILD_ROOT%{_prefix}/*-pld-*/* $RPM_BUILD_ROOT%{perl_sitearch}/
+%{?bcond_off_perl:#}mv $RPM_BUILD_ROOT%{_prefix}/*-pld-*/* $RPM_BUILD_ROOT%{perl_sitearch}/

 
 

-(
-  for name in Irssi Irssi/Irc; do
-  cd $RPM_BUILD_ROOT%{perl_sitearch}/auto/${name}
-  sed -e "s#$RPM_BUILD_ROOT##" .packlist >.packlist.new
-  mv .packlist.new .packlist
-  done
-)
+%{?bcond_off_perl:#}(
+%{?bcond_off_perl:#}  for name in Irssi Irssi/Irc; do
+%{?bcond_off_perl:#}  cd $RPM_BUILD_ROOT%{perl_sitearch}/auto/${name}
+%{?bcond_off_perl:#}  sed -e "s#$RPM_BUILD_ROOT##" .packlist >.packlist.new
+%{?bcond_off_perl:#}  mv .packlist.new .packlist
+%{?bcond_off_perl:#}  done
+%{?bcond_off_perl:#})

       
       

-gzip -9nf AUTHORS ChangeLog README TODO NEWS
+gzip -9nf AUTHORS ChangeLog README TODO NEWS docs/*.txt

 
 %find_lang %{name}
 
 %clean
 
 %find_lang %{name}
 
 %clean

-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT

 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)

-%doc *.gz
+%doc *.gz docs/*.txt.gz

 %attr(755,root,root) %{_bindir}/*
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/irssi/*
 %dir %{_sysconfdir}/irssi
 %attr(755,root,root) %{_bindir}/*
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/irssi/*
 %dir %{_sysconfdir}/irssi


@@ -85,7 +113,16 @@ gzip -9nf AUTHORS ChangeLog README TODO NEWS
 %dir %{_libdir}/irssi/modules
 %attr(755,root,root) %{_libdir}/irssi/modules/*.so*
 
 %dir %{_libdir}/irssi/modules
 %attr(755,root,root) %{_libdir}/irssi/modules/*.so*
 

-%{perl_sitearch}/*.pm
-%dir %{perl_sitearch}/auto/Irssi
-%{perl_sitearch}/auto/Irssi/*.bs
-%attr(755,root,root) %{perl_sitearch}/auto/Irssi/*.so
+%{?bcond_off_perl:#}%{perl_sitearch}/*.pm
+%{?bcond_off_perl:#}%dir %{perl_sitearch}/auto/Irssi
+%{?bcond_off_perl:#}%{perl_sitearch}/auto/Irssi/*.bs
+%{?bcond_off_perl:#}%attr(755,root,root) %{perl_sitearch}/auto/Irssi/*.so
+
+%files GNOME
+%defattr(644,root,root,755)
+%{?!bcond_on_gnome:#}%attr(755,root,root) /usr/X11R6/bin/irssi
+
+%{?!bcond_on_gnome:#}/etc/X11/GNOME/CORBA/servers/irssi.gnorba
+%{?!bcond_on_gnome:#}%{_applnkdir}/Network/IRC/irssi.desktop
+%{?!bcond_on_gnome:#}/usr/X11R6/share/gnome/help/irssi
+%{?!bcond_on_gnome:#}/usr/X11R6/share/pixmaps/*