rpms/exo/F-11 .cvsignore, 1.12, 1.13 exo.spec, 1.38, 1.39 sources, 1.12, 1.13 exo-0.3.101-default-mount-options.patch, 1.1, NONE exo-0.3.101-url-quoting.patch, 1.1, NONE

Christoph Wickert cwickert at fedoraproject.org
Sat Oct 10 16:22:01 UTC 2009


Author: cwickert

Update of /cvs/pkgs/rpms/exo/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18832/F-11

Modified Files:
	.cvsignore exo.spec sources 
Removed Files:
	exo-0.3.101-default-mount-options.patch 
	exo-0.3.101-url-quoting.patch 
Log Message:
* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-2
- Disable parallel make due to multilib conflicts.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-11/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	20 Apr 2009 17:50:07 -0000	1.12
+++ .cvsignore	10 Oct 2009 16:22:00 -0000	1.13
@@ -1 +1 @@
-exo-0.3.101.tar.bz2
+exo-0.3.103.tar.bz2


Index: exo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-11/exo.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- exo.spec	30 Sep 2009 22:22:02 -0000	1.38
+++ exo.spec	10 Oct 2009 16:22:00 -0000	1.39
@@ -2,18 +2,14 @@
 
 Summary: Application library for the Xfce desktop environment
 Name: exo
-Version: 0.3.101
-Release: 5%{?dist}
+Version: 0.3.103
+Release: 2%{?dist}
 # 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://www.xfce.org/archive/xfce-4.6.1/src/exo-%{version}.tar.bz2
+Source0: http://archive.xfce.org/src/xfce/exo/0.3/%{name}-%{version}.tar.bz2
 Patch0: exo-0.3.0-x86_64-build.patch
-# http://bugzilla.xfce.org/show_bug.cgi?id=5461
-Patch1: exo-0.3.101-url-quoting.patch
-# http://patches.ubuntu.com/e/exo/extracted/xubuntu-default-mount-options.patch
-Patch2: exo-0.3.101-default-mount-options.patch
 Group: System Environment/Libraries
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: dbus-glib >= 0.22
@@ -57,13 +53,12 @@ Python libraries and header files for th
 %setup -q
 
 %patch0 -p1 -b .x86_64-build
-%patch1 -p1 -b .url-quoting
-%patch2 -p1 -b .utf8
 
 %build
 %configure --enable-gtk-doc --disable-static
 
-make %{?_smp_mflags}
+# using %{?_smp_mflags} causes a multilib conflict, disable it for now
+make 
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -78,9 +73,6 @@ chrpath --delete $RPM_BUILD_ROOT%{_bindi
 chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/exo-helper-0.3
 chrpath --delete $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/exo-0.3/_exo.so
 
-touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/evolution.desktop
-touch -r NEWS $RPM_BUILD_ROOT%{_datadir}/xfce4/helpers/firefox.desktop
-
 %find_lang libexo-0.3
 
 desktop-file-install                                       \
@@ -143,6 +135,14 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{python_sitearch}/pyexo.*
 
 %changelog
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-2
+- Disable parallel make due to multilib conflicts.
+
+* Sat Oct 10 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.3.103-1
+- Update to 0.3.103
+- Drop patches for URL quoting and default mount options (fixed upstream)
+- Revert useless touch -r trick
+
 * Wed Sep 30 2009 Kevin Fenzi <kevin at tummy.com> - 0.3.101-5
 - Use touch -r trick to fix multilib issue
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/exo/F-11/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	20 Apr 2009 17:50:07 -0000	1.12
+++ sources	10 Oct 2009 16:22:01 -0000	1.13
@@ -1 +1 @@
-1c0eebb360f53eab70454b70e1bde36e  exo-0.3.101.tar.bz2
+16be1f98b09f6c72e8474d0776f74846  exo-0.3.103.tar.bz2


--- exo-0.3.101-default-mount-options.patch DELETED ---


--- exo-0.3.101-url-quoting.patch DELETED ---




More information about the fedora-extras-commits mailing list