[gnome-pilot] Update to 2.32.0
Matthew Barnes
mbarnes at fedoraproject.org
Mon Sep 27 20:46:32 UTC 2010
commit d9b73a77ec416e56be393332dc9135af992f0444
Author: Matthew Barnes <mbarnes at redhat.com>
Date: Mon Sep 27 16:46:06 2010 -0400
Update to 2.32.0
Also add a gnome-pilot-eds subpackage, which obsoletes
evolution-conduits.
.gitignore | 1 +
gnome-pilot-2.0.17-fix-conduit-dir.patch | 20 +++---
gnome-pilot-2.0.17-fix-missing-icons.patch | 90 ----------------------------
gnome-pilot.spec | 52 ++++++++++++----
sources | 2 +-
5 files changed, 52 insertions(+), 113 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 207fdbf..611d843 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
gnome-pilot-2.0.17.tar.bz2
+/gnome-pilot-2.32.0.tar.bz2
diff --git a/gnome-pilot-2.0.17-fix-conduit-dir.patch b/gnome-pilot-2.0.17-fix-conduit-dir.patch
index d445450..976608e 100644
--- a/gnome-pilot-2.0.17-fix-conduit-dir.patch
+++ b/gnome-pilot-2.0.17-fix-conduit-dir.patch
@@ -1,24 +1,24 @@
-diff -up gnome-pilot-2.0.17/gpilotd/Makefile.am.fix-conduit-dir gnome-pilot-2.0.17/gpilotd/Makefile.am
---- gnome-pilot-2.0.17/gpilotd/Makefile.am.fix-conduit-dir 2009-01-08 13:40:33.000000000 -0500
-+++ gnome-pilot-2.0.17/gpilotd/Makefile.am 2009-01-08 13:40:43.000000000 -0500
-@@ -9,7 +9,7 @@ INCLUDES = \
+diff -up gnome-pilot-2.32.0/gpilotd/Makefile.am.fix-conduit-dir gnome-pilot-2.32.0/gpilotd/Makefile.am
+--- gnome-pilot-2.32.0/gpilotd/Makefile.am.fix-conduit-dir 2010-08-09 04:02:05.000000000 -0400
++++ gnome-pilot-2.32.0/gpilotd/Makefile.am 2010-09-27 14:48:07.765975199 -0400
+@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
-DGP_PILOT_LINK_VERSION=\"@PILOT_LINK_VERSION@\" \
-DDEVICE_XML_DIR=\"$(datadir)/gnome-pilot\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DCONDUITDIR=\"$(datadir)\" \
+ -DCONDUITDIR=\"$(libdir)\" \
+ $(HAL_CFLAGS) \
$(GNOME_PILOT_CFLAGS)
- gpmarshal.h: gpmarshal.list
-diff -up gnome-pilot-2.0.17/gpilotd/Makefile.in.fix-conduit-dir gnome-pilot-2.0.17/gpilotd/Makefile.in
---- gnome-pilot-2.0.17/gpilotd/Makefile.in.fix-conduit-dir 2009-01-08 13:41:03.000000000 -0500
-+++ gnome-pilot-2.0.17/gpilotd/Makefile.in 2009-01-08 13:41:16.000000000 -0500
-@@ -335,7 +335,7 @@ INCLUDES = \
+diff -up gnome-pilot-2.32.0/gpilotd/Makefile.in.fix-conduit-dir gnome-pilot-2.32.0/gpilotd/Makefile.in
+--- gnome-pilot-2.32.0/gpilotd/Makefile.in.fix-conduit-dir 2010-09-26 06:47:04.000000000 -0400
++++ gnome-pilot-2.32.0/gpilotd/Makefile.in 2010-09-27 14:48:30.288242117 -0400
+@@ -346,7 +346,7 @@ AM_CPPFLAGS = \
-DGP_PILOT_LINK_VERSION=\"@PILOT_LINK_VERSION@\" \
-DDEVICE_XML_DIR=\"$(datadir)/gnome-pilot\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DCONDUITDIR=\"$(datadir)\" \
+ -DCONDUITDIR=\"$(libdir)\" \
+ $(HAL_CFLAGS) \
$(GNOME_PILOT_CFLAGS)
- gpilotdlibsdir = $(libdir)
diff --git a/gnome-pilot.spec b/gnome-pilot.spec
index 631f68d..f1f9a5d 100644
--- a/gnome-pilot.spec
+++ b/gnome-pilot.spec
@@ -3,14 +3,14 @@
### Abstract ###
Name: gnome-pilot
-Version: 2.0.17
-Release: 9%{?dist}
+Version: 2.32.0
+Release: 1%{?dist}
License: LGPLv2+ and GPLv2+
Group: Applications/Communications
Summary: GNOME pilot programs
URL: http://live.gnome.org/GnomePilot
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: http://download.gnome.org/sources/%{name}/2.0/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.32/%{name}-%{version}.tar.bz2
ExcludeArch: s390 s390x
### Patches ###
@@ -18,9 +18,6 @@ ExcludeArch: s390 s390x
# RH bug #135304 (sort of)
Patch1: gnome-pilot-2.0.17-fix-conduit-dir.patch
-# RH bug #512004 / GNOME bug #584894
-Patch2: gnome-pilot-2.0.17-fix-missing-icons.patch
-
### Dependencies ###
Requires(pre): GConf2
@@ -37,12 +34,12 @@ BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bonobo-activation-devel >= 1.0.3
BuildRequires: desktop-file-utils
+BuildRequires: evolution-data-server-devel
BuildRequires: gettext
BuildRequires: gnome-panel-devel >= 2.0.6
BuildRequires: gob2 >= 2.0.3
BuildRequires: intltool
BuildRequires: libbonobo-devel >= 2.0.0
-BuildRequires: libglade2-devel >= 2.0.0
BuildRequires: libgnome-devel >= 2.0.0
BuildRequires: libgnomeui-devel >= 2.0.0
BuildRequires: libtool
@@ -65,10 +62,21 @@ Requires: pkgconfig
%description devel
gpilotd libraries and includes.
+%package eds
+Group: Applications/Communications
+Summary: Evolution-Data-Server conduits
+Provides: evolution-conduits = %{version}-%{release}
+Obsoletes: evolution-conduits < 2.31.5-1
+Requires: %name = %{version}-%{release}
+Requires: evolution-data-server
+
+%description eds
+This package contains conduits for synchronizing PalmPilot<tm> or other
+PalmOS<tm> devices with Evolution-Data-Server.
+
%prep
%setup -q
%patch1 -p1 -b .fix-conduit-dir
-%patch2 -p1 -b .fix-missing-icons
%build
autoreconf --force --install
@@ -143,16 +151,20 @@ fi
%{_libdir}/bonobo/servers/*
%dir %{_libdir}/gnome-pilot
%dir %{_libdir}/gnome-pilot/conduits
-%{_libdir}/gnome-pilot/conduits/*
+%{_libdir}/gnome-pilot/conduits/backup.conduit
+%{_libdir}/gnome-pilot/conduits/file.conduit
+%{_libdir}/gnome-pilot/conduits/test.conduit
+%{_libdir}/gnome-pilot/conduits/libbackup_conduit.so
+%{_libdir}/gnome-pilot/conduits/libfile_conduit.so
+%{_libdir}/gnome-pilot/conduits/libtest_conduit.so
%{_libexecdir}/*
%{_mandir}/man*/*
%{_datadir}/applications/gpilotd-control-applet.desktop
%dir %{_datadir}/gnome-pilot
%dir %{_datadir}/gnome-pilot/conduits
-%dir %{_datadir}/gnome-pilot/glade
+%{_datadir}/dbus-1/services/*
%{_datadir}/gnome-pilot/devices.xml
-%{_datadir}/gnome-pilot/glade/*
-%{_datadir}/idl/gnome-pilot.idl
+%{_datadir}/gnome-pilot/ui
%{_datadir}/mime-info/palm.*
%{_datadir}/pixmaps/*.png
%{_datadir}/gnome/help/gnome-pilot
@@ -165,7 +177,23 @@ fi
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
+%files eds
+%defattr(-, root, root)
+%{_libdir}/gnome-pilot/conduits/e-address.conduit
+%{_libdir}/gnome-pilot/conduits/e-calendar.conduit
+%{_libdir}/gnome-pilot/conduits/e-memo.conduit
+%{_libdir}/gnome-pilot/conduits/e-todo.conduit
+%{_libdir}/gnome-pilot/conduits/libeaddress_conduit.so
+%{_libdir}/gnome-pilot/conduits/libecalendar_conduit.so
+%{_libdir}/gnome-pilot/conduits/libememo_conduit.so
+%{_libdir}/gnome-pilot/conduits/libetodo_conduit.so
+
%changelog
+* Mon Sep 27 2010 Matthew Barnes <mbarnes at redhat.com> - 2.32.0-1
+- Update to 2.32.0
+- Remove patch for RH bug #512004 (fixed upstream).
+- Add an eds subpackage which obsoletes evolution-conduits.
+
* Thu Jan 19 2010 Matthew Barnes <mbarnes at redhat.com> - 2.0.17-9
- Add rarian-compat build requirement.
diff --git a/sources b/sources
index a605b46..9a8a7a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6086573332d607ddba06fe705667b240 gnome-pilot-2.0.17.tar.bz2
+b3900a9ba5e6220cb685b21e72ae8196 gnome-pilot-2.32.0.tar.bz2
More information about the scm-commits
mailing list