Attachment 291722 Details for Bug 428838 – Patch to conduit spec file

[patch] Patch to conduit spec file

conduit.spec.diff (text/plain), 2.57 KB, created by Michel Alexandre Salim on 2008-01-15 16:41:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Alexandre Salim

Created: 2008-01-15 16:41:08 UTC

Size: 2.57 KB

patch

obsolete

>--- /tmp/conduit.spec	2007-10-30 22:58:14.000000000 -0400
>+++ conduit.spec	2008-01-15 11:39:34.000000000 -0500
>@@ -1,14 +1,16 @@
> %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
> 
>+%define _libdir %{_prefix}/lib
>+
> Name:           conduit
>-Version:        0.3.4
>-Release:        2%{?dist}
>+Version:        0.3.5
>+Release:        1%{?dist}
> Summary:        A synchronization solution for GNOME
> 
> Group:          Applications/Productivity
> License:        GPLv2+
> URL:            http://www.conduit-project.org/
>-Source0:        http://files.conduit-project.org/releases/%{name}-%{version}.tar.gz 
>+Source0:        http://download.gnome.org/sources/conduit/0.3/%{name}-%{version}.tar.bz2
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildArch:      noarch
>@@ -18,8 +20,9 @@
> BuildRequires:  perl(XML::Parser)
> BuildRequires:  gettext, gnome-doc-utils, scrollkeeper
> 
>-Requires:       pygoocanvas >= 0.8, python-vobject, python-sqlite, PyXML
>+Requires:       pygoocanvas >= 0.9, python-vobject, python-sqlite, PyXML
> Requires:       dbus >= 0.93, dbus-python, pygtk2
>+Requires:	evolution-python
> # Tomboy is not a hard requirement, but if it is present, it must be 0.5.10
> # or greater
> Conflicts:      tomboy < 0.5.10
>@@ -60,9 +63,9 @@
> done
> 
> # dataprovider files install to the wrong directory - fix that
>-find conduit/dataproviders -type f -name Makefile.in | \
>-  xargs sed -i 's/\$(libdir)/$(pythondir)/'
>-sed -i 's/@PKGLIBDIR@/@PYTHONDIR@\/%{name}/' conduit/defs.py.in
>+#find conduit/dataproviders -type f -name Makefile.in | \
>+#  xargs sed -i 's/\$(libdir)/$(pythondir)/'
>+#sed -i 's/@PKGLIBDIR@/@PYTHONDIR@\/%{name}/' conduit/defs.py.in
> 
> 
> %build
>@@ -107,6 +110,7 @@
> %doc AUTHORS COPYING NEWS README TODO
> %{python_sitelib}/%{name}
> %{_bindir}/*
>+%{_libdir}/conduit
> %{_datadir}/applications/fedora-%{name}.desktop
> %{_datadir}/gnome/autostart/%{name}-autostart.desktop
> %{_datadir}/%{name}
>@@ -114,13 +118,17 @@
> %{_datadir}/gnome/help/conduit
> %{_datadir}/icons/hicolor/16x16/*/conduit*
> %{_datadir}/icons/hicolor/22x22/*/conduit*
>+%{_datadir}/icons/hicolor/26x26/*/conduit*
> %{_datadir}/icons/hicolor/32x32/*/conduit*
> %{_datadir}/icons/hicolor/48x48/*/conduit*
> %{_datadir}/icons/hicolor/scalable/*/conduit*
>-%{_datadir}/omf/conduit/conduit-C.omf
>+%{_datadir}/omf/conduit/conduit-*.omf
> 
> 
> %changelog
>+* Tue Jan 15 2008 Michel Salim <michel.sylvan@gmail.com> - 0.3.5-1
>+- v 0.3.5
>+
> * Tue Oct 30 2007 Bernard Johnson <bjohnson@symetrix.com> - 0.3.4-2
> - add missing Req: dbus-python, pygtk2
>

Actions: View | Diff

Attachments on bug 428838: 291722