SPECS: gnome-sensors.spec - resolved conflict

[qboosh]

Author: qboosh                       Date: Wed Feb 14 21:42:17 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- resolved conflict

---- Files affected:
SPECS:
   gnome-sensors.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SPECS/gnome-sensors.spec
diff -u SPECS/gnome-sensors.spec:1.32 SPECS/gnome-sensors.spec:1.33
--- SPECS/gnome-sensors.spec:1.32	Tue Feb 13 08:16:47 2007
+++ SPECS/gnome-sensors.spec	Wed Feb 14 22:42:12 2007
@@ -5,34 +5,20 @@
 Summary:	GNOME applet that monitors hardware sensors
 Summary(pl.UTF-8):	Aplet GNOME monitorujący czujniki sprzętowe
 Name:		gnome-sensors
-<<<<<<< gnome-sensors.spec
-Version:	1.6.1
-Release:	0.1
-=======
 Version:	1.7.8
 Release:	1
->>>>>>> 1.30
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/sensors-applet/sensors-applet-%{version}.tar.gz
-<<<<<<< gnome-sensors.spec
-# Source0-md5:	b1feac15a8354fe0f3fd62a16b38293d
-=======
 # Source0-md5:	0d71eaae6f4bad3c1b6d44d71929d954
->>>>>>> 1.30
 URL:		http://sensors-applet.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-<<<<<<< gnome-sensors.spec
-BuildRequires:	gnome-panel-devel >= 2.8.0
-BuildRequires:	gtk+2-devel >= 2:2.6.0
-=======
 BuildRequires:	gnome-doc-utils >= 0.7.2
 BuildRequires:	gnome-panel-devel >= 2.15.92
 BuildRequires:	gtk+2-devel >= 2:2.10.2
 BuildRequires:	libnotify-devel >= 0.4.2
->>>>>>> 1.30
 BuildRequires:	libtool
 BuildRequires:	libxslt-progs >= 1.1.17
 BuildRequires:	lm_sensors-devel >= 2.10.0
@@ -86,13 +72,8 @@
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_libdir}/sensors-applet
 %{_libdir}/bonobo/servers/SensorsApplet.server
-<<<<<<< gnome-sensors.spec
-%dir %{_pixmapsdir}/sensors-applet
-%{_pixmapsdir}/sensors-applet/*
-=======
 %{_iconsdir}/hicolor/*/*/sensors-*
 %{_pixmapsdir}/sensors-applet
->>>>>>> 1.30
 %{_datadir}/gnome-2.0/ui/SensorsApplet.xml
 %dir %{_omf_dest_dir}/%{_orig_name}
 %{_omf_dest_dir}/%{_orig_name}/*-C.omf
@@ -103,6 +84,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2007/02/14 21:42:12  qboosh
+- resolved conflict
+
 Revision 1.32  2007/02/13 07:16:47  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-sensors.spec?r1=1.32&r2=1.33&f=u