[jana/f18] Remove unnecessary libedataserverui dependency.

Matthew Barnes mbarnes at fedoraproject.org
Tue Oct 30 14:53:50 UTC 2012 

commit 9eae528bfa5137b2864222d3d5a8b79a82cdb4de
Author: Matthew Barnes <mbarnes at redhat.com>
Date:   Tue Oct 30 10:51:10 2012 -0400

    Remove unnecessary libedataserverui dependency.

 jana-0.4.5-eds.patch |   65 ++++++++++++++++++++++++++++++++++---------------
 jana.spec            |    5 +++-
 2 files changed, 49 insertions(+), 21 deletions(-)
---
diff --git a/jana-0.4.5-eds.patch b/jana-0.4.5-eds.patch
index 479e925..fec3360 100644
--- a/jana-0.4.5-eds.patch
+++ b/jana-0.4.5-eds.patch
@@ -1,6 +1,17 @@
+diff -up jana-0.4.5/configure.ac.eds jana-0.4.5/configure.ac
+--- jana-0.4.5/configure.ac.eds	2012-10-30 10:40:57.591842431 -0400
++++ jana-0.4.5/configure.ac	2012-10-30 10:41:03.678852814 -0400
+@@ -23,7 +23,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0 >
+ PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
+ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 2.99.1)
+ PKG_CHECK_MODULES(ECAL, libecal-1.2 >= 1.4.0)
+-PKG_CHECK_MODULES(EDATASERVERUI, libedataserverui-3.0)
+ 
+ PKG_CHECK_MODULES(GCONF, gconf-2.0)
+ 
 diff -up jana-0.4.5/libjana-ecal/jana-ecal-component.h.eds jana-0.4.5/libjana-ecal/jana-ecal-component.h
---- jana-0.4.5/libjana-ecal/jana-ecal-component.h.eds	2010-05-20 13:46:47.000000000 +0200
-+++ jana-0.4.5/libjana-ecal/jana-ecal-component.h	2012-08-29 15:48:51.464860956 +0200
+--- jana-0.4.5/libjana-ecal/jana-ecal-component.h.eds	2010-05-20 07:46:47.000000000 -0400
++++ jana-0.4.5/libjana-ecal/jana-ecal-component.h	2012-10-30 10:40:14.436803508 -0400
 @@ -22,7 +22,7 @@
  #define JANA_ECAL_COMPONENT_H
  
@@ -11,8 +22,8 @@ diff -up jana-0.4.5/libjana-ecal/jana-ecal-component.h.eds jana-0.4.5/libjana-ec
  #include <libjana/jana-component.h>
  
 diff -up jana-0.4.5/libjana-ecal/jana-ecal-event.h.eds jana-0.4.5/libjana-ecal/jana-ecal-event.h
---- jana-0.4.5/libjana-ecal/jana-ecal-event.h.eds	2010-05-20 13:46:47.000000000 +0200
-+++ jana-0.4.5/libjana-ecal/jana-ecal-event.h	2012-08-29 15:48:51.464860955 +0200
+--- jana-0.4.5/libjana-ecal/jana-ecal-event.h.eds	2010-05-20 07:46:47.000000000 -0400
++++ jana-0.4.5/libjana-ecal/jana-ecal-event.h	2012-10-30 10:40:14.437803508 -0400
 @@ -22,7 +22,7 @@
  #define JANA_ECAL_EVENT_H
  
@@ -23,8 +34,8 @@ diff -up jana-0.4.5/libjana-ecal/jana-ecal-event.h.eds jana-0.4.5/libjana-ecal/j
  #include <libjana/jana-event.h>
  
 diff -up jana-0.4.5/libjana-ecal/jana-ecal-note.h.eds jana-0.4.5/libjana-ecal/jana-ecal-note.h
---- jana-0.4.5/libjana-ecal/jana-ecal-note.h.eds	2010-05-20 13:46:47.000000000 +0200
-+++ jana-0.4.5/libjana-ecal/jana-ecal-note.h	2012-08-29 15:48:51.471861047 +0200
+--- jana-0.4.5/libjana-ecal/jana-ecal-note.h.eds	2010-05-20 07:46:47.000000000 -0400
++++ jana-0.4.5/libjana-ecal/jana-ecal-note.h	2012-10-30 10:40:14.437803508 -0400
 @@ -22,7 +22,7 @@
  #define JANA_ECAL_NOTE_H
  
@@ -35,8 +46,8 @@ diff -up jana-0.4.5/libjana-ecal/jana-ecal-note.h.eds jana-0.4.5/libjana-ecal/ja
  #include <libjana/jana-note.h>
  
 diff -up jana-0.4.5/libjana-ecal/jana-ecal-store.c.eds jana-0.4.5/libjana-ecal/jana-ecal-store.c
