[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/dhcpv6/devel dhcpv6-0.10-libdhcp6client-Makefile.patch, 1.3, 1.4 dhcpv6.spec, 1.35, 1.36



Author: pjones

Update of /cvs/dist/rpms/dhcpv6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17656

Modified Files:
	dhcpv6-0.10-libdhcp6client-Makefile.patch dhcpv6.spec 
Log Message:
- don't patch using autoconf, do it in the spec file so it can be
  patched on top of


dhcpv6-0.10-libdhcp6client-Makefile.patch:
 Makefile.in |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

Index: dhcpv6-0.10-libdhcp6client-Makefile.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6-0.10-libdhcp6client-Makefile.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dhcpv6-0.10-libdhcp6client-Makefile.patch	19 May 2006 13:29:49 -0000	1.3
+++ dhcpv6-0.10-libdhcp6client-Makefile.patch	20 Jun 2006 20:14:52 -0000	1.4
@@ -1,5 +1,5 @@
---- dhcp-0.10/Makefile.in.libdhcp6client-Makefile	2006-05-19 09:20:26.000000000 -0400
-+++ dhcp-0.10/Makefile.in	2006-05-19 09:22:06.000000000 -0400
+--- dhcp-0.10/Makefile.in.libdhcp6client-Makefile	2006-06-20 16:03:07.000000000 -0400
++++ dhcp-0.10/Makefile.in	2006-06-20 16:04:23.000000000 -0400
 @@ -10,8 +10,8 @@
  CC=	@CC@
  YACC=	@YACC@
@@ -38,15 +38,14 @@
  dhcp6r: $(RELAYOBJS) $(LIBOBJS)
  	$(CC) $(LDFLAGS) -o dhcp6r $(RELAYOBJS)
  
-@@ -94,6 +102,22 @@
+@@ -94,6 +102,21 @@
  	$(LEX) -Psfyy server6_token.l
  	mv lex.sfyy.c $@
  
-+libdhcp6client/.: libdhcp6client.patch
++libdhcp6client/.: $(CLIENTOBJS:%.o=%.c)
 +	mkdir -p libdhcp6client/
-+	cp -fp $(CLIENTOBJS:%.o=%.c) $(CLIENTHDRS) $(COMMONGENSRCS:%.c=%.l) $(subst client6_parse.l,client6_parse.y,$(CLIENTGENSRCS:%.c=%.l)) strlcat.c strlcpy.c libdhcp6client/
-+	cp -fp Makefile libdhcp6client/
-+	patch -p1 -b --suffix=.libdhcp6client < libdhcp6client.patch
++	cp -fa $(CLIENTOBJS:%.o=%.c) $(CLIENTHDRS) $(COMMONGENSRCS:%.c=%.l) $(subst client6_parse.l,client6_parse.y,$(CLIENTGENSRCS:%.c=%.l)) strlcat.c strlcpy.c libdhcp6client/
++	cp -fa Makefile libdhcp6client/
 +
 +libdhcp6client/%.o: $(@:%.o:%.c) $(patsubst %,libdhcp6client/%,$(CLIENTHDRS))
 +	$(MAKE) -C libdhcp6client $*.o CFLAGS="$(subst -fPIE,-fPIC,$(subst -O2,-Os,$(CFLAGS))) -DLIBDHCP"
@@ -61,7 +60,7 @@
  install::
  	$(INSTALL) -d $(DESTDIR)$(sbindir)
  	$(INSTALL) -d $(DESTDIR)/sbin
-@@ -112,7 +136,13 @@
+@@ -112,7 +135,13 @@
  	$(INSTALL) -d  $(DESTDIR)/etc/sysconfig
  	$(INSTALL_DATA) -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6s.sysconfig  $(DESTDIR)/etc/sysconfig/dhcp6s
  	$(INSTALL_DATA) -o $(INSTALL_USER) -g $(INSTALL_GROUP) dhcp6r.sysconfig  $(DESTDIR)/etc/sysconfig/dhcp6r


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- dhcpv6.spec	9 Jun 2006 01:01:31 -0000	1.35
+++ dhcpv6.spec	20 Jun 2006 20:14:52 -0000	1.36
@@ -1,13 +1,12 @@
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
 Version: 0.10
-Release: 26
+Release: 27
 License: GPL 
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
 Source0: ftp://ftp.sourceforge.net/pub/sourceforge/d/dh/dhcp/dhcp-%{version}.tgz
 Source1: rfc3315.txt
-Source2: dhcpv6-0.10-libdhcp6client.patch
 Source3: libdhcp6client.pc
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Patch0:  dhcpv6-0.10-initscripts.patch
@@ -29,6 +28,7 @@
 Patch16: dhcpv6-0.10-prefix.patch
 Patch17: dhcpv6-0.10-htonl.patch
 Patch18: dhcpv6-0.10-libdhcp6client-Makefile.patch
+Patch19: dhcpv6-0.10-libdhcp6client.patch
 Prereq: /sbin/chkconfig, /sbin/service
 BuildRequires: flex, bison, openssl-devel, autoconf, automake, libtool
 
@@ -71,18 +71,20 @@
 %patch17 -p1 -b .htonl
 %patch18 -p1 -b .libdhcp6client-Makefile
 
-%build
 %if %{NODEBUGINFO}
 export CFLAGS=`echo "$RPM_OPT_FLAGS" | sed 's/-O2//g'`' -g3 -gdwarf-2'
 %else
 export LDFLAGS='-pie -Wl,-z,relro,-z,now,-z,nodlopen,-z,noexecstack'
 export CFLAGS="$RPM_OPT_FLAGS -fPIE -g -Wall"
 %endif
-cp -fp %SOURCE2 libdhcp6client.patch
 autoconf
 %configure \
 	--prefix=\
 	--mandir=/usr/share/man
+make libdhcp6client/.
+%patch19 -p1 -b .libdhcp6client
+
+%build
 make
 cp -fp %{SOURCE1} docs
 
@@ -187,6 +189,10 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Tue Jun 20 2006 Peter Jones <pjones redhat com> - 0.10-27
+- don't patch using autoconf, do it in the spec file so it can be
+  patched on top of
+
 * Thu Jun 08 2006 Jason Vas Dias<jvdias redhat com> 0.10-26
 - libdhcp6client fix to retry bind() to linklocal address
   on EADDRNOTAVAIL for up to 5 seconds to give kernel time


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]