Hello community,
here is the log from the commit of package exo for openSUSE:Factory checked in
at 2012-04-18 16:30:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/exo (Old)
and /work/SRC/openSUSE:Factory/.exo.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "exo", Maintainer is "xfce-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/exo/exo.changes 2011-10-25 15:50:55.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.exo.new/exo.changes 2012-04-18
16:30:43.000000000 +0200
@@ -1,0 +2,28 @@
+Sat Mar 31 09:39:09 UTC 2012 - g...@opensuse.org
+
+- fix provides
+
+-------------------------------------------------------------------
+Sun Mar 25 09:35:08 UTC 2012 - g...@opensuse.org
+
+- -branding-upstream should supplement exo-data
+- replace %lang_package by a manually specfified -lang package
+- %{libname} should recommend -lang since there are translations
+ for the library
+- drop rpmlintrc
+
+-------------------------------------------------------------------
+Mon Mar 19 18:19:40 UTC 2012 - g...@opensuse.org
+
+- split exo into libexo-1-0, exo-tools, and exo-data in order to
+ conform to the shared library packaging policy
+- added exo-icons.tar.bz2 with icons from tango-icon-theme 0.8.90
+ in order to provide icons for all desktop files and to prevent a
+ dependency on an icon theme
+- specfile cleanup
+- added exo-fix-python-install-location.patch in order to install
+ all python files under %%{python_sitearch}
+- dropped exo-env.patch, shebang lines are fixed during build
+ instead
+
+-------------------------------------------------------------------
Old:
----
exo-env.patch
exo-rpmlintrc
New:
----
exo-fix-python-install-location.patch
exo-icons.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ exo.spec ++++++
--- /var/tmp/diff_new_pack.Rq7TuX/_old 2012-04-18 16:30:44.000000000 +0200
+++ /var/tmp/diff_new_pack.Rq7TuX/_new 2012-04-18 16:30:44.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package exo
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,99 +16,140 @@
#
+%define libname libexo-1-0
Name: exo
Version: 0.6.2
-Release: 1
-License: GPL-2.0+ ; LGPL-2.1+
+Release: 0
Summary: Application Development Library for Xfce
-Url: http://www.xfce.org/projects/exo/
+License: GPL-2.0+ ; LGPL-2.1+
Group: System/Libraries
-Source: %{name}-%{version}.tar.bz2
-Source1: %{name}-rpmlintrc
-# PATCH-FIX-OPENSUSE exo-firefox-params.patch bwa...@suse.de -- Removes
obsolete Firefox commandline arguments
-Patch0: %{name}-firefox-params.patch
-# PATCH-FIX-OPENSUSE exo-env.patch g...@opensuse.org -- Removes the usage of
/usr/bin/env from the shebang line
-Patch1: %{name}-env.patch
+Url: http://docs.xfce.org/xfce/exo/start
+Source0:
http://archive.xfce.org/src/xfce/exo/0.6/%{name}-%{version}.tar.bz2
+# icons taken from tango-icon-theme 0.8.90
+Source1: %{name}-icons.tar.bz2
+# PATCH-FIX-UPSTREAM exo-firefox-params.patch bwa...@suse.de -- Removes
obsolete Firefox commandline arguments
+Patch0: exo-firefox-params.patch
+# PATCH-FIX-UPSTREAM exo-fix-python-install-location.patch g...@opensuse.org
-- Install all python files under %%{python_sitearch}
+Patch1: exo-fix-python-install-location.patch
BuildRequires: fdupes
BuildRequires: gtk-doc
BuildRequires: intltool
BuildRequires: perl-URI
+BuildRequires: python-devel
+BuildRequires: python-gtk-devel
+BuildRequires: update-desktop-files
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(libstartup-notification-1.0)
BuildRequires: pkgconfig(libxfce4util-1.0)
-BuildRequires: python-devel
-BuildRequires: python-gtk-devel
-BuildRequires: update-desktop-files
-Recommends: %{name}-lang = %{version}
-Recommends: %{name}-doc = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Provides: libexo-1-0 = %{version}
-Obsoletes: libexo-1-0 < %{version}
%description
Exo is an extension library to Xfce which is targeted at application
development.
-%package devel
+%package tools
+Summary: Tools for exo
+License: GPL-2.0+ ; LGPL-2.1+
+Group: System/Libraries
+Requires: %{name}-data = %{version}
+Recommends: %{name}-doc = %{version}
+Provides: exo:%{_bindir}/exo-csource
+Provides: exo:%{_bindir}/exo-desktop-item-edit
+Provides: exo:%{_bindir}/exo-open
+Provides: exo:%{_bindir}/exo-preferred-applications
+
+%description tools
+This package provides tools and helpers for exo.
+
+%package data
+Summary: Helpers Data for exo
+License: GPL-2.0+ ; LGPL-2.1+
+Group: System/Libraries
+Requires: %{name}-branding = %{version}
+BuildArch: noarch
+
+%description data
+This package provides the helpers data for exo.
+
+%package -n %{libname}
+Summary: Application Development Library for Xfce
License: GPL-2.0+ ; LGPL-2.1+
+Group: System/Libraries
+Requires: %{name}-data
+Requires: perl-URI
+Provides: exo = %{version}
+Obsoletes: exo <= 0.6.2
+Recommends: %{name}-lang = %{version}
+
+%description -n %{libname}
+Exo is an extension library to Xfce which is targeted at application
+development.
+
+%package devel
Summary: Development Files for exo
+License: GPL-2.0+ ; LGPL-2.1+
Group: Development/Libraries/C and C++
-Requires: exo = %{version}
-Requires: perl-URI
-Requires: pkgconfig(dbus-1)
-Requires: pkgconfig(glib-2.0)
-Requires: pkgconfig(gtk+-2.0)
-Requires: pkgconfig(libstartup-notification-1.0)
-Requires: pkgconfig(libxfce4util-1.0)
+Requires: %{libname} = %{version}
+Requires: %{name}-tools = %{version}
%description devel
This package contains development files needed for developing applications
based on exo.
%package -n python-exo
-License: GPL-2.0+ ; LGPL-2.1+
Summary: Python Interface to exo
+License: GPL-2.0+ ; LGPL-2.1+
Group: Development/Libraries/Python
-Requires: exo = %{version}
%py_requires
Requires: python-gtk
%description -n python-exo
-Exo is an extension library to Xfce which is targeted at application
-development.
-
This package contains the python interface to exo.
%package doc
-License: GPL-2.0+ ; LGPL-2.1+
Summary: Documentation for exo
+License: GPL-2.0+ ; LGPL-2.1+
Group: Documentation/HTML
-Requires: exo = %{version}
-Requires(pre): %install_info_prereq
+BuildArch: noarch
%description doc
This package contains the HTML documentation for exo.
%package branding-upstream
-License: GPL-2.0+
Summary: Upstream Branding of exo
+License: GPL-2.0+
Group: System/GUI/XFCE
# BRAND: helpers.rc: Controls default applications and MIME handler.
Conflicts: otherproviders(exo-branding)
Provides: exo-branding = %{version}
-Supplements: packageand(exo:branding-upstream)
+Supplements: packageand(exo-data:branding-upstream)
+BuildArch: noarch
%description branding-upstream
This package provides the upstream look and feel for the exo library.
-%lang_package
+# this should be replaced by %%lang_package once bnc#513786 is resolved
+%package lang
+Summary: Languages for package %{name}
+License: GPL-2.0+ ; LGPL-2.1+
+Group: System/Localization
+Requires: %{libname} = %{version}
+Provides: %{name}-lang-all = %{version}
+Supplements: packageand(bundle-lang-other:%{libname})
+BuildArch: noarch
+
+%description lang
+Provides translations to the package %{name}
+
%prep
-%setup -q
-%patch0
-%patch1
+%setup -q -b1
+%patch0 -p1
+%patch1 -p1
+find . -name '*.py' -or -name '*.pl' | \
+ xargs sed -i 's|^#! */usr/bin/env *\(perl\|python\)|#!/usr/bin/\1|'
%build
%configure \
@@ -120,19 +161,19 @@
%install
%make_install
-rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_libdir}/*.la
%{buildroot}%{python_sitearch}/exo-0.6/_exo.la
-# recompile in order strip buildroot from libs
-%py_compile %{buildroot}%{python_sitearch}/exo-0.6/exo/
-%py_compile -O %{buildroot}%{python_sitelib}/
+# install icons
+(
+ cd ../exo-icons
+ find usr -depth -print | cpio -pvd %{buildroot}
+)
-%if %suse_version <= 1130
-rm -f %buildroot/%_libdir/gio/modules/*.la
-%endif
+# recompile in order strip buildroot from libs
+%py_compile -O %{buildroot}%{python_sitearch}/*
%fdupes %{buildroot}%{_datadir}
%fdupes %{buildroot}%{_libdir}
-%fdupes %{buildroot}%{python_sitearch}
# remove unsupported locales
rm -rf %{buildroot}%{_datadir}/locale/{ast,kk,tl_PH,ur_PK}
@@ -145,55 +186,64 @@
%suse_update_desktop_file exo-file-manager
%suse_update_desktop_file exo-web-browser
-%post
-/sbin/ldconfig
-%if 0%{?suse_version} >= 1140
+%post -n %{libname} -p /sbin/ldconfig
+
+%postun -n %{libname} -p /sbin/ldconfig
+
+%post tools
%icon_theme_cache_post
%desktop_database_post
-%endif
-%postun
-/sbin/ldconfig
-%if 0%{?suse_version} >= 1140
+%postun tools
%icon_theme_cache_postun
%desktop_database_postun
-%endif
+
+%files tools
+%defattr(-,root,root)
+%{_bindir}/exo-csource
+%{_bindir}/exo-desktop-item-edit
+%{_bindir}/exo-open
+%{_bindir}/exo-preferred-applications
+%{_datadir}/applications/exo-file-manager.desktop
+%{_datadir}/applications/exo-mail-reader.desktop
+%{_datadir}/applications/exo-preferred-applications.desktop
+%{_datadir}/applications/exo-terminal-emulator.desktop
+%{_datadir}/applications/exo-web-browser.desktop
+%{_mandir}/man1/exo*
+%{_datadir}/icons/*/*/*/*
+
+%files data
+%defattr(-,root,root)
+%dir %{_datadir}/xfce4
+%{_datadir}/xfce4/helpers
%files lang -f exo-1.lang
-%files
+%files -n %{libname}
%defattr(-,root,root)
%doc README ChangeLog NEWS COPYING AUTHORS THANKS TODO
-%{_bindir}/exo*
%{_libdir}/libexo-1.so.*
%dir %{_libdir}/xfce4
%dir %{_libdir}/xfce4/exo-1
+# helper binaries which can be considered part of the API
%{_libdir}/xfce4/exo-1/exo-compose-mail-1
%{_libdir}/xfce4/exo-1/exo-helper-1
-%dir %{_datadir}/xfce4
-%{_datadir}/xfce4/helpers
-%{_datadir}/applications/*
-%{_mandir}/man?/*
-%dir %{_datadir}/pixmaps/exo-1
+# frame image directly used by the library
+%dir %{_datadir}/pixmaps/exo-1/
%{_datadir}/pixmaps/exo-1/exo-thumbnail-frame.png
-%dir %{_datadir}/icons/*/*
-%{_datadir}/icons/*/*/*/
-%if %suse_version <= 1130
-%{_libdir}/gio/modules/libexo-module-1.so
-%endif
%files -n python-exo
%defattr(-,root,root)
-%{python_sitearch}/exo-0.6/
-%{python_sitelib}/pyexo.py*
+%{python_sitearch}/exo-*/
+%{python_sitearch}/pyexo.py
%dir %{_datadir}/pygtk/2.0/defs/exo-0.6
%{_datadir}/pygtk/2.0/defs/exo-0.6/exo.defs
%files devel
%defattr(-,root,root)
%{_includedir}/exo-1
-%{_libdir}/*exo*.so
-%{_libdir}/pkgconfig/*
+%{_libdir}/libexo*.so
+%{_libdir}/pkgconfig/exo*
%{_datadir}/gtk-doc/html/exo-1/
%files doc
++++++ exo-firefox-params.patch ++++++
--- /var/tmp/diff_new_pack.Rq7TuX/_old 2012-04-18 16:30:44.000000000 +0200
+++ /var/tmp/diff_new_pack.Rq7TuX/_new 2012-04-18 16:30:44.000000000 +0200
@@ -1,7 +1,7 @@
-Index: exo-helper/helpers/firefox.desktop.in.in
+Index: exo-0.6.2/exo-helper/helpers/firefox.desktop.in.in
===================================================================
---- exo-helper/helpers/firefox.desktop.in.in.orig
-+++ exo-helper/helpers/firefox.desktop.in.in
+--- exo-0.6.2.orig/exo-helper/helpers/firefox.desktop.in.in
++++ exo-0.6.2/exo-helper/helpers/firefox.desktop.in.in
@@ -6,5 +6,5 @@ _Name=Mozilla Firefox
StartupNotify=false
X-XFCE-Binaries=firefox;firefox-gtk2;firefox-gtk;mozilla-firefox;
@@ -10,10 +10,10 @@
-X-XFCE-CommandsWithParameter=%B -remote "openURL(%s)";%B %s;
+X-XFCE-Commands=%B;
+X-XFCE-CommandsWithParameter=%B %s;
-Index: exo-helper/helpers/mozilla-browser.desktop.in.in
+Index: exo-0.6.2/exo-helper/helpers/mozilla-browser.desktop.in.in
===================================================================
---- exo-helper/helpers/mozilla-browser.desktop.in.in.orig
-+++ exo-helper/helpers/mozilla-browser.desktop.in.in
+--- exo-0.6.2.orig/exo-helper/helpers/mozilla-browser.desktop.in.in
++++ exo-0.6.2/exo-helper/helpers/mozilla-browser.desktop.in.in
@@ -6,5 +6,5 @@ _Name=Mozilla Browser
StartupNotify=false
X-XFCE-Binaries=mozilla;mozilla-gtk2;mozilla-gtk;
++++++ exo-fix-python-install-location.patch ++++++
Index: exo-0.6.2/python/Makefile.in
===================================================================
--- exo-0.6.2.orig/python/Makefile.in
+++ exo-0.6.2/python/Makefile.in
@@ -377,7 +377,7 @@ SUBDIRS = \
defsdir =
$(datadir)/pygtk/2.0/defs/exo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR)
defs_DATA = exo.defs
-pyexodir = $(pythondir)
+pyexodir = $(pyexecdir)
pyexo_PYTHON = pyexo.py
exomoduledir =
$(pyexecdir)/exo-$(LIBEXO_VERSION_MAJOR).$(LIBEXO_VERSION_MINOR)/exo
exomodule_PYTHON = __init__.py
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