---- jana-0.4.5/libjana-ecal/jana-ecal-store.c.eds	2010-05-20 13:46:47.000000000 +0200
-+++ jana-0.4.5/libjana-ecal/jana-ecal-store.c	2012-08-29 15:48:51.473861064 +0200
+--- jana-0.4.5/libjana-ecal/jana-ecal-store.c.eds	2010-05-20 07:46:47.000000000 -0400
++++ jana-0.4.5/libjana-ecal/jana-ecal-store.c	2012-10-30 10:40:14.437803508 -0400
 @@ -33,7 +33,6 @@
  #define HANDLE_LIBICAL_MEMORY 1
  
@@ -274,8 +285,8 @@ diff -up jana-0.4.5/libjana-ecal/jana-ecal-store.c.eds jana-0.4.5/libjana-ecal/j
  
  static void
 diff -up jana-0.4.5/libjana-ecal/jana-ecal-store.h.eds jana-0.4.5/libjana-ecal/jana-ecal-store.h
---- jana-0.4.5/libjana-ecal/jana-ecal-store.h.eds	2010-05-20 13:46:47.000000000 +0200
-+++ jana-0.4.5/libjana-ecal/jana-ecal-store.h	2012-08-29 15:48:51.473861064 +0200
+--- jana-0.4.5/libjana-ecal/jana-ecal-store.h.eds	2010-05-20 07:46:47.000000000 -0400
++++ jana-0.4.5/libjana-ecal/jana-ecal-store.h	2012-10-30 10:40:14.437803508 -0400
 @@ -22,8 +22,7 @@
  #define JANA_ECAL_STORE_H
  
@@ -299,8 +310,8 @@ diff -up jana-0.4.5/libjana-ecal/jana-ecal-store.h.eds jana-0.4.5/libjana-ecal/j
  #endif /* JANA_ECAL_STORE_H */
  
 diff -up jana-0.4.5/libjana-ecal/jana-ecal-store-view.c.eds jana-0.4.5/libjana-ecal/jana-ecal-store-view.c
---- jana-0.4.5/libjana-ecal/jana-ecal-store-view.c.eds	2010-05-20 13:46:47.000000000 +0200
-+++ jana-0.4.5/libjana-ecal/jana-ecal-store-view.c	2012-08-29 15:48:51.474861077 +0200
+--- jana-0.4.5/libjana-ecal/jana-ecal-store-view.c.eds	2010-05-20 07:46:47.000000000 -0400
++++ jana-0.4.5/libjana-ecal/jana-ecal-store-view.c	2012-10-30 10:40:14.437803508 -0400
 @@ -33,8 +33,7 @@
  #define HANDLE_LIBICAL_MEMORY 1
  
@@ -312,8 +323,8 @@ diff -up jana-0.4.5/libjana-ecal/jana-ecal-store-view.c.eds jana-0.4.5/libjana-e
  #include "jana-ecal-component.h"
  #include "jana-ecal-event.h"
 diff -up jana-0.4.5/libjana-ecal/jana-ecal-store-view.h.eds jana-0.4.5/libjana-ecal/jana-ecal-store-view.h
---- jana-0.4.5/libjana-ecal/jana-ecal-store-view.h.eds	2010-05-20 13:46:47.000000000 +0200
-+++ jana-0.4.5/libjana-ecal/jana-ecal-store-view.h	2012-08-29 15:48:51.475861092 +0200
+--- jana-0.4.5/libjana-ecal/jana-ecal-store-view.h.eds	2010-05-20 07:46:47.000000000 -0400
++++ jana-0.4.5/libjana-ecal/jana-ecal-store-view.h	2012-10-30 10:40:14.437803508 -0400
 @@ -22,7 +22,7 @@
  #define JANA_ECAL_STORE_VIEW_H
  
@@ -324,8 +335,8 @@ diff -up jana-0.4.5/libjana-ecal/jana-ecal-store-view.h.eds jana-0.4.5/libjana-e
  #include <libjana-ecal/jana-ecal-store.h>
  
 diff -up jana-0.4.5/libjana-ecal/jana-ecal-task.h.eds jana-0.4.5/libjana-ecal/jana-ecal-task.h
---- jana-0.4.5/libjana-ecal/jana-ecal-task.h.eds	2010-05-20 13:46:47.000000000 +0200
-+++ jana-0.4.5/libjana-ecal/jana-ecal-task.h	2012-08-29 15:48:51.477861118 +0200
+--- jana-0.4.5/libjana-ecal/jana-ecal-task.h.eds	2010-05-20 07:46:47.000000000 -0400
++++ jana-0.4.5/libjana-ecal/jana-ecal-task.h	2012-10-30 10:40:14.437803508 -0400
 @@ -22,7 +22,7 @@
  #define JANA_ECAL_TASK_H
  
