Automatic import for version 0.8.6

.abf.yml

@@ -1,2 +1,2 @@
 sources:
-  "gsmartcontrol-0.8.5.tar.bz2": ac14276b64931e7f377910df4f2ebd1973bd604d
+  "gsmartcontrol-0.8.6.tar.bz2": e05dda2815921aa0d2aa18850e2e715c1a5e00e0

gsmartcontrol-0.8.6-glib2.31.patch

@@ -0,0 +1,22 @@
+diff -urN gsmartcontrol-0.8.6/src/hz/sync_policy_glib.h gsmartcontrol-0.8.6-patched/src/hz/sync_policy_glib.h
+--- gsmartcontrol-0.8.6/src/hz/sync_policy_glib.h	2011-03-06 19:21:07.000000000 +1000
++++ gsmartcontrol-0.8.6-patched/src/hz/sync_policy_glib.h	2011-11-03 02:19:45.689866738 +1100
+@@ -21,16 +21,8 @@
+ // The warnings are completely harmless and visible on some versions of glib only.
+ // However, due to their number, I decided to implement this workaround.
+ 
+-#ifndef _WIN32
+-	// same as stock version, but an additional cast to (void*) is added.
+-	#define hz_glib_static_mutex_get_mutex(mutex) \
+-		( g_thread_use_default_impl ? ((GMutex*) ((void*)((mutex)->static_mutex.pad))) : \
+-		g_static_mutex_get_mutex_impl_shortcut(&((mutex)->runtime_mutex)) )
+-
+-#else
+-	// win32 has different definition of this macro, so default to stock version.
+-	#define hz_glib_static_mutex_get_mutex(mutex) g_static_mutex_get_mutex(mutex)
+-#endif
++//GLib API changed in 2.31 and the workaround doesn't work anymore, so use stock version
++#define hz_glib_static_mutex_get_mutex(mutex) g_static_mutex_get_mutex(mutex)
+ 
+ 
+ #define hz_glib_static_mutex_lock(mutex) \

gsmartcontrol.spec

@@ -1,14 +1,18 @@
 Name:		gsmartcontrol
-Version:	0.8.5
-Release:	%mkrel 2
+Version:	0.8.6
+Release:	%mkrel 1
 License:	GPLv2, GPLv3
 Url:		http://gsmartcontrol.berlios.de
 Group:		System/Kernel and hardware
 Source:		http://download.berlios.de/%{name}/%{name}-%{version}.tar.bz2
+Patch0:		gsmartcontrol-0.8.6-glib2.31.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 Summary:	GSmartControl - Hard Disk Health Inspection Tool
-Requires: smartmontools, gtkmm2.4 >= 2.12.0
-BuildRequires: pcre-devel, gtkmm2.4-devel >= 2.12.0
+Requires:	gtkmm2.4 >= 2.12.0
+Requires:	smartmontools
+Requires:	usermode-consoleonly
+BuildRequires:	pcre-devel
+BuildRequires:	gtkmm2.4-devel >= 2.12.0
 
 
 %description
@@ -19,6 +23,10 @@ SMART data to determine its health, as well as run various tests on it.
 
 %prep
 %setup -q
+%if %{mdvver} > 201100
+#GLib API changed in 2.31 so use patch
+%patch0 -p1 -b .glib2.31
+%endif
 sed -i -e "s/Exec=.*gsmartcontrol-root\"/Exec=gsmartcontrol/" data/gsmartcontrol.desktop.in
 
 %build
@@ -29,27 +37,32 @@ sed -i -e "s/Exec=.*gsmartcontrol-root\"/Exec=gsmartcontrol/" data/gsmartcontrol
 rm -fr %buildroot
 %makeinstall_std
 
-mkdir %{buildroot}/%{_sbindir}
-mv %{buildroot}/%{_bindir}/gsmartcontrol %{buildroot}/%{_sbindir}/gsmartcontrol
-ln -s %{_bindir}/consolehelper %{buildroot}/%{_bindir}/gsmartcontrol
+mkdir %{buildroot}%{_sbindir}
+mv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name}
+ln -s %{_bindir}/consolehelper %{buildroot}%{_bindir}/%{name}
 
 %clean
 rm -rf %buildroot
 
 %files
-%doc %{_datadir}/doc/gsmartcontrol
+%doc %{_datadir}/doc/%{name}
 %defattr(-,root,root)
 %attr(0755,root,root) %{_bindir}/*
-%attr(0755,root,root) %{_sbindir}/gsmartcontrol
-%{_datadir}/gsmartcontrol
-%{_datadir}/applications/*.desktop
+%attr(0755,root,root) %{_sbindir}/%{name}
+%{_datadir}/%{name}
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/*
 %{_datadir}/pixmaps/*
-%{_mandir}/man1/gsmartcontrol-root.1*
-%{_mandir}/man1/gsmartcontrol.1*
+%{_mandir}/man1/%{name}-root.1*
+%{_mandir}/man1/%{name}.1*
 
 
 %changelog
+* Wed Nov 02 2011 Andrey Bondrov <abondrov@mandriva.org> 0.8.6-1mdv2012.0
++ Revision: 712293
+- Add patch0 to fix build with glib 2.31
+- New version 0.8.6
+
 * Sun Dec 05 2010 Oden Eriksson <oeriksson@mandriva.com> 0.8.5-2mdv2011.0
 + Revision: 610986
 - rebuild