rpms/totem-pl-parser/OLPC-3 bye-bye-camel.patch, NONE, 1.1 totem-pl-parser.spec, 1.14, 1.15

Daniel Drake (dsd) fedora-extras-commits at redhat.com
Thu Jul 24 22:04:26 UTC 2008 

Author: dsd

Update of /cvs/pkgs/rpms/totem-pl-parser/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7217

Modified Files:
	totem-pl-parser.spec 
Added Files:
	bye-bye-camel.patch 
Log Message:
remove dependency on libcamel


bye-bye-camel.patch:

--- NEW FILE bye-bye-camel.patch ---
Index: totem-pl-parser-2.23.2/plparse/totem-pl-parser.c
===================================================================
--- totem-pl-parser-2.23.2.orig/plparse/totem-pl-parser.c
+++ totem-pl-parser-2.23.2/plparse/totem-pl-parser.c
@@ -103,7 +103,9 @@
 #ifndef TOTEM_PL_PARSER_MINI
 #include <gobject/gvaluecollector.h>
 #include <gtk/gtk.h>
+#ifdef USE_SLEDGEHAMMER_TO_CRACK_NUT
 #include <camel/camel-mime-utils.h>
+#endif
 
 #include "totem-pl-parser.h"
 #include "totemplparser-marshal.h"
@@ -1733,7 +1735,11 @@ totem_pl_parser_parse_date (const char *
 	D(g_message ("Failed to parse duration '%s' using the ISO8601 parser", date_str));
 
 	/* Fall back to RFC 2822 date parsing */
+#ifdef USE_SLEDGEHAMMER_TO_CRACK_NUT
 	return camel_header_decode_date (date_str, NULL);
+#else
+	return 0;
+#endif
 }
 
 #endif /* !TOTEM_PL_PARSER_MINI */
Index: totem-pl-parser-2.23.2/configure
===================================================================
--- totem-pl-parser-2.23.2.orig/configure
+++ totem-pl-parser-2.23.2/configure
@@ -22062,12 +22062,12 @@ if test -n "$TOTEM_PLPARSER_CFLAGS"; the
     pkg_cv_TOTEM_PLPARSER_CFLAGS="$TOTEM_PLPARSER_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_TOTEM_PLPARSER_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0" 2>/dev/null`
+  pkg_cv_TOTEM_PLPARSER_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22078,12 +22078,12 @@ if test -n "$TOTEM_PLPARSER_LIBS"; then
     pkg_cv_TOTEM_PLPARSER_LIBS="$TOTEM_PLPARSER_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0\"") >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0\"") >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_TOTEM_PLPARSER_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0" 2>/dev/null`
+  pkg_cv_TOTEM_PLPARSER_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -22101,14 +22101,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0" 2>&1`
+	        TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0" 2>&1`
         else
-	        TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0" 2>&1`
+	        TOTEM_PLPARSER_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$TOTEM_PLPARSER_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0) were not met:
+	{ { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0) were not met:
 
 $TOTEM_PLPARSER_PKG_ERRORS
 
@@ -22119,7 +22119,7 @@ Alternatively, you may set the environme
 and TOTEM_PLPARSER_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 camel-1.2 gio-2.0) were not met:
+echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 libxml-2.0 gthread-2.0 gio-2.0) were not met:
 
 $TOTEM_PLPARSER_PKG_ERRORS
 


Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/OLPC-3/totem-pl-parser.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- totem-pl-parser.spec	2 Jul 2008 20:16:56 -0000	1.14
+++ totem-pl-parser.spec	24 Jul 2008 22:03:42 -0000	1.15
@@ -1,17 +1,18 @@
 Name:		totem-pl-parser
 Version:	2.23.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Totem Playlist Parser library
 
 Group:		System Environment/Libraries
 License:	LGPLv2+
 Url:		http://www.gnome.org/projects/totem/
 Source0:	http://download.gnome.org/sources/%{name}/2.22/%{name}-%{version}.tar.bz2
+Patch0:		bye-bye-camel.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:	totem-plparser
 
 BuildRequires:	gtk2-devel
-BuildRequires:	evolution-data-server-devel
+BuildRequires:	libxml2-devel
 BuildRequires:	gettext
 BuildRequires:	perl(XML::Parser)
 
@@ -33,6 +34,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -66,6 +68,9 @@
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Thu Jul 24 2008 - Daniel Drake <dsd at laptop.org> - 2.23.2-2
+- Add patch to remove dependency on libcamel
+
 * Wed Jun 11 2008 - Bastien Nocera <bnocera at redhat.com> - 2.23.2-1
 - Update to 2.23.2

More information about the fedora-extras-commits mailing list