rpms/dhcpv6/devel .cvsignore, 1.4, 1.5 dhcpv6.spec, 1.71, 1.72 sources, 1.4, 1.5

[David Cantrell (dcantrel)]

Author: dcantrel

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

Modified Files:
	.cvsignore dhcpv6.spec sources 
Log Message:
* Fri Nov 30 2007 David Cantrell <dcantrell at redhat.com> - 1.0.2-1
- Upgraded to new upstream version, dhcpv6-1.0.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Nov 2007 21:39:44 -0000	1.4
+++ .cvsignore	1 Dec 2007 03:05:07 -0000	1.5
@@ -1 +1 @@
-dhcpv6-0.99.2.tar.gz
+dhcpv6-1.0.2.tar.gz


Index: dhcpv6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/dhcpv6.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- dhcpv6.spec	15 Nov 2007 21:39:44 -0000	1.71
+++ dhcpv6.spec	1 Dec 2007 03:05:07 -0000	1.72
@@ -1,27 +1,18 @@
-# we require dhcp-devel to build for libdhcp_control.h
+# we require dhcp-devel for libdhcp_control.h
 %define dhcpdevelver 12:3.1.0-6
 
 Summary: DHCPv6 - DHCP server and client for IPv6
 Name:    dhcpv6
-Version: 0.99.2
+Version: 1.0.2
 Release: 1%{?dist}
 License: BSD
 Group:   System Environment/Daemons
 URL:     http://dhcpv6.sourceforge.net/
 Source0: http://osdn.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
-Source1: libdhcp6client.pc
-Source2: rfc3315.txt
-Source3: Makefile.libdhcp6client
-Source4: dhc6_alloc.c
-Source5: dhc6_alloc.h
-Source6: dhcp6client.h
-
-Patch0:  %{name}-0.99.1-libdhcp6client.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex
 BuildRequires: bison
-BuildRequires: openssl-devel
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -78,25 +69,19 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .libdhcp6client
-
-# copy in libdhcp6client-specific sources
-%{__mkdir} -p libdhcp6client
-%{__cp} -p %{SOURCE3} libdhcp6client/Makefile
-%{__cp} -p %{SOURCE4} %{SOURCE5} %{SOURCE6} libdhcp6client/
-
-%{__cp} -fp %{SOURCE2} docs
 
 %build
 %configure
-%{__make}
-%{__make} -C libdhcp6client
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-%{__sed} 's/@DHCPV6_VERSION@/'%{version}'/' < %{SOURCE1} > libdhcp6client.pc
 %{__make} install DESTDIR=%{buildroot}
-%{__make} -C libdhcp6client install DESTDIR=%{buildroot}
+
+%{__rm} -rf %{buildroot}%{_libdir}/libdhcp6client.la
+
+%{__mkdir} -p %{buildroot}/sbin
+%{__mv} %{buildroot}%{_sbindir}/dhcp6c %{buildroot}/sbin/dhcp6c
 
 %{__mkdir} -p %{buildroot}%{_localstatedir}/lib/%{name}
 
@@ -106,14 +91,13 @@
 %preun
 if [ $1 = 0 ]; then
     service dhcp6s stop > /dev/null 2>&1
-    chkconfig --del dhcp6s
+    chkconfig --del dhcp6s || :
 fi
 
 %postun
 if [ $1 = 1 ]; then
-    service dhcp6s condrestart >/dev/null 2>&1
+    service dhcp6s condrestart >/dev/null 2>&1 || :
 fi
-exit 0
 
 %post -n libdhcp6client -p /sbin/ldconfig
 
@@ -124,13 +108,14 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ReadMe docs/* dhcp6s.conf
+%doc AUTHORS ChangeLog LICENSE README TODO docs/*
 %attr(754,root,root) %{_sbindir}/dhcp6s
 %attr(754,root,root) %{_sbindir}/dhcp6r
 %attr(755,root,root) %config %{_initrddir}/dhcp6s
 %attr(755,root,root) %config %{_initrddir}/dhcp6r
 %config(noreplace) %{_sysconfdir}/sysconfig/dhcp6s
 %config(noreplace) %{_sysconfdir}/sysconfig/dhcp6r
+%config(noreplace) %{_sysconfdir}/dhcp6s.conf
 %{_mandir}/man8/dhcp6s.8.gz
 %{_mandir}/man5/dhcp6s.conf.5.gz
 %{_mandir}/man8/dhcp6r.8.gz
@@ -139,20 +124,20 @@
 %files -n dhcpv6-client
 %defattr(-,root,root,-)
 %attr(750,root,root) /sbin/dhcp6c
+%doc AUTHORS ChangeLog LICENSE README TODO
+%config(noreplace) %{_sysconfdir}/dhcp6c.conf
 %{_mandir}/man8/dhcp6c.8.gz
 %{_mandir}/man5/dhcp6c.conf.5.gz
-%doc ReadMe dhcp6c.conf
 %attr(750,root,root) %dir %{_localstatedir}/lib/%{name}
 
 %files -n libdhcp6client
 %defattr(0755,root,root,0755)
-%{_libdir}/libdhcp6client-%{version}.so.*
+%{_libdir}/libdhcp6client-*.so.*
 
 %files -n libdhcp6client-devel
 %defattr(0644,root,root,0755)
 %{_includedir}/*
 %{_libdir}/pkgconfig/libdhcp6client.pc
-%defattr(-,root,root,-)
 %{_libdir}/libdhcp6client.so
 
 %files -n libdhcp6client-static
@@ -160,6 +145,9 @@
 %{_libdir}/libdhcp6client.a
 
 %changelog
+* Fri Nov 30 2007 David Cantrell <dcantrell at redhat.com> - 1.0.2-1
+- Upgraded to new upstream version, dhcpv6-1.0.2
+
 * Fri Nov 09 2007 David Cantrell <dcantrell at redhat.com> - 0.99.0-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dhcpv6/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Nov 2007 21:39:44 -0000	1.4
+++ sources	1 Dec 2007 03:05:07 -0000	1.5
@@ -1 +1 @@
-adf72e8ff4d03894799624fa5f63ef16  dhcpv6-0.99.2.tar.gz
+aaed2eab8e09e4b18d409ab019ce22c0  dhcpv6-1.0.2.tar.gz