rpms/me-tv/F-11 import.log,1.7,1.8 me-tv.spec,1.7,1.8

[zarko pintar]

Author: grof

Update of /cvs/pkgs/rpms/me-tv/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8810/F-11

Modified Files:
	import.log me-tv.spec 
Log Message:



Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/F-11/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- import.log	22 Jan 2010 10:27:55 -0000	1.7
+++ import.log	12 Feb 2010 13:55:53 -0000	1.8
@@ -5,3 +5,4 @@ me-tv-1_0_0-1_fc11:F-11:me-tv-1.0.0-1.fc
 me-tv-1_0_0-2_fc11:F-11:me-tv-1.0.0-2.fc11.src.rpm:1253085311
 me-tv-1_1_3-1_fc12:F-11:me-tv-1.1.3-1.fc12.src.rpm:1263368517
 me-tv-1_1_6-1_fc12:F-11:me-tv-1.1.6-1.fc12.src.rpm:1264156380
+me-tv-1_1_6-2_fc12:F-11:me-tv-1.1.6-2.fc12.src.rpm:1265983286


Index: me-tv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/me-tv/F-11/me-tv.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- me-tv.spec	22 Jan 2010 10:27:55 -0000	1.7
+++ me-tv.spec	12 Feb 2010 13:55:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           me-tv
 Version:        1.1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME desktop application for watching digital television
 
 Group:          Applications/Multimedia
@@ -15,7 +15,6 @@ BuildRequires: libgnomeuimm26-devel
 BuildRequires: xine-lib-devel
 BuildRequires: gnet2-devel
 BuildRequires: gconfmm26-devel
-BuildRequires: gconfmm26-devel
 BuildRequires: intltool
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
@@ -41,7 +40,9 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 
@@ -52,6 +53,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database &> /dev/null || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/me-tv.schemas > /dev/null || :
+
+%pre
+if [ "$1" -gt 1 ]; then
+   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/me-tv.schemas > /dev/null || :
+fi
+
+%preun
+if [ "$1" -gt 1 ]; then
+   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+   gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/me-tv.schemas > /dev/null || :
+fi
 
 %postun
 update-desktop-database &> /dev/null || :
@@ -70,6 +85,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Fri Feb 12 2010 Zarko <zarko.pintar at gmail.com> - 1.1.6-2
+- Fixed schema installation
+- spec cleaning
+
 * Fri Jan 22 2010 Zarko <zarko.pintar at gmail.com> - 1.1.6-1
 - new release