Mailinglist Archive: opensuse-commit (1426 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package lavaps
checked in at Thu Mar 15 01:41:47 CET 2007.

--------
--- lavaps/lavaps.changes	2007-01-12 19:20:39.000000000 +0100
+++ /mounts/work_src_done/STABLE/lavaps/lavaps.changes	2007-03-13 11:33:24.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Mar 13 11:30:20 CET 2007 - anosek@xxxxxxx
+
+- corrected installation of gconf schema
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ lavaps.spec ++++++
--- /var/tmp/diff_new_pack.L32266/_old	2007-03-15 01:41:35.000000000 +0100
+++ /var/tmp/diff_new_pack.L32266/_new	2007-03-15 01:41:35.000000000 +0100
@@ -16,9 +16,9 @@
 %define       sysconfdir /etc
 Summary:        A Lava Lamp of Currently Running Processes
 Version:        2.7
-Release:        59
+Release:        65
 License:        GNU General Public License (GPL)
-PreReq:         filesystem gconf2
+PreReq:         filesystem gconf2 gconf2-devel
 Group:          Amusements/Toys/Graphics
 URL:            http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
 Source:         %{name}-%{version}.tar.bz2
@@ -33,6 +33,7 @@
 Patch9:         %{name}-%{version}-cflags.dif
 Patch10:        %{name}-%{version}-HZ.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%{gconf_schemas_prereq}
 
 %description
 Lavaps is an interactive process-tracking program like top, but with a
@@ -76,36 +77,40 @@
 			--with-tk-ver=$TCL_VER \
 			--with-tcltk-lib-suffix-type=dot \
 			--libdir=%{prefix}/%{_lib} \
-			--sysconfdir=%{sysconfdir}
+			--sysconfdir=%{sysconfdir} \
+			--disable-schemas-install
 make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 mkdir -p $RPM_BUILD_ROOT/usr/share/applications/
 install -m 0644 %SOURCE1 \
          $RPM_BUILD_ROOT/usr/share/applications/
 %suse_update_desktop_file %name System Monitor
-%{find_lang} lavaps 
+%find_gconf_schemas
+%{find_lang} %{name} 
+cat %{name}.schemas_list %{name}.lang > %{name}.lst
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source`
-usr/bin/gconftool-2 --makefile-install-rule etc/gconf/schemas/lavaps.schemas >/dev/null
+%pre -f %{name}.schemas_pre
 
-%files -f lavaps.lang
+%preun -f %{name}.schemas_preun
+
+%posttrans -f %{name}.schemas_posttrans
+
+%files -f %{name}.lst
 %defattr(-,root,root)
 %doc README COPYING
 %doc %{_mandir}/man1/*
 %{prefix}/bin/lavaps
 %{prefix}/share/applications/*.desktop
-%{sysconfdir}/gconf/schemas/lavaps.schemas
 
-%changelog -n lavaps
+%changelog
+* Tue Mar 13 2007 - anosek@xxxxxxx
+- corrected installation of gconf schema
 * Fri Jan 12 2007 - anosek@xxxxxxx
 - changed prefix /opt/gnome -> /usr
 * Mon Jul 24 2006 - mmarek@xxxxxxx



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx