rpms/upstart/devel upstart-tty-stack.patch, 1.1, 1.2 upstart.spec, 1.8, 1.9

Casey Dahlin (sadmac) fedora-extras-commits at redhat.com
Sun Mar 2 23:29:33 UTC 2008


Author: sadmac

Update of /cvs/pkgs/rpms/upstart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4261/devel

Modified Files:
	upstart-tty-stack.patch upstart.spec 
Log Message:
Attempt to fix build issue with tty stack patch


upstart-tty-stack.patch:

Index: upstart-tty-stack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/devel/upstart-tty-stack.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- upstart-tty-stack.patch	2 Mar 2008 21:53:54 -0000	1.1
+++ upstart-tty-stack.patch	2 Mar 2008 23:29:26 -0000	1.2
@@ -10,6 +10,39 @@
  	process.c process.h \
  	job.c job.h \
 
+=== modified file 'init/Makefile.in'
+--- init/Makefile.in	2008-03-02 23:21:30 +0000
++++ init/Makefile.in	2008-02-29 21:39:16 +0000
+@@ -70,9 +70,9 @@
+ am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man8dir)"
+ sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(sbin_PROGRAMS)
+-am_init_OBJECTS = main.$(OBJEXT) process.$(OBJEXT) job.$(OBJEXT) \
+-	event.$(OBJEXT) control.$(OBJEXT) notify.$(OBJEXT) \
+-	cfgfile.$(OBJEXT)
++am_init_OBJECTS = main.$(OBJEXT) tty.$(OBJEXT) process.$(OBJEXT) \
++	job.$(OBJEXT) event.$(OBJEXT) control.$(OBJEXT) \
++	notify.$(OBJEXT) cfgfile.$(OBJEXT)
+ init_OBJECTS = $(am_init_OBJECTS)
+ am__DEPENDENCIES_1 =
+ init_DEPENDENCIES = ../upstart/libupstart.la ../nih/libnih.la \
+@@ -308,6 +308,7 @@
+ 
+ init_SOURCES = \
+ 	main.c \
++	tty.c tty.h\
+ 	errors.h paths.h \
+ 	process.c process.h \
+ 	job.c job.h \
+@@ -468,6 +469,7 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_job.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_notify.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/test_process.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tty.Po at am__quote@
+ 
+ .c.o:
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+
 === modified file 'init/control.c'
 --- init/control.c	2007-03-13 17:25:34 +0000
 +++ init/control.c	2008-03-01 08:00:46 +0000


Index: upstart.spec
===================================================================
RCS file: /cvs/pkgs/rpms/upstart/devel/upstart.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- upstart.spec	2 Mar 2008 22:32:33 -0000	1.8
+++ upstart.spec	2 Mar 2008 23:29:26 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           upstart
 Version:        0.3.9
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        An event-driven init system
 
 Group:          System Environment/Base
@@ -13,7 +13,6 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext
-BuildRequires:  automake >= 1.10
 
 %description
 Upstart is an event-based replacement for the /sbin/init daemon which
@@ -25,7 +24,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
-automake
 
 %build
 %configure --enable-compat=sysv --sbindir=/sbin --libdir=/%{_lib}
@@ -87,6 +85,9 @@
 %{_mandir}/man8/telinit.8.gz
 
 %changelog
+* Sun Mar 03 2008 Casey Dahlin <cjdahlin at ncsu.edu> - 0.3.9-9
+- Remove automake dependency, build Makefile.in changes into patch
+
 * Sun Mar 03 2008 Casey Dahlin <cjdahlin at ncsu.edu> - 0.3.9-8
 - Run automake after patching
 




More information about the fedora-extras-commits mailing list