- up to 0.8

- updated long-delimiter patch

Changed files:
    xchat-gnome.spec -> 1.13

diff --git a/xchat-gnome.spec b/xchat-gnome.spec
index 966b0326156b32badeabd6a73502baf46d33ba57..ecefe03bc6df144e02793d500c83cc09fefa253e 100644 (file)
--- a/xchat-gnome.spec
+++ b/xchat-gnome.spec
@@ -3,21 +3,22 @@ Summary(de):  IRC-Client (Chat) mit grafischer Oberfl
 Summary(fr):   Client IRC (chat) avec interface graphique
 Summary(pl):   Graficzny klient IRC (chat)
 Name:          xchat-gnome
-Version:       0.7
+Version:       0.8
 Release:       1
 Group:         X11/Applications/Networking
 License:       GPL
 Source0:       http://flapjack.navi.cx/releases/%{name}/%{name}-%{version}.tar.bz2
-# Source0-md5: a5f0940ee6389d58222a04facca0aa0d
-Patch0:        xchat-long-delimiter.patch
-Patch1:        xchat-gnome-gtk-2.8.9.patch
+# Source0-md5: 048f0bb530bc2afce43aff6eb9538554
+Patch0:        %{name}-long-delimiter.patch
+Patch1:        %{name}-gtk-2.8.9.patch
 URL:           http://xchat.org/
 BuildRequires: gettext-devel
 BuildRequires: gtk+2-devel >= 2.0.0
+BuildRequires: libnotify-devel
 BuildRequires: libsexy-devel
 BuildRequires: python-devel
+BuildRequires: perl-devel
 Requires(post):        GConf2
-Conflicts:     xchat
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -73,16 +74,13 @@ Wtyczka dodaj
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_desktopdir} \
-       $RPM_BUILD_ROOT%{_pixmapsdir} \
-       $RPM_BUILD_ROOT%{_libdir}/xchat/plugins
+       $RPM_BUILD_ROOT%{_pixmapsdir}
 
-%makeinstall
-mv -f $RPM_BUILD_ROOT%{_libdir}/dbus.so $RPM_BUILD_ROOT%{_libdir}/xchat/plugins
-mv -f $RPM_BUILD_ROOT%{_libdir}/perl.so $RPM_BUILD_ROOT%{_libdir}/xchat/plugins
-mv -f $RPM_BUILD_ROOT%{_libdir}/python.so $RPM_BUILD_ROOT%{_libdir}/xchat/plugins
-mv -f $RPM_BUILD_ROOT%{_libdir}/notification.so $RPM_BUILD_ROOT%{_libdir}/xchat/plugins
-mv -f $RPM_BUILD_ROOT%{_libdir}/urlscraper.so $RPM_BUILD_ROOT%{_libdir}/xchat/plugins
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT
+
+rm $RPM_BUILD_ROOT/%{_libdir}/xchat-gnome/plugins/*.a
+rm $RPM_BUILD_ROOT/%{_libdir}/xchat-gnome/plugins/*.la
 
 %find_lang xchat-gnome --with-gnome
 
@@ -94,19 +92,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f xchat-gnome.lang
 %defattr(644,root,root,755)
-%doc README ChangeLog faq.html plugins/plugin20.html
+%doc README ChangeLog
 %attr(755,root,root) %{_bindir}/xchat-gnome
-%attr(755,root,root) %{_bindir}/xchat-remote
-%attr(755,root,root) %{_bindir}/xchat
-%dir %{_libdir}/xchat
-%dir %{_libdir}/xchat/plugins
-%attr(755,root,root) %{_libdir}/xchat/plugins/dbus.so
-%attr(755,root,root) %{_libdir}/xchat/plugins/notification.so
-%attr(755,root,root) %{_libdir}/xchat/plugins/urlscraper.so
-%{_datadir}/xchat
-%{_desktopdir}/xchat.desktop
+%attr(755,root,root) %{_bindir}/xchat-gnome-remote
+%dir %{_libdir}/xchat-gnome
+%attr(755,root,root) %{_libdir}/xchat-gnome/plugins/autoaway.so
+%attr(755,root,root) %{_libdir}/xchat-gnome/plugins/dbus.so
+%attr(755,root,root) %{_libdir}/xchat-gnome/plugins/netmonitor.so
+%attr(755,root,root) %{_libdir}/xchat-gnome/plugins/notification.so
+%attr(755,root,root) %{_libdir}/xchat-gnome/plugins/notifyosd.so
+%attr(755,root,root) %{_libdir}/xchat-gnome/plugins/urlscraper.so
+%{_datadir}/xchat-gnome
 %{_desktopdir}/xchat-gnome.desktop
-%{_pixmapsdir}/xchat.png
 %{_pixmapsdir}/xchat-gnome.png
 %{_sysconfdir}/gconf/schemas/*.schemas
 %{_omf_dest_dir}/%{name}/xchat-gnome-C.omf
@@ -114,8 +111,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files perl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xchat/plugins/perl.so
+%attr(755,root,root) %{_libdir}/xchat-gnome/plugins/perl.so
 
 %files python
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xchat/plugins/python.so
+%attr(755,root,root) %{_libdir}/xchat-gnome/plugins/python.so