@@ -336,8 +347,8 @@ diff -up jana-0.4.5/libjana-ecal/jana-ecal-task.h.eds jana-0.4.5/libjana-ecal/ja
  #include <libjana/jana-task.h>
  
 diff -up jana-0.4.5/libjana-ecal/jana-ecal-time.h.eds jana-0.4.5/libjana-ecal/jana-ecal-time.h
---- jana-0.4.5/libjana-ecal/jana-ecal-time.h.eds	2010-05-20 13:46:47.000000000 +0200
-+++ jana-0.4.5/libjana-ecal/jana-ecal-time.h	2012-08-29 15:48:51.478861129 +0200
+--- jana-0.4.5/libjana-ecal/jana-ecal-time.h.eds	2010-05-20 07:46:47.000000000 -0400
++++ jana-0.4.5/libjana-ecal/jana-ecal-time.h	2012-10-30 10:40:14.437803508 -0400
 @@ -24,7 +24,7 @@
  #include <glib-object.h>
  #include <libical/ical.h>
@@ -348,8 +359,8 @@ diff -up jana-0.4.5/libjana-ecal/jana-ecal-time.h.eds jana-0.4.5/libjana-ecal/ja
  #define JANA_ECAL_TYPE_TIME		(jana_ecal_time_get_type ())
  #define JANA_ECAL_TIME(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
 diff -up jana-0.4.5/libjana-ecal/jana-ecal-utils.c.eds jana-0.4.5/libjana-ecal/jana-ecal-utils.c
---- jana-0.4.5/libjana-ecal/jana-ecal-utils.c.eds	2010-05-20 13:46:47.000000000 +0200
-+++ jana-0.4.5/libjana-ecal/jana-ecal-utils.c	2012-08-29 15:48:51.478861129 +0200
+--- jana-0.4.5/libjana-ecal/jana-ecal-utils.c.eds	2010-05-20 07:46:47.000000000 -0400
++++ jana-0.4.5/libjana-ecal/jana-ecal-utils.c	2012-10-30 10:40:14.437803508 -0400
 @@ -30,7 +30,7 @@
  #include <string.h>
  #include <libical/icaltime.h>
@@ -359,3 +370,17 @@ diff -up jana-0.4.5/libjana-ecal/jana-ecal-utils.c.eds jana-0.4.5/libjana-ecal/j
  #include <libjana-ecal/jana-ecal-time.h>
  #include <gconf/gconf-client.h>
  #include "jana-ecal-utils.h"
+diff -up jana-0.4.5/libjana-ecal/Makefile.am.eds jana-0.4.5/libjana-ecal/Makefile.am
+--- jana-0.4.5/libjana-ecal/Makefile.am.eds	2012-10-30 10:41:20.264865845 -0400
++++ jana-0.4.5/libjana-ecal/Makefile.am	2012-10-30 10:41:29.059871269 -0400
+@@ -1,8 +1,8 @@
+ SUBDIRS = . doc
+ 
+ localedir = $(datadir)/locale
+-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\" $(GOBJECT_CFLAGS) $(ECAL_CFLAGS) $(EDATASERVERUI_CFLAGS) $(GCONF_CFLAGS) -Wall
+-AM_LDFLAGS = $(GOBJECT_LIBS) $(ECAL_LIBS) $(GCONF_LIBS) $(EDATASERVERUI_LIBS)
++AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DPKGDATADIR=\"$(pkgdatadir)\" $(GOBJECT_CFLAGS) $(ECAL_CFLAGS) $(GCONF_CFLAGS) -Wall
++AM_LDFLAGS = $(GOBJECT_LIBS) $(ECAL_LIBS) $(GCONF_LIBS)
+ 
+ source_h = jana-ecal.h \
+ 	jana-ecal-component.h \
diff --git a/jana.spec b/jana.spec
index e940ec4..0eabb04 100644
--- a/jana.spec
+++ b/jana.spec
@@ -9,7 +9,7 @@
 
 Name:          jana
 Version:       0.4.5
-Release:       0.25.%{snapshot}%{?dist}
+Release:       0.27.%{snapshot}%{?dist}
 Summary:       An interface library for time-related PIM
 
 Group:         System Environment/Libraries
@@ -84,6 +84,9 @@ rm -rf %{buildroot}/%{_libdir}/*.la
 %{_datadir}/gtk-doc/html/libjana
 
 %changelog
+* Tue Oct 30 2012 Matthew Barnes <mbarnes at redhat.com> - 0.4.5-0.27.20100520gitacd72f2
+- Amend eds patch to remove unnecessary libedataserverui dependency.
+
 * Wed Aug 29 2012 Milan Crha <mcrha at redhat.com> - 0.4.5-0.25.20100520gitacd72f2
 - Add patch to build against latest evolution-data-server

More information about the scm-commits mailing list