rpms/totem-pl-parser/OLPC-4 totem-pl-parser-removecameldep2.patch, 1.1, 1.2 totem-pl-parser.spec, 1.27, 1.28

Peter Robinson pbrobinson at fedoraproject.org
Sun Nov 23 17:20:59 UTC 2008 

Author: pbrobinson

Update of /cvs/pkgs/rpms/totem-pl-parser/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28936

Modified Files:
	totem-pl-parser-removecameldep2.patch totem-pl-parser.spec 
Log Message:
- Patches for disable of e-d-s


totem-pl-parser-removecameldep2.patch:

Index: totem-pl-parser-removecameldep2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/OLPC-4/totem-pl-parser-removecameldep2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- totem-pl-parser-removecameldep2.patch	23 Nov 2008 15:25:19 -0000	1.1
+++ totem-pl-parser-removecameldep2.patch	23 Nov 2008 17:20:29 -0000	1.2
@@ -77,3 +77,189 @@
 +echo "
 +$camel_message
 +"
+--- plparse/Makefile.in.orig	2008-11-23 17:06:56.000000000 +0000
++++ plparse/Makefile.in	2008-11-23 17:08:45.000000000 +0000
+@@ -34,7 +34,6 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-noinst_PROGRAMS = test-parser$(EXEEXT) disc-test$(EXEEXT)
+ subdir = plparse
+ DIST_COMMON = $(plparserinclude_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/totem-pl-parser-features.h.in
+@@ -98,18 +97,6 @@
+ 	$(libtotem_plparser_la_CFLAGS) $(CFLAGS) \
+ 	$(libtotem_plparser_la_LDFLAGS) $(LDFLAGS) -o $@
+ PROGRAMS = $(noinst_PROGRAMS)
+-am_disc_test_OBJECTS = disc_test-disc-test.$(OBJEXT)
+-disc_test_OBJECTS = $(am_disc_test_OBJECTS)
+-disc_test_DEPENDENCIES = libtotem-plparser.la $(am__DEPENDENCIES_1)
+-disc_test_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(disc_test_CFLAGS) \
+-	$(CFLAGS) $(disc_test_LDFLAGS) $(LDFLAGS) -o $@
+-am_test_parser_OBJECTS = test_parser-test-parser.$(OBJEXT)
+-test_parser_OBJECTS = $(am_test_parser_OBJECTS)
+-test_parser_DEPENDENCIES = $(am__DEPENDENCIES_1) libtotem-plparser.la
+-test_parser_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(test_parser_CFLAGS) \
+-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -308,44 +295,6 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-test_parser_SOURCES = test-parser.c
+-test_parser_CPPFLAGS = \
+-	-I$(top_srcdir)			\
+-	-I$(top_srcdir)/lib		\
+-	-I$(top_builddir)/plparse	\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"\
+-	$(DISABLE_DEPRECATED)		\
+-	$(AM_CPPFLAGS)
+-
+-test_parser_CFLAGS = \
+-	$(TOTEM_PLPARSER_CFLAGS)\
+-	$(HAL_CFLAGS)		\
+-	$(DBUS_CFLAGS)		\
+-	$(WARN_CFLAGS)		\
+-	$(AM_CFLAGS)
+-
+-test_parser_LDADD = \
+-	$(TOTEM_PLPARSER_LIBS) \
+-	libtotem-plparser.la
+-
+-disc_test_SOURCES = \
+-	disc-test.c
+-
+-disc_test_CPPFLAGS = \
+-	$(common_defines)	\
+-	$(AM_CPPFLAGS)
+-
+-disc_test_CFLAGS = \
+-	$(WARN_CFLAGS)		\
+-	$(TOTEM_PLPARSER_CFLAGS)\
+-	$(AM_CFLAGS)
+-
+-disc_test_LDFLAGS = \
+-	$(AM_LDFLAGS)
+-
+-disc_test_LDADD = \
+-	libtotem-plparser.la	\
+-	$(TOTEM_PLPARSER_LIBS)
+ 
+ lib_LTLIBRARIES = libtotem-plparser.la libtotem-plparser-mini.la
+ MARSHALFILES = totemplparser-marshal.c totemplparser-marshal.h
+@@ -553,12 +502,6 @@
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+ 	done
+-disc-test$(EXEEXT): $(disc_test_OBJECTS) $(disc_test_DEPENDENCIES) 
+-	@rm -f disc-test$(EXEEXT)
+-	$(disc_test_LINK) $(disc_test_OBJECTS) $(disc_test_LDADD) $(LIBS)
+-test-parser$(EXEEXT): $(test_parser_OBJECTS) $(test_parser_DEPENDENCIES) 
+-	@rm -f test-parser$(EXEEXT)
+-	$(test_parser_LINK) $(test_parser_OBJECTS) $(test_parser_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -566,7 +509,6 @@
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/disc_test-disc-test.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtotem_plparser_la-totem-disc.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtotem_plparser_la-totem-pl-parser-builtins.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtotem_plparser_la-totem-pl-parser-lines.Plo at am__quote@
+@@ -592,7 +534,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtotem_plparser_mini_la-totem-pl-parser-wm.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtotem_plparser_mini_la-totem-pl-parser-xspf.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtotem_plparser_mini_la-totem-pl-parser.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_parser-test-parser.Po at am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@@ -793,34 +734,6 @@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_plparser_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_plparser_la_CFLAGS) $(CFLAGS) -c -o libtotem_plparser_la-xmllexer.lo `test -f 'xmllexer.c' || echo '$(srcdir)/'`xmllexer.c
+ 
+-disc_test-disc-test.o: disc-test.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(disc_test_CPPFLAGS) $(CPPFLAGS) $(disc_test_CFLAGS) $(CFLAGS) -MT disc_test-disc-test.o -MD -MP -MF $(DEPDIR)/disc_test-disc-test.Tpo -c -o disc_test-disc-test.o `test -f 'disc-test.c' || echo '$(srcdir)/'`disc-test.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/disc_test-disc-test.Tpo $(DEPDIR)/disc_test-disc-test.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='disc-test.c' object='disc_test-disc-test.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(disc_test_CPPFLAGS) $(CPPFLAGS) $(disc_test_CFLAGS) $(CFLAGS) -c -o disc_test-disc-test.o `test -f 'disc-test.c' || echo '$(srcdir)/'`disc-test.c
+-
+-disc_test-disc-test.obj: disc-test.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(disc_test_CPPFLAGS) $(CPPFLAGS) $(disc_test_CFLAGS) $(CFLAGS) -MT disc_test-disc-test.obj -MD -MP -MF $(DEPDIR)/disc_test-disc-test.Tpo -c -o disc_test-disc-test.obj `if test -f 'disc-test.c'; then $(CYGPATH_W) 'disc-test.c'; else $(CYGPATH_W) '$(srcdir)/disc-test.c'; fi`
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/disc_test-disc-test.Tpo $(DEPDIR)/disc_test-disc-test.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='disc-test.c' object='disc_test-disc-test.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(disc_test_CPPFLAGS) $(CPPFLAGS) $(disc_test_CFLAGS) $(CFLAGS) -c -o disc_test-disc-test.obj `if test -f 'disc-test.c'; then $(CYGPATH_W) 'disc-test.c'; else $(CYGPATH_W) '$(srcdir)/disc-test.c'; fi`
+-
+-test_parser-test-parser.o: test-parser.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_parser_CPPFLAGS) $(CPPFLAGS) $(test_parser_CFLAGS) $(CFLAGS) -MT test_parser-test-parser.o -MD -MP -MF $(DEPDIR)/test_parser-test-parser.Tpo -c -o test_parser-test-parser.o `test -f 'test-parser.c' || echo '$(srcdir)/'`test-parser.c
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/test_parser-test-parser.Tpo $(DEPDIR)/test_parser-test-parser.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-parser.c' object='test_parser-test-parser.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_parser_CPPFLAGS) $(CPPFLAGS) $(test_parser_CFLAGS) $(CFLAGS) -c -o test_parser-test-parser.o `test -f 'test-parser.c' || echo '$(srcdir)/'`test-parser.c
+-
+-test_parser-test-parser.obj: test-parser.c
+- at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_parser_CPPFLAGS) $(CPPFLAGS) $(test_parser_CFLAGS) $(CFLAGS) -MT test_parser-test-parser.obj -MD -MP -MF $(DEPDIR)/test_parser-test-parser.Tpo -c -o test_parser-test-parser.obj `if test -f 'test-parser.c'; then $(CYGPATH_W) 'test-parser.c'; else $(CYGPATH_W) '$(srcdir)/test-parser.c'; fi`
+- at am__fastdepCC_TRUE@	mv -f $(DEPDIR)/test_parser-test-parser.Tpo $(DEPDIR)/test_parser-test-parser.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='test-parser.c' object='test_parser-test-parser.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(test_parser_CPPFLAGS) $(CPPFLAGS) $(test_parser_CFLAGS) $(CFLAGS) -c -o test_parser-test-parser.obj `if test -f 'test-parser.c'; then $(CYGPATH_W) 'test-parser.c'; else $(CYGPATH_W) '$(srcdir)/test-parser.c'; fi`
+-
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+ 
+--- plparse/Makefile.am.orig	2008-11-23 17:15:32.000000000 +0000
++++ plparse/Makefile.am	2008-11-23 17:15:56.000000000 +0000
+@@ -1,45 +1,3 @@
+-noinst_PROGRAMS = test-parser disc-test
+-
+-test_parser_SOURCES = test-parser.c
+-
+-test_parser_CPPFLAGS = \
+-	-I$(top_srcdir)			\
+-	-I$(top_srcdir)/lib		\
+-	-I$(top_builddir)/plparse	\
+-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"\
+-	$(DISABLE_DEPRECATED)		\
+-	$(AM_CPPFLAGS)
+-
+-test_parser_CFLAGS = \
+-	$(TOTEM_PLPARSER_CFLAGS)\
+-	$(HAL_CFLAGS)		\
+-	$(DBUS_CFLAGS)		\
+-	$(WARN_CFLAGS)		\
+-	$(AM_CFLAGS)
+-
+-test_parser_LDADD = \
+-	$(TOTEM_PLPARSER_LIBS) \
+-	libtotem-plparser.la
+-
+-disc_test_SOURCES = \
+-	disc-test.c
+-
+-disc_test_CPPFLAGS = \
+-	$(common_defines)	\
+-	$(AM_CPPFLAGS)
+-
+-disc_test_CFLAGS = \
+-	$(WARN_CFLAGS)		\
+-	$(TOTEM_PLPARSER_CFLAGS)\
+-	$(AM_CFLAGS)
+-
+-disc_test_LDFLAGS = \
+-	$(AM_LDFLAGS)
+-
+-disc_test_LDADD = \
+-	libtotem-plparser.la	\
+-	$(TOTEM_PLPARSER_LIBS)
+-
+ lib_LTLIBRARIES = libtotem-plparser.la libtotem-plparser-mini.la
+ 
+ MARSHALFILES = totemplparser-marshal.c totemplparser-marshal.h


Index: totem-pl-parser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem-pl-parser/OLPC-4/totem-pl-parser.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- totem-pl-parser.spec	23 Nov 2008 15:25:19 -0000	1.27
+++ totem-pl-parser.spec	23 Nov 2008 17:20:29 -0000	1.28
@@ -1,6 +1,6 @@
 Name:		totem-pl-parser
 Version:	2.24.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Totem Playlist Parser library
 
 Group:		System Environment/Libraries
@@ -14,6 +14,7 @@
 
 BuildRequires:	gtk2-devel
 BuildRequires:	gettext
+BuildRequires:	libxml2-devel
 BuildRequires:	perl(XML::Parser) intltool
 #BuildRequires:	evolution-data-server-devel
 
@@ -69,6 +70,9 @@
 %{_datadir}/gtk-doc/html/totem-pl-parser
 
 %changelog
+* Sun Nov 23 2008 Peter Robinson <pbrobinson at pbrobinson.com> - 2.24.2-3
+- Patches for disable of e-d-s
+
 * Sun Nov 23 2008 Peter Robinson <pbrobinson at pbrobinson.com> - 2.24.2-2
 - Branch for OLPC-4

More information about the fedora-extras-commits mailing list