rpms/imsettings/devel imsettings.spec,1.35,1.36
Akira TAGOH
tagoh at fedoraproject.org
Mon Aug 31 03:07:12 UTC 2009
Author: tagoh
Update of /cvs/pkgs/rpms/imsettings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29415
Modified Files:
imsettings.spec
Log Message:
* Mon Aug 31 2009 Akira TAGOH <tagoh at redhat.com>
- Add a conditional build to disable xfce module for RHEL.
Index: imsettings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/imsettings/devel/imsettings.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- imsettings.spec 27 Aug 2009 08:08:11 -0000 1.35
+++ imsettings.spec 31 Aug 2009 03:07:12 -0000 1.36
@@ -8,7 +8,9 @@ BuildRequires: desktop-file-utils
BuildRequires: intltool gettext
BuildRequires: dbus-devel >= 0.23, dbus-glib-devel >= 0.74, glib2 >= 2.16
BuildRequires: libgxim-devel >= 0.3.1, libnotify-devel
+%if !0%{?rhel}
BuildRequires: xfconf-devel
+%endif
BuildRequires: GConf2-devel
BuildRequires: libX11-devel
Source0: http://imsettings.googlecode.com/files/%{name}-%{version}.tar.bz2
@@ -63,6 +65,7 @@ or the desktop.
This package contains the development files to make any
applications with imsettings.
+%if !0%{?rhel}
%package xfce
Summary: Xfce support on imsettings
Group: Applications/System
@@ -77,6 +80,7 @@ immediately without any need to restart
or the desktop.
This package contains a plugin to get this working on Xfce.
+%endif
%prep
%setup -q
@@ -103,6 +107,10 @@ chmod 0755 $RPM_BUILD_ROOT%{_sysconfdir}
# clean up the unnecessary files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/mcs-plugins/*.la
+%if 0%{?rhel}
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop
+rm -f $RPM_BUILD_ROOT%{_bindir}/imsettings-xfce-helper
+%endif
# still not stable
rm -f $RPM_BUILD_ROOT%{_datadir}/dbus-1/services/qt-im-settings-daemon.service
@@ -193,14 +201,19 @@ fi
%{_libdir}/libimsettings-xim.so
%{_libdir}/pkgconfig/imsettings.pc
+%if !0%{?rhel}
%files xfce
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/imsettings-xfce-helper
%{_sysconfdir}/xdg/autostart/imsettings-xfce-helper.desktop
+%endif
%changelog
+* Mon Aug 31 2009 Akira TAGOH <tagoh at redhat.com>
+- Add a conditional build to disable xfce module for RHEL.
+
* Thu Aug 27 2009 Akira TAGOH <tagoh at redhat.com> - 0.107.2-1
- New upstream release.
- Stop IM process properly with the DBus disconnect signal. (#518970)
More information about the scm-commits
mailing list