commit computertemp for openSUSE:Factory
Hello community,
here is the log from the commit of package computertemp for openSUSE:Factory
checked in at Fri Sep 4 01:00:30 CEST 2009.
--------
--- GNOME/computertemp/computertemp.changes 2009-08-14 03:04:02.000000000 +0200
+++ computertemp/computertemp.changes 2009-08-28 17:28:13.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 28 17:20:07 CEST 2009 - vuntz@novell.com
+
+- Merge the changes that were done in GNOME:Contrib: update
+ BuildRequires, Requires, and clean up the spec file.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
computertemp-use-libexecdir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ computertemp.spec ++++++
--- /var/tmp/diff_new_pack.vcuxJt/_old 2009-09-04 00:58:47.000000000 +0200
+++ /var/tmp/diff_new_pack.vcuxJt/_new 2009-09-04 00:58:47.000000000 +0200
@@ -15,21 +15,27 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-BuildRequires: gconf2-devel gnome-common perl-XML-Parser python-devel update-desktop-files
-BuildRequires: python-gtk-devel
Name: computertemp
-Summary: Computer Temperature Monitor is a little applet for the GNOME desktop that shows the temperature of your computer CPU and disks on screen.
Version: 0.9.6.1
-Release: 5
+Release: 6
License: GPL v2 only
+Summary: GNOME Panel Applet displaying the temperature of your CPU and disks
+Url: http://computertemp.berlios.de
Group: System/GUI/GNOME
Source0: %{name}-%{version}.tar.bz2
-Url: http://computertemp.berlios.de
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# PATCH-FIX-OPENSUSE computertemp-use-libexecdir.patch vuntz@novell.com -- Make it install the applet in the right directory
+Patch0: computertemp-use-libexecdir.patch
+BuildRequires: fdupes
+BuildRequires: gconf2-devel
+# For directory ownership:
+BuildRequires: gnome-panel
+BuildRequires: intltool
+BuildRequires: python-gtk-devel
Requires: %{name}-lang = %{version}
+Requires: gnome-python-desktop
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%py_requires
%if %suse_version <= 1110
%define python_sitelib %{py_sitedir}
@@ -47,16 +53,19 @@
%lang_package
%prep
%setup -q
+%patch0 -p1
%build
%configure \
- --disable-schemas-install
-%__make
+ --disable-schemas-install \
+ --libexecdir=%{_libexecdir}/gnome-panel
+%__make %{?jobs:-j%jobs}
%install
%makeinstall
%find_gconf_schemas
%find_lang %{name}
+%fdupes %{buildroot}%{py_sitedir}
%pre -f %{name}.schemas_pre
@@ -65,18 +74,15 @@
%posttrans -f %{name}.schemas_posttrans
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files -f %{name}.schemas_list
%defattr(-, root, root)
-%doc AUTHORS NEWS README TODO
-%dir %{_libdir}/bonobo
-%dir %{_libdir}/bonobo/servers
-%dir %{_libdir}/gnome-applets
-%{_libdir}/gnome-applets/computertemp
+%doc AUTHORS ChangeLog NEWS README TODO
+%{_libexecdir}/gnome-panel/computertemp
%{_libdir}/bonobo/servers/*.server
-%{_datadir}/computertemp
-%{python_sitelib}/%{name}/
+%{_datadir}/computertemp/
+%{python_sitelib}/computertemp/
%files lang -f %{name}.lang
++++++ computertemp-use-libexecdir.patch ++++++
Index: computertemp-0.9.6.1/configure
===================================================================
--- computertemp-0.9.6.1.orig/configure
+++ computertemp-0.9.6.1/configure
@@ -6669,7 +6669,7 @@ fi
-appletdir=${prefix}/lib/gnome-applets
+appletdir=${libexecdir}
ac_config_files="$ac_config_files Makefile computertemp/Makefile computertemp/computertemp_globals.py scripts/Makefile data/Makefile data/computertemp.schemas data/GNOME_ComputertempApplet.server.in images/Makefile po/Makefile.in"
Index: computertemp-0.9.6.1/configure.ac
===================================================================
--- computertemp-0.9.6.1.orig/configure.ac
+++ computertemp-0.9.6.1/configure.ac
@@ -24,7 +24,7 @@ PKG_CHECK_MODULES(GCONF, gconf-2.0)
AC_PATH_PROG(GCONFTOOL, gconftool-2)
AM_GCONF_SOURCE_2
-appletdir=${prefix}/lib/gnome-applets
+appletdir=${libexecdir}
AC_SUBST(appletdir)
AC_OUTPUT([
Index: computertemp-0.9.6.1/data/GNOME_ComputertempApplet.server.in
===================================================================
--- computertemp-0.9.6.1.orig/data/GNOME_ComputertempApplet.server.in
+++ computertemp-0.9.6.1/data/GNOME_ComputertempApplet.server.in
@@ -1,7 +1,7 @@
participants (1)
-
root@Hilbert.suse.de