Author: tpg
Date: Thu Feb 1 00:04:28 2007
New Revision: 115789
Added:
packages/cooker/xchat-gnome/current/SOURCES/xchat-gnome-0.16.tar.bz2
(contents, props changed)
Removed:
packages/cooker/xchat-gnome/current/SOURCES/xchat-2.4.1-firefox.patch.bz2
packages/cooker/xchat-gnome/current/SOURCES/xchat-gnome-0.15.tar.bz2
Modified:
packages/cooker/xchat-gnome/current/SPECS/xchat-gnome.spec
Log:
- new version 0.16
- drop patch 4
- move icons to the right directory
- some minor adds in spec file
Added: packages/cooker/xchat-gnome/current/SOURCES/xchat-gnome-0.16.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/xchat-gnome/current/SPECS/xchat-gnome.spec
==============================================================================
--- packages/cooker/xchat-gnome/current/SPECS/xchat-gnome.spec (original)
+++ packages/cooker/xchat-gnome/current/SPECS/xchat-gnome.spec Thu Feb 1
00:04:28 2007
@@ -4,7 +4,6 @@
%define build_tcl 1
%define build_netmon 0
-
%{?_with_plf: %{expand: %%global build_plf 1}}
%{?_without_perl: %{expand: %%global build_perl 0}}
@@ -20,8 +19,8 @@
%{?_with_netmon: %{expand: %%global build_netmon 1}}
%define name xchat-gnome
-%define version 0.15
-%define rel 2
+%define version 0.16
+%define rel 1
%define main_summary Graphical IRC client for the GNOME desktop
%define perl_version %(rpm -q --qf '%%{epoch}:%%{VERSION}' perl)
%define iconname xchat-gnome.png
@@ -45,7 +44,8 @@
Patch0: xchat-gnome-0.12-ctcp_version.patch.bz2
# use mozilla-firefox instead of firefox
-Patch4: xchat-2.4.1-firefox.patch.bz2
+# not needed(?)
+#Patch4: xchat-2.4.1-firefox.patch.bz2
BuildRequires: bison
Buildrequires: gtk+2-devel
@@ -93,9 +93,9 @@
Build Options:
--with plf Enable SOCKS5 support (need to download from PLF)
---without perl Disable Perl plugin
---without python Disable Python plugin
---without tcl Disable TCL plugin
+--witht perl Enable Perl plugin
+--with python Enable Python plugin
+--with tcl Enable TCL plugin
--with netmon Enable Net Monitor plugin
%package devel
@@ -183,11 +183,7 @@
%prep
%setup -q
%patch0 -p1 -b .ctcp_version
-%patch4 -p0 -b .firefox
-
-aclocal-1.8 -I m4
-autoconf
-automake-1.8
+#%patch4 -p0 -b .firefox
%build
@@ -213,7 +209,8 @@
%make
%install
-rm -rf %{buildroot}
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+
%makeinstall_std
mv %{buildroot}%{_sysconfdir}/gconf/schemas/url_handler.schemas
%{buildroot}%{_sysconfdir}/gconf/schemas/xchat_gnome_url_handler.schemas
@@ -221,7 +218,11 @@
%find_lang xchat-gnome
mkdir -p %{buildroot}{%{_miconsdir},%{_iconsdir},%{_liconsdir},%{_menudir}}
-cp data/icons/hicolor/48x48/apps/xchat-gnome.png
%{buildroot}%{_liconsdir}/%{iconname}
+install -D data/icons/hicolor/48x48/apps/xchat-gnome.png
%{buildroot}%{_liconsdir}/%{iconname}
+install -D data/icons/hicolor/scalable/apps/xchat-gnome-plugin.svg
%{buildroot}%{_iconsdir}/hicolor/scalable/apps/xchat-gnome.svg
+install -D data/icons/hicolor/48x48/apps/xchat-gnome.png
%{buildroot}%{_iconsdir}/hicolor/48x48/apps/xchat-gnome.png
+install -D data/icons/hicolor/128x128/apps/xchat-gnome.png
%{buildroot}%{_iconsdir}/hicolor/128x128/apps/xchat-gnome.png
+
convert data/icons/hicolor/128x128/apps/xchat-gnome.png -geometry 16x16
%{buildroot}%{_miconsdir}/%{iconname}
convert data/icons/hicolor/128x128/apps/xchat-gnome.png -geometry 32x32
%{buildroot}%{_iconsdir}/%{iconname}
@@ -257,7 +258,12 @@
gconftool-2 --makefile-install-rule
%{_sysconfdir}/gconf/schemas/xchat_gnome_url_handler.schemas > /dev/null
if [ -x %{_bindir}/scrollkeeper-update ]; then %{_bindir}/scrollkeeper-update
-q || true ; fi
gtk-update-icon-cache --force --quiet %{_iconsdir}/hicolor
-%update_menus
+
+%{update_menus}
+%if %mdkversion >= 200700
+%{update_desktop_database}
+%update_icon_cache hicolor
+%endif
%preun
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -269,7 +275,12 @@
%postun
if [ -x %{_bindir}/scrollkeeper-update ]; then %{_bindir}/scrollkeeper-update
-q || true ; fi
-%clean_menus
+
+%{clean_menus}
+%if %mdkversion >= 200700
+%{clean_desktop_database}
+%clean_icon_cache hicolor
+%endif
%post notification
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -290,8 +301,7 @@
%clean
-rm -fr $RPM_BUILD_ROOT
-
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
%files -f xchat-gnome.lang
%defattr(-,root,root)
@@ -305,11 +315,10 @@
%{_datadir}/dbus-1/services/org.gnome.Xchat.service
%{_datadir}/omf/xchat-gnome
%{_menudir}/*
-%{_iconsdir}/hicolor/*/apps/*.png
-%{_iconsdir}/hicolor/*/apps/*.svg
-%{_iconsdir}/%iconname
-%{_liconsdir}/%iconname
-%_miconsdir/%iconname
+%{_iconsdir}/hicolor/*/apps/*
+%{_iconsdir}/%{iconname}
+%{_liconsdir}/%{iconname}
+%{_miconsdir}/%{iconname}
%dir %{_libdir}/xchat-gnome
%dir %{_libdir}/xchat-gnome/plugins
%{_mandir}/man1/xchat-gnome.1.bz2
