[exo] Update to 0.8.0 (Xfce 4.10 final)
Christoph Wickert
cwickert at fedoraproject.org
Sat Apr 28 22:33:09 UTC 2012
commit c9c2a67de647b452bcf5352887f9484cf91743d3
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date: Sun Apr 29 00:33:02 2012 +0200
Update to 0.8.0 (Xfce 4.10 final)
- Make build verbose
- Add VCS key
.gitignore | 1 +
...y.patch => exo-0.7.2-remove-xfce-category.patch | 2 +-
exo.spec | 43 +++++++++++---------
sources | 2 +-
4 files changed, 27 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 975763b..f2413a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ exo-0.3.107.tar.bz2
/exo-0.6.2.tar.bz2
/exo-0.7.2.tar.bz2
/exo-0.7.3.tar.bz2
+/exo-0.8.0.tar.bz2
diff --git a/exo-0.7.2-remove-xfce-categoriy.patch b/exo-0.7.2-remove-xfce-category.patch
similarity index 86%
rename from exo-0.7.2-remove-xfce-categoriy.patch
rename to exo-0.7.2-remove-xfce-category.patch
index a1b1692..6a417f4 100644
--- a/exo-0.7.2-remove-xfce-categoriy.patch
+++ b/exo-0.7.2-remove-xfce-category.patch
@@ -6,7 +6,7 @@ diff -Nur exo-0.7.2.orig/exo-helper/exo-preferred-applications.desktop.in exo-0.
Icon=preferences-desktop-default-applications
Type=Application
-Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
-+Categories=GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
++Categories=X-XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings;
OnlyShowIn=XFCE;
Terminal=false
StartupNotify=true
diff --git a/exo.spec b/exo.spec
index 0f60794..183f424 100644
--- a/exo.spec
+++ b/exo.spec
@@ -1,11 +1,11 @@
%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.7
-%global xfceversion 4.9
+%global minorversion 0.8
+%global xfceversion 4.10
Name: exo
-Version: 0.7.3
+Version: 0.8.0
Release: 1%{?dist}
Summary: Application library for the Xfce desktop environment
@@ -14,22 +14,22 @@ Group: System Environment/Libraries
# everything else is LGPLv2+
License: LGPLv2+ and GPLv2+
URL: http://xfce.org/
+#VCS git:git://git.xfce.org/xfce/libxfce4ui
Source0: http://archive.xfce.org/src/xfce/%{name}/%{minorversion}/%{name}-%{version}.tar.bz2
# internet-mail icon taken from GNOME, license is LGPLv3
Source1: internet-mail-24.png
Source2: internet-mail-48.png
-Patch1: exo-0.7.2-remove-xfce-categoriy.patch
+Patch1: exo-0.7.2-remove-xfce-category.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: dbus-devel >= 0.22
BuildRequires: gtk-doc
BuildRequires: gettext
%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
BuildRequires: python-devel
%endif
BuildRequires: perl-URI
-BuildRequires: libxfce4util-devel >= %{xfceversion}
-BuildRequires: libxfce4ui-devel >= %{xfceversion}
+BuildRequires: pkgconfig(libxfce4util-1.0) >= %{xfceversion}
+BuildRequires: pkgconfig(libxfce4ui-1) >= %{xfceversion}
BuildRequires: libnotify-devel
BuildRequires: intltool >= 0.31
BuildRequires: chrpath
@@ -65,32 +65,32 @@ Python libraries and header files for the exo library.
%build
%configure --enable-gtk-doc --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
%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 {} ';'
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-desktop-item-edit
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/exo-open
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/xfce4/exo-*/exo-helper-*
+chrpath --delete %{buildroot}%{_bindir}/exo-desktop-item-edit
+chrpath --delete %{buildroot}%{_bindir}/exo-open
+chrpath --delete %{buildroot}%{_libdir}/xfce4/exo-*/exo-helper-*
%if 0%{?el6}
- chrpath --delete $RPM_BUILD_ROOT%{_libdir}/gio/modules/libexo-module-*.so
+ chrpath --delete %{buildroot}%{_libdir}/gio/modules/libexo-module-*.so
%endif
%find_lang exo-1
-for file in $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}-*.desktop ; do
+for file in %{buildroot}/%{_datadir}/applications/%{name}-*.desktop ; do
desktop-file-validate $file
done
-install -Dpm 0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/24x24/apps/internet-mail.png
-install -Dpm 0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/icons/hicolor/48x48/apps/internet-mail.png
+install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/24x24/apps/internet-mail.png
+install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/internet-mail.png
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post
@@ -156,6 +156,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%changelog
+* Sat Apr 28 2012 Christoph Wickert <cwickert at fedoraproject.org> - 0.8.0-1
+- Update to 0.8.0 (Xfce 4.10 final)
+- Make build verbose
+- Add VCS key
+
* Sat Apr 14 2012 Kevin Fenzi <kevin at scrye.com> - 0.7.3-1
- Update to 0.7.3 (Xfce 4.10pre2)
diff --git a/sources b/sources
index 95593b5..952e722 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-d0c20305279ef3522f419cab95d1fac5 exo-0.7.3.tar.bz2
+189bd19210e1d7d8601be1cdf27bf259 exo-0.8.0.tar.bz2
5967338f62bcfc456039ca2d4591506f internet-mail-24.png
7372d488df90bb3595f27bbde89bd986 internet-mail-48.png
More information about the scm-commits
mailing list