rpms/nailer/devel nailer-0.4.3-glib.patch, NONE, 1.1 nailer.spec, 1.4, 1.5

[Julian Sikorski]

Author: belegdol

Update of /cvs/free/rpms/nailer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26720

Modified Files:
	nailer.spec 
Added Files:
	nailer-0.4.3-glib.patch 
Log Message:
* Sat Feb 11 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.4.3-7
- Fixed build failures
- Dropped obsolete Group, Buildroot, %clean and %defattr
- Updated scriptlets to the latest spec


nailer-0.4.3-glib.patch:
 main.c |    1 -
 1 file changed, 1 deletion(-)

--- NEW FILE nailer-0.4.3-glib.patch ---
diff -up nailer-0.4.3/src/main.c.glib nailer-0.4.3/src/main.c
diff -up nailer-0.4.3/src/main.c.glib nailer-0.4.3/src/main.c
--- nailer-0.4.3/src/main.c.glib	2008-09-02 22:22:54.000000000 +0200
+++ nailer-0.4.3/src/main.c	2012-02-11 15:23:16.914812245 +0100
@@ -24,7 +24,6 @@
 
 #include <glib.h>
 #include <glib/gstdio.h>
-#include <glib/gstrfuncs.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <string.h>
 #include "left.h"


Index: nailer.spec
===================================================================
RCS file: /cvs/free/rpms/nailer/devel/nailer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nailer.spec	8 Feb 2012 21:54:13 -0000	1.4
+++ nailer.spec	11 Feb 2012 14:30:30 -0000	1.5
@@ -1,14 +1,13 @@
 Name:           nailer
 Version:        0.4.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A thumbnail generator using mplayer
 
-Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://kdekorte.googlepages.com/nailer
 Source0:        http://mplayer-video-thumbnailer.googlecode.com/files/%{name}-%{version}.tar.gz
-Patch0:         nailer-0.4.3-gconf.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         %{name}-%{version}-gconf.patch
+Patch1:         %{name}-%{version}-glib.patch
 
 BuildRequires:  GConf2
 BuildRequires:  gtk2-devel
@@ -29,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .gconf
+%patch1 -p1 -b .glib
 
 
 %build
@@ -47,40 +47,31 @@
 #remove the desktop file
 rm -rf $RPM_BUILD_ROOT%{_datadir}/thumbnailers
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %pre
-if [ "$1" -gt 1 ] ; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/nailer.schemas >/dev/null || :
-fi
+%gconf_schema_prepare
 
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/nailer.schemas > /dev/null || :
+%gconf_schema_upgrade
 
 
 %preun
-if [ "$1" -eq 0 ] ; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/nailer.schemas > /dev/null || :
-fi
+%gconf_schema_remove
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING ChangeLog
 %{_sysconfdir}/gconf/schemas/nailer.schemas
 %{_bindir}/nailer
 
 
 %changelog
+* Sat Feb 11 2012 Julian Sikorski <belegdol at fedoraproject.org> - 0.4.3-7
+- Fixed build failures
+- Dropped obsolete Group, Buildroot, %%clean and %%defattr
+- Updated scriptlets to the latest spec
+
 * Wed Feb 08 2012 Nicolas Chauvet <kwizart at gmail.com> - 0.4.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild