rpms/ucview/EL-5 ucview.spec,1.1,1.2

Robert Scheck (robert) fedora-extras-commits at redhat.com
Mon May 19 20:46:31 UTC 2008


Author: robert

Update of /cvs/pkgs/rpms/ucview/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11727

Modified Files:
	ucview.spec 
Log Message:
Fixed *.desktop handling and DBUS support


Index: ucview.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ucview/EL-5/ucview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ucview.spec	19 May 2008 19:18:34 -0000	1.1
+++ ucview.spec	19 May 2008 20:45:42 -0000	1.2
@@ -9,8 +9,11 @@
 Source1:          %{name}.desktop
 BuildRequires:    intltool, /usr/bin/perl, perl(XML::Parser), gettext
 BuildRequires:    unicap-devel >= 0.2.2, gtk2-devel >= 2.8.0, libglade2-devel
-BuildRequires:    dbus-glib-devel, glib2-devel, GConf2-devel, libXv-devel
-BuildRequires:    libtheora-devel, libvorbis-devel, desktop-file-utils
+BuildRequires:    glib2-devel, GConf2-devel, libXv-devel, desktop-file-utils
+BuildRequires:    libtheora-devel, libvorbis-devel
+%if 0%{?rhel} > 5
+BuildRequires:    dbus-glib-devel >= 0.73
+%endif
 Requires:         hicolor-icon-theme
 Requires(pre):    GConf2
 Requires(post):   GConf2, scrollkeeper
@@ -40,7 +43,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # Install a working ucview.desktop file
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
+desktop-file-install --vendor "" --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE1}
 
 # Don't install header files for ucview
 rm -rf $RPM_BUILD_ROOT%{_includedir}
@@ -87,7 +90,9 @@
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/%{name}.desktop
+%if 0%{?rhel} > 5
 %{_datadir}/dbus-1/services/*.service
+%endif
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
 %changelog




More information about the fedora-extras-commits mailing list