rpms/deltarpm/devel .cvsignore, 1.7, 1.8 deltarpm.spec, 1.30, 1.31 import.log, 1.5, 1.6 sources, 1.8, 1.9 deltarpm-python-error.patch, 1.4, NONE

[Jonathan Dieter]

Author: jdieter

Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3715/devel

Modified Files:
	.cvsignore deltarpm.spec import.log sources 
Removed Files:
	deltarpm-python-error.patch 
Log Message:
Merge patches upstream


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	31 Aug 2009 14:26:03 -0000	1.7
+++ .cvsignore	13 Sep 2009 14:32:52 -0000	1.8
@@ -1 +1 @@
-deltarpm-git-20090831.1.tar.bz2
+deltarpm-git-20090913.tar.bz2


Index: deltarpm.spec
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- deltarpm.spec	10 Sep 2009 19:10:40 -0000	1.30
+++ deltarpm.spec	13 Sep 2009 14:32:52 -0000	1.31
@@ -3,17 +3,16 @@
 Summary: Create deltas between rpms
 Name: deltarpm
 Version: 3.5
-Release: 0.git.20090831.1.4%{?dist}
+Release: 0.git.20090913%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://gitorious.org/deltarpm/deltarpm
 # Generate source by doing:
 # git clone git://gitorious.org/deltarpm/deltarpm
 # cd deltarpm
-# git archive --format=tar --prefix="deltarpm-git-20090831.1/" a3c6998 | \
+# git archive --format=tar --prefix="deltarpm-git-20090913" f716bb7 | \
 # bzip2 > deltarpm-git-20090831.1.tar.bz2
-Source: %{name}-git-20090831.1.tar.bz2
-Patch: deltarpm-python-error.patch
+Source: %{name}-git-20090913.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bzip2-devel, xz-devel, rpm-devel, popt-devel
@@ -50,8 +49,7 @@ Requires: deltarpm = %{version}-%{releas
 This package contains python bindings for deltarpm.
 
 %prep
-%setup -q -n %{name}-git-20090831.1
-%patch -p1 -b .foo
+%setup -q -n %{name}-git-20090913
 
 %build
 %{__make} %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
@@ -98,6 +96,9 @@ This package contains python bindings fo
 %{python_sitearch}/*
 
 %changelog
+* Sun Sep 13 2009 Jonathan Dieter <jdieter at lesbg.com> - 3.5-0.git.20090913
+- Merge python error patch upstream
+
 * Thu Sep 10 2009 Bill Nottingham <notting at redhat.com> - 3.5-0.git.20090831.1.4
 - fix python bindings to not require kernel >= 2.6.27
 


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- import.log	31 Aug 2009 14:26:04 -0000	1.5
+++ import.log	13 Sep 2009 14:32:53 -0000	1.6
@@ -3,3 +3,4 @@ deltarpm-3_5-0_git_20090727_1_fc11:HEAD:
 deltarpm-3_5-0_git_20090729_fc11:HEAD:deltarpm-3.5-0.git.20090729.fc11.src.rpm:1248862477
 deltarpm-3_5-0_git_20090831_fc11:HEAD:deltarpm-3.5-0.git.20090831.fc11.src.rpm:1251726064
 deltarpm-3_5-0_git_20090831_1_fc11:HEAD:deltarpm-3.5-0.git.20090831.1.fc11.src.rpm:1251728709
+deltarpm-3_5-0_git_20090913_fc11:HEAD:deltarpm-3.5-0.git.20090913.fc11.src.rpm:1252852324


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	31 Aug 2009 14:26:04 -0000	1.8
+++ sources	13 Sep 2009 14:32:53 -0000	1.9
@@ -1 +1 @@
-08f91084efa0283bda2aa0cdaf8b649e  deltarpm-git-20090831.1.tar.bz2
+d83662fbd6745b3eab85543d2ac7b6b4  deltarpm-git-20090913.tar.bz2


--- deltarpm-python-error.patch DELETED ---