rpms/deltarpm/F-11 deltarpm.spec,1.21,1.22

[Jonathan Dieter]

Author: jdieter

Update of /cvs/extras/rpms/deltarpm/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13873

Modified Files:
	deltarpm.spec 
Log Message:
Remerge deltarpm and deltaiso, so there aren't any surprises for current users



Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/F-11/deltarpm.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- deltarpm.spec	11 Dec 2009 07:05:47 -0000	1.21
+++ deltarpm.spec	11 Dec 2009 07:13:19 -0000	1.22
@@ -36,14 +36,6 @@ Requires: deltarpm = %{version}-%{releas
 This package contains a tool to sync a file tree with
 deltarpms.
 
-%package -n deltaiso
-Summary: Create deltas between isos containing rpms
-Requires: deltarpm = %{version}-%{release}
-
-%description -n deltaiso
-This package contains tools for creating and using deltasisos,
-a difference between an old and a new iso containing rpms.
-
 %package -n python-deltarpm
 Summary: Python bindings for deltarpm
 Requires: deltarpm = %{version}-%{release}
@@ -78,16 +70,12 @@ This package contains python bindings fo
 %doc %{_mandir}/man8/applydeltarpm*
 %doc %{_mandir}/man8/makedeltarpm*
 %doc %{_mandir}/man8/combinedeltarpm*
+%doc %{_mandir}/man8/applydeltaiso*
+%doc %{_mandir}/man8/makedeltaiso*
 %{_bindir}/applydeltarpm
 %{_bindir}/combinedeltarpm
 %{_bindir}/makedeltarpm
 %{_bindir}/rpmdumpheader
-
-%files -n deltaiso
-%defattr(-, root, root, 0755)
-%doc LICENSE.BSD README
-%doc %{_mandir}/man8/applydeltaiso*
-%doc %{_mandir}/man8/makedeltaiso*
 %{_bindir}/applydeltaiso
 %{_bindir}/fragiso
 %{_bindir}/makedeltaiso
@@ -104,6 +92,10 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* Fri Dec 11 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.4.20090913git
+- Remerge deltaiso package into deltarpm so current users don't lose access to
+  deltaiso
+
 * Wed Sep 30 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 3.5-0.4.20090913git
 - Update patch to properly detect when an rpm is built with an rsync-friendly
   zlib and bail out.