[xneur] Disable xosd support for Fedora > 16 as it orphaned now.

Pavel Alexeev hubbitus at fedoraproject.org
Sun Dec 18 17:42:02 UTC 2011


commit f3233981e0d9ac53541abbc7da0501d23f42b4d4
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Sun Dec 18 21:26:08 2011 +0400

    Disable xosd support for Fedora > 16 as it orphaned now.

 xneur.spec |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/xneur.spec b/xneur.spec
index 1b0f463..821c49b 100644
--- a/xneur.spec
+++ b/xneur.spec
@@ -3,7 +3,7 @@
 Summary:		X Neural Switcher
 Name:		xneur
 Version:		0.15.0
-Release:		1%{?SVN:.svn%{SVN}}%{?dist}
+Release:		2%{?SVN:.svn%{SVN}}%{?dist}
 License:		GPLv2+
 Group:		User Interface/Desktops
 URL:			http://www.xneur.ru
@@ -14,7 +14,10 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	fontconfig-devel, freetype-devel, glib2-devel, pcre-devel
 BuildRequires:	libX11-devel, gstreamer-devel, freealut-devel >= 1.0.1
-BuildRequires:	enchant-devel, libXpm-devel, imlib2-devel, xosd-devel
+BuildRequires:	enchant-devel, libXpm-devel, imlib2-devel
+%if 0%{?fedora} < 17
+BuildRequires:	xosd-devel
+%endif
 BuildRequires:	gettext-devel, libnotify-devel >= 0.4.0, gtk2-devel
 
 # I dont understand for what icons appeared for daemon, but its there from 0.13 version
@@ -60,7 +63,10 @@ developing applications that use %{name}.
 %endif
 
 # Extra parameters needs to build on Fedora > 13. See https://bugzilla.gnome.org/show_bug.cgi?id=622550
-%configure CFLAGS="%{optflags}" LIBNOTIFY_CFLAGS="%( pkg-config --cflags "libnotify >= 0.4.0" gtk+-2.0 )" LIBNOTIFY_LIBS="%( pkg-config --libs "libnotify >= 0.4.0" gtk+-2.0 )"
+%configure CFLAGS="%{optflags}" LIBNOTIFY_CFLAGS="%( pkg-config --cflags "libnotify >= 0.4.0" gtk+-2.0 )" LIBNOTIFY_LIBS="%( pkg-config --libs "libnotify >= 0.4.0" gtk+-2.0 )" \
+%if 0%{?fedora} > 16
+	--without-xosd
+%endif
 
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -112,6 +118,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sun Dec 18 2011 Pavel Alexeev <Pahan at Hubbitus.info> - 0.15.0-2
+- Disable xosd support for Fedora > 16 as it orphaned now.
+
 * Sun Dec 18 2011 Pavel Alexeev <Pahan at Hubbitus.info> - 0.15.0-1
 - Update to 0.15.0 version
 


More information about the scm-commits mailing list