[exo] - Update to 0.5.6 - Drop obsolete BR for dbus-glib
Christoph Wickert
cwickert at fedoraproject.org
Thu Jan 6 22:31:43 UTC 2011
commit 6edad6eb0d8b372a6d01639235b61f938527eadf
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Thu Jan 6 23:31:27 2011 +0100
- Update to 0.5.6
- Drop obsolete BR for dbus-glib
.gitignore | 1 +
exo-0.3.0-x86_64-build.patch | 14 ----
exo-0.3.105-mount-utf8.patch | 25 ------
exo-0.3.107-libnotify.patch | 12 ---
exo.spec | 169 ++++++++++++++++++++++++------------------
sources | 2 +-
6 files changed, 98 insertions(+), 125 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 79e5515..b185316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
exo-0.3.107.tar.bz2
+/exo-0.5.6.tar.bz2
diff --git a/exo.spec b/exo.spec
index 440bf14..0bd7686 100644
--- a/exo.spec
+++ b/exo.spec
@@ -1,129 +1,140 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-Summary: Application library for the Xfce desktop environment
-Name: exo
-Version: 0.3.107
-Release: 5%{?dist}
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+%global minorversion 0.5
+%global xfceversion 4.7
+
+Name: exo
+Version: 0.5.6
+Release: 1%{?dist}
+Summary: Application library for the Xfce desktop environment
+
+Group: System Environment/Libraries
# libexo-hal exo-helper mount-notify and exo-mount are all GPLv2+
# everything else is LGPLv2+
-License: LGPLv2+ and GPLv2+
-URL: http://xfce.org/
-Source0: http://archive.xfce.org/src/xfce/exo/0.3/exo-%{version}.tar.bz2
-Patch0: exo-0.3.0-x86_64-build.patch
-# to not bring https://bugzilla.redhat.com/show_bug.cgi?id=508823 back
-Patch2: exo-0.3.105-mount-utf8.patch
-Patch3: exo-0.3.107-libnotify.patch
-Group: System Environment/Libraries
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: dbus-glib >= 0.22
-Requires: xfce4-doc
-BuildRequires: dbus-devel >= 0.22
-BuildRequires: gtk-doc
-BuildRequires: pygtk2-devel
-BuildRequires: gettext
-BuildRequires: python-devel
-BuildRequires: perl-URI
-BuildRequires: libxfce4util-devel
-BuildRequires: hal-devel libnotify-devel
-BuildRequires: intltool >= 0.31
-BuildRequires: chrpath
-BuildRequires: desktop-file-utils
+License: LGPLv2+ and GPLv2+
+URL: http://xfce.org/
+Source0: http://archive.xfce.org/src/xfce/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
+# FIXME: upstream this patch
+Patch0: exo-0.5.4-x86_64-build.patch
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: dbus-devel >= 0.22
+BuildRequires: gtk-doc
+BuildRequires: pygtk2-devel
+BuildRequires: gettext
+BuildRequires: python-devel
+BuildRequires: perl-URI
+BuildRequires: libxfce4util-devel >= %{xfceversion}
+BuildRequires: hal-devel libnotify-devel
+BuildRequires: intltool >= 0.31
+BuildRequires: chrpath
+BuildRequires: desktop-file-utils
%description
Extension library for Xfce, targeted at application development.
-%package devel
-Summary: Development tools for exo library
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: libxfce4util-devel
-Requires: hal-devel
-Requires: pkgconfig
+%package devel
+Summary: Development tools for exo library
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: libxfce4util-devel
+Requires: hal-devel
+Requires: pkgconfig
%description devel
Development tools and static libraries and header files for the exo library.
-%package -n python-exo
-Summary: Python tools for exo library
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+%package -n python-exo
+Summary: Python tools for exo library
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
%description -n python-exo
Python libraries and header files for the exo library.
+
%prep
%setup -q
%patch0 -p1 -b .x86_64-build
-%patch2 -p1 -b .utf8
-%patch3 -p1 -b .libnotify
+
%build
%configure --enable-gtk-doc --disable-static
-
-# using %{?_smp_mflags} causes a multilib conflict, disable it for now
-make
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-mount
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-desktop-item-edit
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-open
-chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/exo-helper-0.3
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-0.3/_exo.so
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/xfce4/exo-*/exo-helper-*
+chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-*/_exo.so
+%if 0%{?fc13}%{?fc14}%{?el6}
+ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gio/modules/libexo-module-*.so
+%endif
+
+%find_lang exo-1
-%find_lang libexo-0.3
+for file in $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}-*.desktop ; do
+ desktop-file-validate $file
+done
-desktop-file-install \
- --delete-original \
- --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
- ${RPM_BUILD_ROOT}%{_datadir}/applications/exo-preferred-applications.desktop
%clean
rm -rf $RPM_BUILD_ROOT
+
%post
-touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/sbin/ldconfig
+if [ $1 -eq 1 ] ; then
+ # For upgrades, the cache will be regenerated by the new package's %postun
+ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules || :
+fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
%postun
+/sbin/ldconfig
+%if 0%{?fc13}%{?fc14}%{?el6}
+ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules &> /dev/null || :
+%endif
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
-/sbin/ldconfig
+
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%files -f libexo-0.3.lang
+
+%files -f exo-1.lang
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog NEWS README THANKS TODO COPYING
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/mount.rc
-%{_libdir}/lib*.so.*
-%{_datadir}/xfce4/helpers
-%doc %{_datadir}/xfce4/doc/*/images/*
-%doc %{_datadir}/xfce4/doc/*/*.html
-%{_mandir}/man1/exo-open.1.*
+%doc AUTHORS ChangeLog NEWS README THANKS COPYING
+%doc %{_docdir}/exo/
+%dir %{_sysconfdir}/xdg/xfce4
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/helpers.rc
%{_bindir}/exo-desktop-item-edit
%{_bindir}/exo-open
%{_bindir}/exo-preferred-applications
-%{_bindir}/exo-eject
-%{_bindir}/exo-mount
-%{_bindir}/exo-unmount
-%config(noreplace) %{_sysconfdir}/xdg/xfce4/helpers.rc
-%{_libexecdir}/exo-helper-0.3
-%{_libexecdir}/exo-mount-notify-0.3
-%{_libexecdir}/exo-compose-mail-0.3
-%{_datadir}/applications/exo-preferred-applications.desktop
-%{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/pixmaps/exo-0.3/
+%{_libdir}/lib*.so.*
+%{_libdir}/xfce4/
+%if 0%{?fc13}%{?fc14}%{?el6}
+ %{_libdir}/gio/modules/libexo-module-*.so
+%endif
+%{_datadir}/xfce4/
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/pixmaps/exo-*/
+%{_mandir}/man1/exo-open.1.*
%files devel
%defattr(-, root, root,-)
+%doc TODO
%doc %{_datadir}/gtk-doc
%{_bindir}/exo-csource
%{_includedir}/exo*
@@ -134,10 +145,22 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -n python-exo
%defattr(-, root, root,-)
-%{python_sitearch}/exo-*
+%{python_sitearch}/exo-*/
%{python_sitearch}/pyexo.*
%changelog
+* Sun Jan 02 2011 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.6-1
+- Update to 0.5.6
+- Drop obsolete BR for dbus-glib
+
+* Sat Dec 04 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.5-1
+- Update to 0.5.5
+- Fix directory ownership
+- Run gio-querymodules to update giomodule.cache
+
+* Sun Nov 07 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.5.4-1
+- Update to 0.5.4
+
* Fri Nov 05 2010 Kevin Fenzi <kevin at tummy.com> - 0.3.107-5
- Rebuild for new libnotify
diff --git a/sources b/sources
index 37b43cb..5331031 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3a92cca0c99ee940db4410891c9e8498 exo-0.3.107.tar.bz2
+f739b307e656b908fa0d26d568979d7e exo-0.5.6.tar.bz2
More information about the scm-commits
mailing list